Merge remote-tracking branch 'origin/M2-user' into M2

# Conflicts:
#	application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java
#	application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java
#	application/module-exercise/src/main/java/org/fuseri/moduleexercise/exercise/ExerciseFacade.java
#	application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java

application/model/src/main/java/org/fuseri/model/dto/course/CourseDto.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.fuseri.model.dto.common.DomainObjectDto;
+import org.fuseri.model.dto.user.UserDto;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,14 +42,14 @@ public class CourseDto extends DomainObjectDto {
 
     @NotNull(message = "Student's list is required")
     @Valid
-    private List<Long> studentIds;
+    private List<UserDto> students;
 
     public CourseDto(String name, Integer capacity, LanguageTypeDto languageTypeDto, ProficiencyLevelDto proficiencyLevelDto) {
         this.name = name;
         this.capacity = capacity;
         this.language = languageTypeDto;
         this.proficiency = proficiencyLevelDto;
-        this.studentIds = new ArrayList<>();
+        this.students = new ArrayList<>();
     }
 
 }

application/model/src/main/java/org/fuseri/model/dto/course/ProficiencyLevelDto.java

 package org.fuseri.model.dto.course;
 
+/**
+ * An enum representing language proficiency levels based on the CEFR standard.
+ */
 public enum ProficiencyLevelDto {
-    A1,
-    A2,
-    B1,
-    B2,
-    C1,
-    C2,
-    C1N,
-    C2N
-}
+
+    A1("Beginner"),
+    A2("Elementary"),
+    B1("Intermediate"),
+    B2("Upper Intermediate"),
+    C1("Advanced"),
+    C2("Proficient"),
+    C1N("Advanced Native speaker"),
+    C2N("Proficient Native speaker");
+
+    private final String description;
+
+    /**
+     * Constructor for LanguageLevel enum.
+     *
+     * @param description a String representing a brief description of the language proficiency level
+     */
+    ProficiencyLevelDto(String description) {
+        this.description = description;
+    }
+
+    /**
+     * Returns a brief description of the language proficiency level.
+     *
+     * @return a String representing the description of the language proficiency level
+     */
+    public String getDescription() {
+        return description;
+    }
+}
\ No newline at end of file

application/model/src/main/java/org/fuseri/model/dto/user/AddressDto.java

@@ -2,6 +2,7 @@ package org.fuseri.model.dto.user;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -10,15 +11,21 @@ import lombok.Setter;
 @Setter
 @AllArgsConstructor
 @NoArgsConstructor
+@EqualsAndHashCode
 public class AddressDto {
+
     @NotBlank
     private String country;
+
     @NotBlank
     private String city;
+
     @NotBlank
     private String street;
+
     @NotBlank
     private String houseNumber;
+
     @NotBlank
     private String zip;
 }

application/model/src/main/java/org/fuseri/model/dto/user/UserCreateDto.java

@@ -4,25 +4,43 @@ import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
+import org.fuseri.model.dto.course.LanguageTypeDto;
+import org.fuseri.model.dto.course.ProficiencyLevelDto;
+
+import java.util.Map;
 
 @Getter
 @Setter
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper = false)
 public class UserCreateDto {
 
     @NotBlank
     private String username;
+
     @NotBlank
     private String password;
+
     @NotBlank
     private String email;
+
     @NotBlank
     private String firstName;
+
     @NotBlank
     private String lastName;
+
     @NotNull
     @Valid
     private AddressDto address;
+
+    @NotNull
+    private UserType userType;
+
+    @NotNull
+    @Valid
+    private Map<LanguageTypeDto, ProficiencyLevelDto> languageProficiency;
 }

application/model/src/main/java/org/fuseri/model/dto/user/UserDto.java

 package org.fuseri.model.dto.user;
 
+import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.EqualsAndHashCode;
 import org.fuseri.model.dto.common.DomainObjectDto;
 import lombok.Getter;
 import lombok.Setter;
-import org.fuseri.model.dto.common.DomainObjectDto;
+import org.fuseri.model.dto.course.LanguageTypeDto;
+import org.fuseri.model.dto.course.ProficiencyLevelDto;
+
+import java.util.Map;
 
 @Getter
 @Setter
