[#67] 기타 카테고리에 해당하는 활동 생성 시 디폴트 이모지 설정 및 리팩토링

src/main/java/com/hobak/happinessql/domain/activity/api/ActivityController.java

@@ -1,6 +1,7 @@
 package com.hobak.happinessql.domain.activity.api;
 
 import com.hobak.happinessql.domain.activity.application.*;
+import com.hobak.happinessql.domain.activity.converter.ActivityConverter;
 import com.hobak.happinessql.domain.activity.dto.*;
 import com.hobak.happinessql.global.response.DataResponseDto;
 import lombok.RequiredArgsConstructor;
@@ -22,14 +23,15 @@ public DataResponseDto<ActivityListResponseDto> getActivitiesByUserId(@RequestPa
         return DataResponseDto.of(response, "사용자의 모든 카테고리별 활동을 성공적으로 조회했습니다.");
     }
     @PostMapping
-    public DataResponseDto<ActivityCreateResponseDto> createActivity(@RequestBody ActivityCreateRequestDto request, @RequestParam Long userId){
-        ActivityCreateResponseDto response = activityCreateService.createActivity(request,userId);
-        return DataResponseDto.of(response,"활동을 성공적으로 추가했습니다.");
+    public DataResponseDto<ActivityResponseDto> createActivity(@RequestBody ActivityCreateRequestDto requestDto, @RequestParam Long userId){
+        ActivityResponseDto responseDto = activityCreateService.createActivity(requestDto,userId);
+        return DataResponseDto.of(responseDto,"활동을 성공적으로 추가했습니다.");
     }
     @DeleteMapping("/{activityId}")
-    public Long deleteActivity(@PathVariable Long activityId){
+    public DataResponseDto<ActivityResponseDto> deleteActivity(@PathVariable Long activityId){
         activityDeleteService.deleteActivity(activityId);
-        return activityId;
+        ActivityResponseDto responseDto = ActivityConverter.toActivityResponseDto(activityId);
+        return DataResponseDto.of(responseDto, "활동을 성공적으로 삭제했습니다.");
     }
     @PutMapping("/{activityId}")
     public DataResponseDto<ActivityUpdateResponseDto> updateActicity(@PathVariable Long activityId, @RequestBody ActivityUpdateRequestDto requestDto){

src/main/java/com/hobak/happinessql/domain/activity/application/ActivityCreateService.java

@@ -4,7 +4,7 @@
 import com.hobak.happinessql.domain.activity.domain.Activity;
 import com.hobak.happinessql.domain.activity.domain.Category;
 import com.hobak.happinessql.domain.activity.dto.ActivityCreateRequestDto;
-import com.hobak.happinessql.domain.activity.dto.ActivityCreateResponseDto;
+import com.hobak.happinessql.domain.activity.dto.ActivityResponseDto;
 import com.hobak.happinessql.domain.activity.repository.ActivityRepository;
 import com.hobak.happinessql.domain.activity.repository.CategoryRepository;
 import lombok.RequiredArgsConstructor;
@@ -19,14 +19,12 @@ public class ActivityCreateService {
 
     private final ActivityRepository activityRepository;
     private final CategoryRepository categoryRepository;
-    public ActivityCreateResponseDto createActivity(ActivityCreateRequestDto requestDto,Long userId) {
+    public ActivityResponseDto createActivity(ActivityCreateRequestDto requestDto, Long userId) {
         Category category = categoryRepository.findByUserId(userId);
-
-        Long nextActivityId = activityRepository.findNextActivityId();
-        Activity activity = new Activity(nextActivityId, requestDto.getActivityName(), category);
+        Activity activity = ActivityConverter.toActivity(requestDto, category);
 
         Activity savedActivity = activityRepository.save(activity);
-        return ActivityConverter.toActivityCreateResponseDto(savedActivity.getActivityId());
+        return ActivityConverter.toActivityResponseDto(savedActivity.getActivityId());
 
     }
 }

src/main/java/com/hobak/happinessql/domain/activity/converter/ActivityConverter.java

@@ -9,6 +9,13 @@
 import java.util.stream.Collectors;
 
 public class ActivityConverter {
+
+    public static Activity toActivity(ActivityCreateRequestDto requestDto, Category category) {
+        return Activity.builder()
+                .name(requestDto.getActivityName())
+                .category(category)
+                .build();
+    }
     public static ActivityDto toActivityDto(Activity activity) {
         return ActivityDto.builder()
                 .id(activity.getActivityId())
@@ -39,8 +46,8 @@ public static CategoryDto toCategoryDto(Category category) {
     }
 
 
-    public static ActivityCreateResponseDto toActivityCreateResponseDto(Long activityId){
-        return ActivityCreateResponseDto.builder()
+    public static ActivityResponseDto toActivityResponseDto(Long activityId){
+        return ActivityResponseDto.builder()
                 .activityId(activityId)
                 .build();
     }

src/main/java/com/hobak/happinessql/domain/activity/domain/Activity.java

@@ -7,13 +7,17 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 
 import java.util.List;
 
 @Getter
 @Entity
 @Table(name = "activity")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@DynamicInsert
+@DynamicUpdate
 public class Activity extends BaseTimeEntity {
 
     @Id

src/main/java/com/hobak/happinessql/domain/activity/dto/ActivityCreateResponseDto.java → src/main/java/com/hobak/happinessql/domain/activity/dto/ActivityResponseDto.java

@@ -7,10 +7,10 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class ActivityCreateResponseDto {
+public class ActivityResponseDto {
     private Long activityId;
     @Builder
-    ActivityCreateResponseDto(Long activityId){
+    ActivityResponseDto(Long activityId){
         this.activityId = activityId;
     }
 }

src/main/java/com/hobak/happinessql/domain/record/converter/RecordConverter.java

@@ -13,23 +13,23 @@
 
 public class RecordConverter {
 
-    public static Record toRecord(RecordCreateRequestDto recordRequestDto, User user, Activity activity) {
+    public static Record toRecord(RecordCreateRequestDto requestDto, User user, Activity activity) {
         return Record.builder()
-                .happiness(recordRequestDto.getHappiness())
-                .memo(recordRequestDto.getMemo())
+                .happiness(requestDto.getHappiness())
+                .memo(requestDto.getMemo())
                 .user(user)
                 .activity(activity)
                 .build();
     }
 
-    public static Location toLocation(RecordCreateRequestDto recordRequestDto, Record record) {
+    public static Location toLocation(RecordCreateRequestDto requestDto, Record record) {
         return Location.builder()
-                .fullName(recordRequestDto.getFullName())
-                .city(recordRequestDto.getCity())
-                .country(recordRequestDto.getCountry())
-                .district(recordRequestDto.getDistrict())
-                .latitude(recordRequestDto.getLatitude())
-                .longitude(recordRequestDto.getLongitude())
+                .fullName(requestDto.getFullName())
+                .city(requestDto.getCity())
+                .country(requestDto.getCountry())
+                .district(requestDto.getDistrict())
+                .latitude(requestDto.getLatitude())
+                .longitude(requestDto.getLongitude())
                 .record(record)
                 .build();
     }