🔧[FIX]-#29-Result domain 수정

src/main/java/com/codingwasabi/trti/domain/member/MemberService.java

@@ -4,12 +4,9 @@
 import com.codingwasabi.trti.domain.member.model.request.RequestExistMemberDto;
 import com.codingwasabi.trti.domain.member.model.response.ResponseExistMemberDto;
 import com.codingwasabi.trti.domain.member.model.response.ResponseMyInfoDto;
-import com.codingwasabi.trti.domain.result.model.response.ResponseResultDto;
 
 public interface MemberService {
     ResponseMyInfoDto getMemberInfo(Member member);
 
     ResponseExistMemberDto existMember(RequestExistMemberDto requestDto);
-
-    ResponseResultDto getResult(Member member);
 }

src/main/java/com/codingwasabi/trti/domain/member/impl/MemberController.java

@@ -5,7 +5,6 @@
 import com.codingwasabi.trti.domain.member.model.request.RequestExistMemberDto;
 import com.codingwasabi.trti.domain.member.model.response.ResponseExistMemberDto;
 import com.codingwasabi.trti.domain.member.model.response.ResponseMyInfoDto;
-import com.codingwasabi.trti.domain.result.model.response.ResponseResultDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -30,8 +29,5 @@ public ResponseEntity<ResponseExistMemberDto> existMember(@RequestBody RequestEx
         return ResponseEntity.ok(memberService.existMember(requestDto));
     }
 
-    @GetMapping("/my/result")
-    public ResponseEntity<ResponseResultDto> getMemberResult(@AuthenticationPrincipal MemberAdaptor memberAdaptor) {
-        return ResponseEntity.ok(memberService.getResult(memberAdaptor.getMember()));
-    }
+
 }

src/main/java/com/codingwasabi/trti/domain/member/impl/MemberServiceImpl.java

@@ -6,7 +6,6 @@
 import com.codingwasabi.trti.domain.member.model.response.ResponseExistMemberDto;
 import com.codingwasabi.trti.domain.member.model.response.ResponseMyInfoDto;
 import com.codingwasabi.trti.domain.member.repository.MemberRepository;
-import com.codingwasabi.trti.domain.result.model.response.ResponseResultDto;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,10 +30,4 @@ public ResponseExistMemberDto existMember(RequestExistMemberDto requestDto) {
 
         return ResponseExistMemberDto.from(member);
     }
-
-    @Override
-    @Transactional(readOnly = true)
-    public ResponseResultDto getResult(Member member) {
-        return ResponseResultDto.from(member);
-    }
 }

src/main/java/com/codingwasabi/trti/domain/result/model/Result.java