+@EqualsAndHashCode(callSuper = false)
 public class UserDto extends DomainObjectDto {
+
     @NotBlank
     private String username;
+
     @NotBlank
     private String email;
+
     @NotBlank
     private String firstName;
+
     @NotBlank
     private String lastName;
+
+    @Valid
     private AddressDto address;
 
+    @NotNull
+    private UserType userType;
+
+    @NotNull
+    @Valid
+    private Map<LanguageTypeDto, ProficiencyLevelDto> languageProficiency;
 
-    public UserDto(String username, String email, String firstName, String lastName, AddressDto address) {
-        setId(0L);
+    public UserDto(String username, String email, String firstName, String lastName, AddressDto address, UserType userType) {
         this.username = username;
         this.email = email;
         this.firstName = firstName;
         this.lastName = lastName;
         this.address = address;
+        this.userType = userType;
     }
 }

application/model/src/main/java/org/fuseri/model/dto/user/UserLoginDto.java

@@ -9,8 +9,10 @@ import lombok.Setter;
 @Setter
 @AllArgsConstructor
 public class UserLoginDto {
+
     @NotBlank
     private String username;
+
     @NotBlank
     private String password;
 }

application/model/src/main/java/org/fuseri/model/dto/user/UserType.java

+package org.fuseri.model.dto.user;
+
+public enum UserType {
+    ADMIN,
+    STUDENT,
+    LECTURER
+}

application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java

@@ -2,7 +2,6 @@ package org.fuseri.modulecertificate.service;
 
 
 import org.fuseri.model.dto.certificate.CertificateCreateDto;
-import org.fuseri.model.dto.certificate.CertificateDto;
 import org.fuseri.model.dto.certificate.CertificateSimpleDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;

application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateControllerTests.java

@@ -8,6 +8,7 @@ import org.fuseri.model.dto.course.LanguageTypeDto;
 import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
+import org.fuseri.model.dto.user.UserType;
 import org.fuseri.modulecertificate.service.CertificateFacade;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
@@ -34,9 +35,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 class CertificateControllerTests {
 
     private final UserDto USER = new UserDto("novakovat",
-            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto());
-    private final CourseDto COURSE = new CourseDto("A1", 10, LanguageTypeDto.ENGLISH,
-            ProficiencyLevelDto.A1);
+            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto(), UserType.STUDENT);
+    private final CourseDto COURSE = new CourseDto("AJ1", 10,
+            LanguageTypeDto.ENGLISH, ProficiencyLevelDto.A1);
+    private final CertificateCreateDto certificateCreateDto = new CertificateCreateDto(USER, COURSE);
     private final CertificateSimpleDto certificateDto = new CertificateSimpleDto(0L, USER.getId(),
             Instant.now(), COURSE.getId(), "", "");
 
@@ -180,4 +182,3 @@ class CertificateControllerTests {
                 .andExpect(jsonPath("$.content").isEmpty());
     }
 }
-

application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateFacadeTests.java

@@ -7,6 +7,7 @@ import org.fuseri.model.dto.course.LanguageTypeDto;
 import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
+import org.fuseri.model.dto.user.UserType;
 import org.fuseri.modulecertificate.service.CertificateFacade;
 import org.fuseri.modulecertificate.service.CertificateMapper;
 import org.fuseri.modulecertificate.service.CertificateService;
@@ -32,9 +33,9 @@ import static org.mockito.Mockito.when;
 @AutoConfigureMockMvc
 final class CertificateFacadeTests {
     private final UserDto USER = new UserDto("novakovat",
-            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto());
-    private final CourseDto COURSE = new CourseDto("A1", 10, LanguageTypeDto.ENGLISH,
-            ProficiencyLevelDto.A1);
+            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto(), UserType.STUDENT);
+    private final CourseDto COURSE = new CourseDto("AJ1", 10,
+            LanguageTypeDto.ENGLISH, ProficiencyLevelDto.A1);
     private final CertificateCreateDto certificateCreateDto = new CertificateCreateDto(USER, COURSE);
     private final CertificateSimpleDto certificateDto = new CertificateSimpleDto(0L, USER.getId(),
             Instant.now(), COURSE.getId(), "", "");

application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateMapperTests.java

@@ -4,8 +4,10 @@ import org.fuseri.model.dto.certificate.CertificateCreateDto;
 import org.fuseri.model.dto.certificate.CertificateSimpleDto;
 import org.fuseri.model.dto.course.CourseDto;
 import org.fuseri.model.dto.course.LanguageTypeDto;
+import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.AddressDto;
 import org.fuseri.model.dto.user.UserDto;
