Merge pull request #192 from Team-Blitz-Steady/feat/#181

Instancio를 활용한 Fixture 생성
Team-Blitz-Steady · Dec 27, 2023 · d94e185 · d94e185
2 parents 290fcfa + 737ec14
commit d94e185
Show file tree

Hide file tree

Showing 7 changed files with 210 additions and 399 deletions.
diff --git a/src/main/java/dev/steady/steady/domain/Steady.java b/src/main/java/dev/steady/steady/domain/Steady.java
@@ -213,8 +213,8 @@ public int getParticipantLimit() {
         return participants.getParticipantLimit();
     }
 
-    public boolean isDeletable(User user) {
-        validateLeader(user);
+    public boolean isDeletable(User leader) {
+        validateLeader(leader);
         return numberOfParticipants == 1;
     }
 

diff --git a/src/main/java/dev/steady/steady/dto/response/SteadyDto.java b/src/main/java/dev/steady/steady/dto/response/SteadyDto.java
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -3,9 +3,9 @@ spring:
     import: optional:classpath:/sub/
 
   datasource:
-    url: jdbc:mysql://13.124.69.97:3306/steady
+    url: jdbc:mysql://localhost:3306/steady
     username: steady
-    password: steady13dev
+    password: steady13
 
   jpa:
     open-in-view: false

diff --git a/src/test/java/dev/steady/application/service/ApplicationServiceTest.java b/src/test/java/dev/steady/application/service/ApplicationServiceTest.java
@@ -105,7 +105,7 @@ void createApplicationTest() {
         //given
         var steady = steadyRepository.save(createSteady(leader, List.of(stack)));
         var surveyResultRequests = createSurveyResultRequests();
-        var otherUser = userRepository.save(createSecondUser(position));
+        var otherUser = userRepository.save(generateUser(position));
         var userInfo = createUserInfo(otherUser.getId());
 
         //when
@@ -121,9 +121,9 @@ void createApplicationTest() {
     @Test
     void duplicateApplicationTest() {
         //given
-        var steady = steadyRepository.save(createSteady(leader, stack));
+        var steady = steadyRepository.save(createSteady(leader, List.of(stack)));
         var surveyResultRequests = createSurveyResultRequests();
-        var otherUser = userRepository.save(createSecondUser(position));
+        var otherUser = userRepository.save(generateUser(position));
         var userInfo = createUserInfo(otherUser.getId());
 
         //when
@@ -143,7 +143,7 @@ void duplicateApplicationTest() {
     @Test
     void leaderSubmissionTest() {
         //given
-        var steady = steadyRepository.save(createSteady(leader, stack));
+        var steady = steadyRepository.save(createSteady(leader, List.of(stack)));
         var surveyResultRequests = createSurveyResultRequests();
         var userInfo = createUserInfo(leader.getId());
 

diff --git a/src/test/java/dev/steady/steady/fixture/SteadyFixtures.java b/src/test/java/dev/steady/steady/fixture/SteadyFixtures.java