@@ -18,19 +18,38 @@ public class Result {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Enumerated(EnumType.STRING)
+    @OneToOne(fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
     private ToStay toStay;
 
-    @Enumerated(EnumType.STRING)
-    private ToEat toEat;
-
-    @Enumerated(EnumType.STRING)
-    private ToMove toMove;
-
-    @Enumerated(EnumType.STRING)
+    @OneToOne(fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
+    private ToEat_1 toEat_1;
+
+    @OneToOne(fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
+    private ToEat_2 toEat_2;
+
+    @OneToOne(fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
+    private ToStay_1 toStay_1;
+
+    @OneToOne(fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
+    private ToStay_2 toStay_2;
+
+    @OneToOne(fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
+    private ToStay_3 toStay_3;
+
+    @OneToOne(fetch = FetchType.EAGER,
+            cascade = CascadeType.ALL,
+            orphanRemoval = true)
     private ToActive toActive;
-
-    @Enumerated(EnumType.STRING)
-    private Time time;
-
 }

src/main/java/com/codingwasabi/trti/domain/result/model/values/AnswerType.java

@@ -0,0 +1,46 @@
+package com.codingwasabi.trti.domain.result.model.values;
+
+import com.codingwasabi.trti.domain.common.Period;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Entity
+@Inheritance(strategy = InheritanceType.JOINED)
+@NoArgsConstructor
+@AllArgsConstructor
+@DiscriminatorColumn(name = "answer_type")
+public abstract class AnswerType extends Period implements CountChanger {
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    private boolean isAgreed = false;
+
+    private int count0 = 0;
+
+    private int count1 = 0;
+
+    private int selected;
+
+    @Override
+    public void addCount0() {
+        this.count0 ++;
+    }
+
+    @Override
+    public void addCount1() {
+        this.count1++;
+    }
+
+    @Override
+    public void minusCount0() {
+        this.count0--;
+    }
+
+    @Override
+    public void minusCount1() {
+        this.count1--;
+    }
+}

src/main/java/com/codingwasabi/trti/domain/result/model/values/CountChanger.java

@@ -0,0 +1,11 @@
+package com.codingwasabi.trti.domain.result.model.values;
+
+public interface CountChanger {
+    void addCount0();
+
+    void addCount1();
+
+    void minusCount0();
+
+    void minusCount1();
+}

src/main/java/com/codingwasabi/trti/domain/result/model/values/ToActive.java

@@ -1,6 +1,17 @@
 package com.codingwasabi.trti.domain.result.model.values;
 
-public enum ToActive {
-    STATIC,
-    DYNAMIC;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@DiscriminatorValue("TOACTIVE")
+public class ToActive extends AnswerType {
+    @Transient
+    private final int ID = 7;
 }

src/main/java/com/codingwasabi/trti/domain/result/model/values/ToEat_1.java

@@ -0,0 +1,17 @@
+package com.codingwasabi.trti.domain.result.model.values;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@DiscriminatorValue("TOEAT_1")
+public class ToEat_1 extends AnswerType {
+    @Transient
+    private final int ID = 2;
+}

src/main/java/com/codingwasabi/trti/domain/result/model/values/ToEat_2.java

@@ -0,0 +1,17 @@
+package com.codingwasabi.trti.domain.result.model.values;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@DiscriminatorValue("TOEAT_2")
+public class ToEat_2 extends AnswerType {
+    @Transient
+    private final int ID = 3;
+}

src/main/java/com/codingwasabi/trti/domain/result/model/values/ToStay.java

@@ -1,6 +1,17 @@
 package com.codingwasabi.trti.domain.result.model.values;
 
-public enum ToStay {
-    CHEAP,
-    EXPENSIVE;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@DiscriminatorValue("TOSTAY")
+public class ToStay extends AnswerType {
+    @Transient
+    private final int ID = 1;
 }

src/main/java/com/codingwasabi/trti/domain/result/model/values/ToStay_1.java

@@ -0,0 +1,17 @@
+package com.codingwasabi.trti.domain.result.model.values;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@DiscriminatorValue("TOSTAY_!")
+public class ToStay_1 extends AnswerType {
+    @Transient
+    private final int ID = 4;
+}

src/main/java/com/codingwasabi/trti/domain/result/model/values/ToStay_2.java

@@ -0,0 +1,17 @@
+package com.codingwasabi.trti.domain.result.model.values;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@DiscriminatorValue("TOSTAY_2")
+public class ToStay_2 extends AnswerType {
+    @Transient
+    private final int ID =5;
+}

src/main/java/com/codingwasabi/trti/domain/result/model/values/ToStay_3.java

@@ -0,0 +1,18 @@
+package com.codingwasabi.trti.domain.result.model.values;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.DiscriminatorValue;
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+@Getter
+@NoArgsConstructor
+@DiscriminatorValue("TOSTAY_3")
+public class ToStay_3 extends AnswerType {
+    @Transient
+    private final int ID = 6;
+
+}

src/main/java/com/codingwasabi/trti/util/survey/SurveyHandler.java

@@ -0,0 +1,8 @@
+package com.codingwasabi.trti.util.survey;
+
+import com.codingwasabi.trti.domain.result.model.Result;
+import com.codingwasabi.trti.util.survey.dto.RequestSurveyDto;
+
+public interface SurveyHandler {
+    Result proceed(RequestSurveyDto requestDto);
+}

src/main/java/com/codingwasabi/trti/util/survey/dto/RequestAnswerDto.java

@@ -0,0 +1,6 @@
+package com.codingwasabi.trti.util.survey.dto;
+
+public class RequestAnswerDto {
+    private Long id;
+    private Integer answer;
+}

src/main/java/com/codingwasabi/trti/util/survey/dto/RequestSurveyDto.java

@@ -0,0 +1,12 @@
+package com.codingwasabi.trti.util.survey.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@AllArgsConstructor
+public class RequestSurveyDto {
+    private List<RequestAnswerDto> answers;
+}