+import org.fuseri.model.dto.user.UserType;
 import org.fuseri.modulecertificate.service.CertificateMapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -23,9 +25,9 @@ import java.util.List;
 final class CertificateMapperTests {
 
     private final UserDto USER = new UserDto("novakovat",
-            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto());
-    private final CourseDto COURSE = new CourseDto("name",10, LanguageTypeDto.ENGLISH,
-            org.fuseri.model.dto.course.ProficiencyLevelDto.B2);
+            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto(), UserType.STUDENT);
+    private final CourseDto COURSE = new CourseDto("AJ1", 10,
+            LanguageTypeDto.ENGLISH, ProficiencyLevelDto.A1);
     private final Instant instant = Instant.now();
     private final String fileName = "fileName";
     private final String file = "file";

application/module-certificate/src/test/java/org/fuseri/modulecertificate/CertificateServiceTests.java

@@ -35,9 +35,9 @@ final class CertificateServiceTests {
     private CertificateService certificateService;
 
     private final UserDto USER = new UserDto("novakovat",
-            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto());
-    private final CourseDto COURSE = new CourseDto("A1", 10, LanguageTypeDto.ENGLISH,
-            ProficiencyLevelDto.A1);
+            "novakova@gamil.com", "Tereza", "Nováková", new AddressDto(), UserType.STUDENT);
+    private final CourseDto COURSE = new CourseDto("AJ1", 10,
+            LanguageTypeDto.ENGLISH, ProficiencyLevelDto.A1);
     private final Certificate certificate = new Certificate(USER.getId(),
             Instant.now(), COURSE.getId(), "file", "fileName");
     private final List<Certificate> certificates = List.of(certificate, certificate);

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/DataInitializer.java

-package org.fuseri.modulelanguageschool;
-
-import org.fuseri.modulelanguageschool.user.Address;
-import org.fuseri.modulelanguageschool.user.User;
-import org.fuseri.modulelanguageschool.user.UserService;
-import org.fuseri.modulelanguageschool.user.UserType;
-import lombok.RequiredArgsConstructor;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-@RequiredArgsConstructor
-@Component
-public class DataInitializer implements ApplicationRunner {
-
-    private final UserService userService;
-
-    @Override
-    public void run(ApplicationArguments args) {
-        User user = User.builder()
-                .email("test@email.com")
-                .firstName("John")
-                .lastName("Doe")
-                .username("johnD")
-                .password("password")
-                .userType(UserType.ADMIN).address(Address.builder()
-                        .city("Brno")
-                        .country("CZ")
-                        .street("Hrnčírska")
-                        .houseNumber("99")
-                        .build())
-                .build();
-
-        userService.create(user);
-    }
-}

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/common/DomainMapper.java

 package org.fuseri.modulelanguageschool.common;
 import org.fuseri.model.dto.common.DomainObjectDto;
-import org.fuseri.model.dto.common.Result;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 
 import java.util.List;
 
@@ -15,11 +13,7 @@ public interface DomainMapper<T extends DomainObject, S extends DomainObjectDto>
 
     List<S> toDtoList(List<T> entities);
 
-    @Mappings({
-            @Mapping(target = "total", expression = "java(source.getTotalElements())"),
-            @Mapping(target = "page", expression = "java(source.getNumber())"),
-            @Mapping(target = "pageSize", expression = "java(source.getSize())"),
-            @Mapping(target = "items", expression = "java(toDtoList(source.getContent()))")
-    })
-    Result<S> toResult(Page<T> source);
+    default Page<S> toDtoPage(Page<T> entities) {
+        return new PageImpl<>(toDtoList(entities.getContent()), entities.getPageable(), entities.getTotalPages());
+    }
 }

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/common/DomainService.java

 package org.fuseri.modulelanguageschool.common;
 
+import jakarta.persistence.EntityNotFoundException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -26,4 +27,27 @@ public abstract class DomainService<T extends DomainObject> {
     public Page<T> findAll(int page) {
         return getRepository().findAll(PageRequest.of(page, DEFAULT_PAGE_SIZE));
     }
+
+    /**
+     * Delete an entity with specified id
+     * @param id id of the entity to delete
+     */
+    public void delete(long id) {
+        getRepository().deleteById(id);
+    }
+
+    /**
+     * Update an entity
+     *
+     * @param id the entity ID
+     * @param entity the entity to update
+     * @return the updated entity
+     */
+    public T update(Long id, T entity) {
+        if (!getRepository().existsById(id)) {
+            throw new EntityNotFoundException("Entity with id " + entity.getId() + " not found.");
+        }
+        entity.setId(id);
+        return getRepository().save(entity);
+    }
 }

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/Course.java

