-
- Downloads
There was an error fetching the commit references. Please try again later.
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
Showing
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/User.java 19 additions, 5 deletions.../main/java/org/fuseri/modulelanguageschool/user/User.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserController.java 102 additions, 47 deletions.../org/fuseri/modulelanguageschool/user/UserController.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserFacade.java 74 additions, 0 deletions...java/org/fuseri/modulelanguageschool/user/UserFacade.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserMapper.java 1 addition, 1 deletion...java/org/fuseri/modulelanguageschool/user/UserMapper.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserRepository.java 11 additions, 0 deletions.../org/fuseri/modulelanguageschool/user/UserRepository.java
- application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/UserService.java 25 additions, 1 deletion...ava/org/fuseri/modulelanguageschool/user/UserService.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseControllerTest.java 14 additions, 11 deletions...eri/modulelanguageschool/course/CourseControllerTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseFacadeTest.java 2 additions, 14 deletions.../fuseri/modulelanguageschool/course/CourseFacadeTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseMapperTest.java 4 additions, 7 deletions.../fuseri/modulelanguageschool/course/CourseMapperTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseRepositoryTest.java 1 addition, 1 deletion...eri/modulelanguageschool/course/CourseRepositoryTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/course/CourseServiceTest.java 3 additions, 3 deletions...fuseri/modulelanguageschool/course/CourseServiceTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureControllerTest.java 4 additions, 3 deletions...i/modulelanguageschool/lecture/LectureControllerTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureFacadeTest.java 2 additions, 1 deletion...useri/modulelanguageschool/lecture/LectureFacadeTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureMapperTest.java 5 additions, 7 deletions...useri/modulelanguageschool/lecture/LectureMapperTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureRepositoryTest.java 4 additions, 6 deletions...i/modulelanguageschool/lecture/LectureRepositoryTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/lecture/LectureServiceTest.java 4 additions, 4 deletions...seri/modulelanguageschool/lecture/LectureServiceTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserControllerTest.java 101 additions, 71 deletions.../fuseri/modulelanguageschool/user/UserControllerTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserFacadeTest.java 159 additions, 0 deletions.../org/fuseri/modulelanguageschool/user/UserFacadeTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserMapperTest.java 116 additions, 0 deletions.../org/fuseri/modulelanguageschool/user/UserMapperTest.java
- application/module-language-school/src/test/java/org/fuseri/modulelanguageschool/user/UserRepositoryTest.java 57 additions, 0 deletions.../fuseri/modulelanguageschool/user/UserRepositoryTest.java
Loading
Please register or sign in to comment