Merge pull request #60 from Domitory-CheckMate/feature/59-domain

[fix] 체크리스트 오타 수정
Domitory-CheckMate · Jan 24, 2024 · 999aaab · 999aaab
2 parents ba98181 + ef9add1
commit 999aaab
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 37 deletions.
diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/controller/CheckListController.java b/src/main/java/org/gachon/checkmate/domain/checkList/controller/CheckListController.java
@@ -25,6 +25,7 @@ public ResponseEntity<SuccessResponse<?>> createCheckList(@UserId final Long use
     @PatchMapping("/my")
     public ResponseEntity<SuccessResponse<?>> updateCheckList(@UserId final Long userId,
                                                               @RequestBody final CheckListRequestDto checkListRequestDto) {
+        System.out.println("my logs " + checkListRequestDto.cleanType());
         checkListService.updateCheckList(userId, checkListRequestDto);
         return SuccessResponse.ok(null);
     }

diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/converter/SleepGridingTypeConverter.java b/src/main/java/org/gachon/checkmate/domain/checkList/converter/SleepGridingTypeConverter.java
diff --git a/...main/java/org/gachon/checkmate/domain/checkList/converter/SleepGrindingTypeConverter.java b/...main/java/org/gachon/checkmate/domain/checkList/converter/SleepGrindingTypeConverter.java
@@ -0,0 +1,12 @@
+package org.gachon.checkmate.domain.checkList.converter;
+
+import jakarta.persistence.Converter;
+import org.gachon.checkmate.domain.checkList.entity.SleepGrindingType;
+import org.gachon.checkmate.global.utils.AbstractEnumCodeAttributeConverter;
+
+@Converter
+public class SleepGrindingTypeConverter extends AbstractEnumCodeAttributeConverter<SleepGrindingType> {
+    public SleepGrindingTypeConverter() {
+        super(SleepGrindingType.class);
+    }
+}
diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/dto/request/CheckListRequestDto.java b/src/main/java/org/gachon/checkmate/domain/checkList/dto/request/CheckListRequestDto.java
@@ -9,7 +9,7 @@ public record CheckListRequestDto(
         LifePatternType lifePatternType,
         CallType callType,
         EarPhoneType earPhoneType,
-        SleepGridingType sleepGridingType,
+        SleepGrindingType sleepGrindingType,
         SleepSnoreType sleepSnoreType,
         SleepTalkingType sleepTalkingType,
         SleepTurningType sleepTurningType,

diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/dto/response/CheckListResponseDto.java b/src/main/java/org/gachon/checkmate/domain/checkList/dto/response/CheckListResponseDto.java
@@ -1,17 +1,18 @@
 package org.gachon.checkmate.domain.checkList.dto.response;
 
 import lombok.Builder;
-import org.gachon.checkmate.domain.checkList.entity.*;
+import org.gachon.checkmate.domain.checkList.entity.CheckList;
+import org.gachon.checkmate.domain.checkList.entity.PostCheckList;
 
 @Builder
 public record CheckListResponseDto(
         String cleanType,
         String drinkType,
         String homeType,
-        String lifePatterType,
+        String lifePatternType,
         String callType,
         String earPhoneType,
-        String sleepGridingType,
+        String sleepGrindingType,
         String sleepSnoreType,
         String sleepTalkingType,
         String sleepTurningType,
@@ -22,10 +23,10 @@ public static CheckListResponseDto of(CheckList checkList) {
                 .cleanType(checkList.getCleanType().getDesc())
                 .drinkType(checkList.getDrinkType().getDesc())
                 .homeType(checkList.getHomeType().getDesc())
-                .lifePatterType(checkList.getLifePatternType().getDesc())
-                .callType(checkList.getCallType().getCode())
-                .earPhoneType(checkList.getEarPhoneType().getCode())
-                .sleepGridingType(checkList.getSleepGridingType().getDesc())
+                .lifePatternType(checkList.getLifePatternType().getDesc())
+                .callType(checkList.getCallType().getDesc())
+                .earPhoneType(checkList.getEarPhoneType().getDesc())
+                .sleepGrindingType(checkList.getSleepGrindingType().getDesc())
                 .sleepSnoreType(checkList.getSleepSnoreType().getDesc())
                 .sleepTalkingType(checkList.getSleepTalkingType().getDesc())
                 .sleepTurningType(checkList.getSleepTurningType().getDesc())
@@ -38,10 +39,10 @@ public static CheckListResponseDto ofPostCheckList(PostCheckList checkList) {
                 .cleanType(checkList.getCleanType().getDesc())
                 .drinkType(checkList.getDrinkType().getDesc())
                 .homeType(checkList.getHomeType().getDesc())
-                .lifePatterType(checkList.getLifePatternType().getDesc())
-                .callType(checkList.getCallType().getCode())
-                .earPhoneType(checkList.getEarPhoneType().getCode())
-                .sleepGridingType(checkList.getSleepGridingType().getDesc())
+                .lifePatternType(checkList.getLifePatternType().getDesc())
+                .callType(checkList.getCallType().getDesc())
+                .earPhoneType(checkList.getEarPhoneType().getDesc())
+                .sleepGrindingType(checkList.getSleepGrindingType().getDesc())
                 .sleepSnoreType(checkList.getSleepSnoreType().getDesc())
                 .sleepTalkingType(checkList.getSleepTalkingType().getDesc())
                 .sleepTurningType(checkList.getSleepTurningType().getDesc())

diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/entity/CheckList.java b/src/main/java/org/gachon/checkmate/domain/checkList/entity/CheckList.java
@@ -29,8 +29,8 @@ public class CheckList extends BaseTimeEntity {
     private CallType callType;
     @Convert(converter = EarPhoneTypeConverter.class)
     private EarPhoneType earPhoneType;
-    @Convert(converter = SleepGridingTypeConverter.class)
-    private SleepGridingType sleepGridingType;
+    @Convert(converter = SleepGrindingTypeConverter.class)
+    private SleepGrindingType sleepGrindingType;
     @Convert(converter = SleepSnoreTypeConverter.class)
     private SleepSnoreType sleepSnoreType;
     @Convert(converter = SleepTalkingTypeConverter.class)
@@ -51,7 +51,7 @@ public static CheckList createCheckList(User user, CheckListRequestDto checkList
                 .lifePatternType(checkListRequestDto.lifePatternType())
                 .callType(checkListRequestDto.callType())
                 .earPhoneType(checkListRequestDto.earPhoneType())
-                .sleepGridingType(checkListRequestDto.sleepGridingType())
+                .sleepGrindingType(checkListRequestDto.sleepGrindingType())
                 .sleepSnoreType(checkListRequestDto.sleepSnoreType())
                 .sleepTalkingType(checkListRequestDto.sleepTalkingType())
                 .sleepTurningType(checkListRequestDto.sleepTurningType())
@@ -69,7 +69,7 @@ public void updateCheckList(CheckListRequestDto checkListRequestDto) {
         this.lifePatternType = checkListRequestDto.lifePatternType();
         this.callType = checkListRequestDto.callType();
         this.earPhoneType = checkListRequestDto.earPhoneType();
-        this.sleepGridingType = checkListRequestDto.sleepGridingType();
+        this.sleepGrindingType = checkListRequestDto.sleepGrindingType();
         this.sleepSnoreType = checkListRequestDto.sleepSnoreType();
         this.sleepTalkingType = checkListRequestDto.sleepTalkingType();
         this.sleepTurningType = checkListRequestDto.sleepTurningType();

diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/entity/PostCheckList.java b/src/main/java/org/gachon/checkmate/domain/checkList/entity/PostCheckList.java
@@ -29,8 +29,8 @@ public class PostCheckList extends BaseTimeEntity {
     private CallType callType;
     @Convert(converter = EarPhoneTypeConverter.class)
     private EarPhoneType earPhoneType;
-    @Convert(converter = SleepGridingTypeConverter.class)
-    private SleepGridingType sleepGridingType;
+    @Convert(converter = SleepGrindingTypeConverter.class)
+    private SleepGrindingType sleepGrindingType;
     @Convert(converter = SleepSnoreTypeConverter.class)
     private SleepSnoreType sleepSnoreType;
     @Convert(converter = SleepTalkingTypeConverter.class)
@@ -51,7 +51,7 @@ public static PostCheckList createPostCheckList(CheckListRequestDto checkListReq
                 .lifePatternType(checkListRequestDto.lifePatternType())
                 .callType(checkListRequestDto.callType())
                 .earPhoneType(checkListRequestDto.earPhoneType())
-                .sleepGridingType(checkListRequestDto.sleepGridingType())
+                .sleepGrindingType(checkListRequestDto.sleepGrindingType())
                 .sleepSnoreType(checkListRequestDto.sleepSnoreType())
                 .sleepTalkingType(checkListRequestDto.sleepTalkingType())
                 .sleepTurningType(checkListRequestDto.sleepTurningType())
@@ -69,7 +69,7 @@ public void updatePostCheckList(CheckListRequestDto checkListRequestDto) {
         this.lifePatternType = checkListRequestDto.lifePatternType();
         this.callType = checkListRequestDto.callType();
         this.earPhoneType = checkListRequestDto.earPhoneType();
-        this.sleepGridingType = checkListRequestDto.sleepGridingType();
+        this.sleepGrindingType = checkListRequestDto.sleepGrindingType();
         this.sleepSnoreType = checkListRequestDto.sleepSnoreType();
         this.sleepTalkingType = checkListRequestDto.sleepTalkingType();
         this.sleepTurningType = checkListRequestDto.sleepTurningType();

diff --git a/...in/checkList/entity/SleepGridingType.java → ...n/checkList/entity/SleepGrindingType.java b/...in/checkList/entity/SleepGridingType.java → ...n/checkList/entity/SleepGrindingType.java
@@ -7,14 +7,14 @@
 
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Getter
-public enum SleepGridingType implements EnumField {
-    TRUE("1", "코골이"),
+public enum SleepGrindingType implements EnumField {
+    TRUE("1", "이갈이"),
     FALSE("2", "false");
 
     private final String code;
     private final String desc;
 
-    public int compareRateTo(SleepGridingType e) {
+    public int compareRateTo(SleepGrindingType e) {
         return this.equals(e) ? 1 : 0;
     }
 }
diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/entity/SleepSnoreType.java b/src/main/java/org/gachon/checkmate/domain/checkList/entity/SleepSnoreType.java
@@ -8,7 +8,7 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Getter
 public enum SleepSnoreType implements EnumField {
-    TRUE("1", "이갈이"),
+    TRUE("1", "코골이"),
     FALSE("2", "false");
 
     private final String code;

diff --git a/src/main/java/org/gachon/checkmate/domain/checkList/utils/MatchRateCalculator.java b/src/main/java/org/gachon/checkmate/domain/checkList/utils/MatchRateCalculator.java
@@ -12,7 +12,7 @@ public static int getAccuracy(PostCheckList postCheckList, CheckList checkList)
         count += postCheckList.getLifePatternType().compareRateTo(checkList.getLifePatternType());
         count += postCheckList.getCallType().compareRateTo(checkList.getCallType());
         count += postCheckList.getEarPhoneType().compareRateTo(checkList.getEarPhoneType());
-        count += postCheckList.getSleepGridingType().compareRateTo(checkList.getSleepGridingType());
+        count += postCheckList.getSleepGrindingType().compareRateTo(checkList.getSleepGrindingType());
         count += postCheckList.getSleepSnoreType().compareRateTo(checkList.getSleepSnoreType());
         count += postCheckList.getSleepTalkingType().compareRateTo(checkList.getSleepTalkingType());
         count += postCheckList.getSleepTurningType().compareRateTo(checkList.getSleepTurningType());