@@ -6,6 +6,7 @@ import org.fuseri.modulelanguageschool.common.DomainObject;
 import org.fuseri.modulelanguageschool.user.User;
 
 import java.util.List;
+import java.util.Set;
 
 @Getter
 @Setter
@@ -28,6 +29,7 @@ public class Course extends DomainObject {
     @ManyToMany
     private List<User> students;
 
+    private boolean finished = false;
     public void enrolStudent(User student) {
         students.add(student);
     }
@@ -35,4 +37,15 @@ public class Course extends DomainObject {
     public void expelStudent(User student) {
         students.remove(student);
     }
+
+    public Course(String name, Integer capacity, Language language, ProficiencyLevel proficiency) {
+        this.name = name;
+        this.capacity = capacity;
+        this.language = language;
+        this.proficiency = proficiency;
+    }
+
+    public void setFinished(boolean finished) {
+        this.finished = finished;
+    }
 }

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseController.java

@@ -170,8 +170,8 @@ public class CourseController {
             @ApiResponse(code = 200, message = "Successfully enrolled student in course"),
             @ApiResponse(code = 404, message = "Course not found")
     })
-    public ResponseEntity<CourseDto> enrol(@PathVariable Long id, @RequestBody UserDto student) {
-        CourseDto updatedCourse = courseFacade.enrol(id, student);
+    public ResponseEntity<CourseDto> enrol(@PathVariable Long id, @RequestParam Long studentId) {
+        CourseDto updatedCourse = courseFacade.enrol(id, studentId);
         return ResponseEntity.ok(updatedCourse);
     }
 

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseFacade.java

@@ -6,6 +6,7 @@ import org.fuseri.model.dto.course.LanguageTypeDto;
 import org.fuseri.model.dto.course.ProficiencyLevelDto;
 import org.fuseri.model.dto.user.UserDto;
 import org.fuseri.modulelanguageschool.user.UserMapper;
+import org.fuseri.modulelanguageschool.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
@@ -18,22 +19,18 @@ import java.util.List;
 @Service
 @Transactional
 public class CourseFacade {
+    private final CourseService courseService;
+    private final UserService userService;
+    private final CourseMapper courseMapper;
+    private final UserMapper userMapper;
 
     @Autowired
-    private CourseService courseService;
-
-    @Autowired
-    private CourseMapper courseMapper;
-
-    @Autowired
-    private UserMapper userMapper;
-
-//    @Autowired
-//    public CourseFacade(CourseService courseService, CourseMapper courseMapper, UserMapper userMapper) {
-//        this.courseService = courseService;
-//        this.courseMapper = courseMapper;
-//        this.userMapper = userMapper;
-//    }
+    public CourseFacade(CourseService courseService, UserService userService, CourseMapper courseMapper, UserMapper userMapper) {
+        this.courseService = courseService;
+        this.userService = userService;
+        this.courseMapper = courseMapper;
+        this.userMapper = userMapper;
+    }
 
     @Transactional
     public CourseDto create(CourseCreateDto dto) {
@@ -69,8 +66,9 @@ public class CourseFacade {
         return courseMapper.mapToList(courseService.findAll(Language.valueOf(lang.name()), ProficiencyLevel.valueOf(prof.name())));
     }
 
-    public CourseDto enrol(Long id, UserDto student) {
-        return courseMapper.mapToDto(courseService.enrol(id, userMapper.fromDto(student)));
+    public CourseDto enrol(Long id, Long studentId) {
+        var student = userService.find(studentId);
+        return courseMapper.mapToDto(courseService.enrol(id, student));
     }
 
     public CourseDto expel(Long id, UserDto student) {

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/course/CourseRepository.java

@@ -9,6 +9,10 @@ import java.util.List;
 @Repository
 public interface CourseRepository extends JpaRepository<Course, Long> {
 
+
+    @Query("SELECT c FROM Course c left join fetch User u WHERE c.language = ?1 AND u.userType!=\"ADMIN\"")
+    Course getById(Long id);
+
     @Query("SELECT c FROM Course c WHERE c.language = ?1")
     List<Course> findAllByLang(Language language);
 

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/Address.java

@@ -8,6 +8,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode
 @Embeddable
 public class Address {