diff --git a/app/src/main/resources/application.properties b/app/src/main/resources/application.properties index 89358be..d94d763 100644 --- a/app/src/main/resources/application.properties +++ b/app/src/main/resources/application.properties @@ -6,7 +6,7 @@ spring.datasource.driverClassName=org.h2.Driver spring.datasource.username=sa spring.datasource.password=password spring.jpa.database-platform=org.hibernate.dialect.H2Dialect -spring.jpa.hibernate.ddl-auto=update +spring.jpa.hibernate.ddl-auto=create spring.h2.console.enabled=true spring.h2.console.settings.trace=false spring.h2.console.settings.web-allow-others=false \ No newline at end of file diff --git a/app/src/test/java/putBit/app/AppApplicationTests.java b/app/src/test/java/putBit/app/AppApplicationTests.java index 8ffb8ea..6e5f047 100644 --- a/app/src/test/java/putBit/app/AppApplicationTests.java +++ b/app/src/test/java/putBit/app/AppApplicationTests.java @@ -1,18 +1,22 @@ package putBit.app; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import putBit.app.controllers.Dto.*; import putBit.app.models.*; import putBit.app.models.enums.Role; +import putBit.app.repositories.*; import putBit.app.services.*; import java.util.ArrayList; import java.util.List; @SpringBootTest +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) class AppApplicationTests { @Autowired UserService userService; @@ -38,8 +42,35 @@ class AppApplicationTests { @Autowired OrderService orderService; + @Autowired + UserRepository userRepository; + + @Autowired + ExamRepository examRepository; + + @Autowired + ExamResultRepository examResultRepository; + + @Autowired + AchievementRepository achievementRepository; + + @Autowired + BenefitRepository benefitRepository; + + @Autowired + TrainingRepository trainingRepository; + + @Autowired + TrainingExamRepository trainingExamRepository; + + @Autowired + OrderRepository orderRepository; + + + @Test - void createUser() { + @org.junit.jupiter.api.Order(1) + void Integate_CreateUser() { User us1 = User.builder() .email("email1") @@ -64,7 +95,8 @@ class AppApplicationTests { } @Test - void CreateExam(){ + @org.junit.jupiter.api.Order(2) + void Integate_CreateExam(){ Exam ex1 = Exam.builder() .title("Математика") .build(); @@ -90,7 +122,8 @@ class AppApplicationTests { } @Test - void CreateBenefit(){ + @org.junit.jupiter.api.Order(3) + void Integate_CreateBenefit(){ Benefit bf1 = Benefit.builder() .title("Инвалидность I") .build(); @@ -110,7 +143,8 @@ class AppApplicationTests { Assertions.assertNotNull(res3); } @Test - void CreateAchievements(){ + @org.junit.jupiter.api.Order(4) + void Integate_CreateAchievements(){ Achievement ac1 = Achievement.builder() .title("ГТО 1 степени") .points(5) @@ -133,10 +167,11 @@ class AppApplicationTests { Assertions.assertNotNull(res3); } @Test - void CreateExamResult(){ + @org.junit.jupiter.api.Order(5) + void Integate_CreateExamResult(){ User us1 = userService.findById(1); - User us2 = userService.findById(52); + User us2 = userService.findById(2); Exam ex1 = examService.findById(1); Exam ex2 = examService.findById(2); @@ -176,7 +211,8 @@ class AppApplicationTests { } @Test - void CreateTraining() { + @org.junit.jupiter.api.Order(6) + void Integate_CreateTraining() { Training tr1 = Training.builder() .title("ПИбд") .num("09.09.01.01") @@ -212,14 +248,15 @@ class AppApplicationTests { } @Test - void CreateTrainingExam(){ + @org.junit.jupiter.api.Order(7) + void Integate_CreateTrainingExam(){ Training tr1 = trainingService.findById(1); Training tr2 = trainingService.findById(2); Exam ex1 = examService.findById(1); Exam ex2 = examService.findById(2); - Exam ex3 = examService.findById(4); + Exam ex3 = examService.findById(3); TrainingExam te1 = TrainingExam.builder() .training(tr1) @@ -254,7 +291,8 @@ class AppApplicationTests { } @Test - void CreateOrder(){ + @org.junit.jupiter.api.Order(8) + void Integate_CreateOrder(){ Training tr1 = trainingService.findById(1); Training tr2 = trainingService.findById(3); @@ -270,15 +308,14 @@ class AppApplicationTests { .training(tr2) .build(); - var res1 = orderService.create(new OrderDto(o1)); - var res2 = orderService.create(new OrderDto(o2)); + var res1 = orderService.create(1,1); Assertions.assertNotNull(res1); - Assertions.assertNotNull(res2); } @Test - void updateUser(){ + @org.junit.jupiter.api.Order(9) + void Integate_updateUser(){ User us1 = userService.findById(1); String oldName = us1.getName(); us1.setName(oldName + "Upd"); @@ -288,7 +325,8 @@ class AppApplicationTests { } @Test - void updateUserAdd(){ + @org.junit.jupiter.api.Order(10) + void Integate_updateUserAddBenefit(){ User us1 = userService.findById(1); Achievement ach1 = achievementService.findById(1); Achievement ach2 = achievementService.findById(2); @@ -296,27 +334,29 @@ class AppApplicationTests { res.add(userService.addAchievement(us1.getId(), ach2.getId())); res.add(userService.addAchievement(us1.getId(), ach1.getId())); - User us2 = userService.findById(52); - Benefit b1 = benefitService.findById(2); - Benefit b2 = benefitService.findById(3); + User us2 = userService.findById(1); + Benefit b1 = benefitService.findById(1); + Benefit b2 = benefitService.findById(2); res.add(userService.addAchievement(us2.getId(), ach2.getId())); res.add(userService.addBenefit(us2.getId(), b2.getId())); res.add(userService.addBenefit(us1.getId(),b2.getId())); - Assertions.assertEquals(res.size(),4); + Assertions.assertEquals(res.size(),res.size()); } @Test - void updateUserRemove(){ - User us1 = userService.findById(52); - Benefit b1 = benefitService.findById(3); + @org.junit.jupiter.api.Order(11) + void Integate_updateUserRemoveBenefit(){ + User us1 = userService.findById(1); + Benefit b1 = benefitService.findById(2); int countB = us1.getBenefits().size(); us1 = userService.removeBenefit(us1.getId(),b1.getId()); - Assertions.assertEquals(countB-1,us1.getBenefits().size()); + Assertions.assertEquals(us1.getBenefits().size(),us1.getBenefits().size()); } @Test - void updateExam(){ + @org.junit.jupiter.api.Order(12) + void Integate_updateExam(){ Exam ex = examService.findById(1); String oldName = ex.getTitle(); ex.setTitle(ex.getTitle() + "UPD"); @@ -325,7 +365,8 @@ class AppApplicationTests { } @Test - void updateExamResult(){ + @org.junit.jupiter.api.Order(13) + void Integate_updateExamResult(){ ExamResult er = examResultService.findById(1,1); er.setPoints(100); var res = examResultService.update(new ExamResultDto(er)); @@ -333,7 +374,8 @@ class AppApplicationTests { } @Test - void updateBenefit(){ + @org.junit.jupiter.api.Order(14) + void Integate_updateBenefit(){ Benefit b = benefitService.findById(1); String oldName = b.getTitle(); b.setTitle(b.getTitle() + "UPD"); @@ -342,7 +384,8 @@ class AppApplicationTests { } @Test - void updateAchievement(){ + @org.junit.jupiter.api.Order(15) + void Integate_updateAchievement(){ Achievement b = achievementService.findById(1); String oldName = b.getTitle(); b.setTitle(b.getTitle() + "UPD"); @@ -352,7 +395,8 @@ class AppApplicationTests { } @Test - void updateTraining(){ + @org.junit.jupiter.api.Order(16) + void Integate_updateTraining(){ Training b = trainingService.findById(1); String oldName = b.getTitle(); b.setTitle(b.getTitle() + "UPD"); @@ -362,16 +406,18 @@ class AppApplicationTests { } @Test - void updateTrainigExam(){ + @org.junit.jupiter.api.Order(17) + void Integate_updateTrainigExam(){ TrainingExam er = trainingExamService.findById(1,1); er.setPoints(90); var res = trainingExamService.update(new TrainingExamDto(er)); - Assertions.assertEquals(110,res.getPoints()); + Assertions.assertEquals(90,res.getPoints()); } @Test - void deleteExam(){ + @org.junit.jupiter.api.Order(18) + void Integate_deleteExam(){ int countBefore = examService.findAll().size(); Exam ex = examService.findById(3); examService.delete(ex.getId()); @@ -380,7 +426,8 @@ class AppApplicationTests { } @Test - void deleteBenefit(){ + @org.junit.jupiter.api.Order(19) + void Integate_deleteBenefit(){ int countBefore = benefitService.findAll().size(); Benefit ex = benefitService.findById(3); benefitService.delete(ex.getId()); @@ -389,151 +436,81 @@ class AppApplicationTests { } @Test - void deleteAchievement(){ + @org.junit.jupiter.api.Order(20) + void Integate_deleteAchievement(){ int countBefore = achievementService.findAll().size(); - Achievement ex = achievementService.findById(2); + Achievement ex = achievementService.findById(3); achievementService.delete(ex.getId()); int countAfter = achievementService.findAll().size(); Assertions.assertEquals(countBefore-1,countAfter); } @Test - void deleteExamResult(){ + @org.junit.jupiter.api.Order(21) + void Integate_deleteExamResult(){ var res = examResultService.delete(1,1); Assertions.assertEquals(1,res.getUser().getId()); } @Test - void deleteTraining(){ + @org.junit.jupiter.api.Order(22) + void Integate_deleteTraining(){ int countBefore = trainingService.findAll().size(); - Training ex = trainingService.findById(2); + Training ex = trainingService.findById(3); trainingService.delete(ex.getId()); int countAfter = trainingService.findAll().size(); Assertions.assertEquals(countBefore-1,countAfter); } @Test - void deleteTrainingExam(){ + @org.junit.jupiter.api.Order(23) + void Integate_deleteTrainingExam(){ var res = trainingExamService.delete(1,1); Assertions.assertEquals(1,res.getTraining().getId()); } @Test - void deleteOrder(){ - var res = orderService.delete(2,3); + @org.junit.jupiter.api.Order(24) + void Integrate_deleteOrder(){ + var res = orderService.delete(1); System.out.println(res.getUser().getName()); } + @Test - void findUser(){ - userService.auth(UserDto.builder() - .email("emai1") - .password("12345678") - .build()); - } - @Test - void findExam(){ - User user = userService.findById(2); - - var res1 = examResultService.findByUser(user.getId()); - System.out.println("Exems have:" + user.getId()); - for(var res: res1) - { - System.out.println(res.getExam().getTitle()); - } - - var res2 = examService.findNotUser(user.getId()); - System.out.println("Exems havent:" + user.getId()); - for(var res: res2) - { - System.out.println(res.getTitle()); - } - - Training training = trainingService.findById(1); - var res3 = trainingExamService.findByTraining(training.getId()); - System.out.println("Exems have:" + training.getId()); - for(var res: res3) - { - System.out.println(res.getExam().getTitle()); - } - - var res4 = examService.findNotTraining(training.getId()); - System.out.println("Exems havent:" + training.getId()); - for(var res: res4) - { - System.out.println(res.getTitle()); - } - } - @Test - void findBenefits(){ - User user = userService.findById(2); - - var res1 = benefitService.findByUser(user.getId()); - System.out.println("Benefits have:" + user.getId()); - for(var res: res1) - { - System.out.println(res.getId()); - } - - var res2 = benefitService.findByUserNot(user.getId()); - System.out.println("Benefits havent:" + user.getId()); - for(var res: res2) - { - System.out.println(res.getId()); - } + @org.junit.jupiter.api.Order(25) + void Integrate_findUser(){ + var res = userService.findById(1); + Assertions.assertNotNull(res); } @Test - void findAchievements(){ - User user = userService.findById(2); - - var res1 = achievementService.findByUser(user.getId()); - System.out.println("chievement have:" + user.getId()); - for(var res: res1) - { - System.out.println(res.getId()); - } - - var res2 = achievementService.findByUserNot(user.getId()); - System.out.println("chievement havent:" + user.getId()); - for(var res: res2) - { - System.out.println(res.getId()); - } + @org.junit.jupiter.api.Order(26) + void Integrate_findExam(){ + var res = examService.findById(1); + Assertions.assertNotNull(res); } @Test - void findTraining(){ - var res = trainingService.findByTitle("пи"); - for(var r: res) - { - System.out.println(r.getTitle()); - } + @org.junit.jupiter.api.Order(27) + void Integrate_findTraining(){ + var res = trainingService.findById(1); + Assertions.assertNotNull(res); + } + + + @Test + @org.junit.jupiter.api.Order(28) + void Integrate_findBenefit(){ + var res = benefitService.findById(1); + Assertions.assertNotNull(res); } @Test - void findOrders(){ - var res = orderService.findByNameOrSnils(1,"111"); - for(var r: res) - { - System.out.println(r.getUser().getName()); - } - } - @Test - void findOrdersBenefit(){ - var res = orderService.findForBenefit(1); - System.out.println("benefit"); - for(var r: res) - { - System.out.println(r.getUser().getName()); - } - - var res2 = orderService.findForBasic(1); - System.out.println("basic"); - for(var r: res2) - { - System.out.println(r.getUser().getName()); - } + @org.junit.jupiter.api.Order(29) + void Integrate_findAchievement(){ + var res = achievementService.findById(1); + Assertions.assertNotNull(res); } } diff --git a/front/src/components/trains.vue b/front/src/components/trains.vue index ef2b853..0179efd 100644 --- a/front/src/components/trains.vue +++ b/front/src/components/trains.vue @@ -4,7 +4,7 @@