Merge pull request #182 from YogitTeam/feat/user-profile

#9 fix : 모임 개설시, city 생성 오류
YogitTeam · Mar 24, 2023 · 28efab4 · 28efab4
2 parents a66a06e + a1f191b
commit 28efab4
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/server/src/main/java/com/yogit/server/user/service/UserServiceImpl.java b/server/src/main/java/com/yogit/server/user/service/UserServiceImpl.java
@@ -105,15 +105,13 @@ public ApplicationResponse<UserProfileRes> enterProfile(CreateUserProfileReq cre
         user.addAdditionalProfile(createUserProfileReq.getLatitude(), createUserProfileReq.getLongitude(), createUserProfileReq.getAboutMe(), createUserProfileReq.getJob());
 
         // 기존에 존재하는 city인 경우
+        City city = new City();
         if(cityRepository.existsByCityName(createUserProfileReq.getCityName())){
-            City city = cityRepository.findByCityName(createUserProfileReq.getCityName());
+            city = cityRepository.findByCityName(createUserProfileReq.getCityName());
             city.addUser(user);
         }
         else{ // 기존에 존재하지 않는 city인 경우
-            City city = City.builder()
-                    .user(user)
-                    .cityName(createUserProfileReq.getCityName())
-                    .build();
+            city.changeCityName(createUserProfileReq.getCityName());
             cityRepository.save(city);
             city.addUser(user);
         }