Merge pull request #217 from themoment-team/develop

Develop - 운영을 위한 도메인 핫픽스

src/main/java/com/moment/the/admin/AdminDomain.java

@@ -31,6 +31,7 @@ public class AdminDomain implements UserDetails {
     private String password;
 
     @ElementCollection(fetch = FetchType.EAGER)
+    @CollectionTable(name = "role", joinColumns = @JoinColumn(name = "admin_id"))
     @Builder.Default
     private List<String> roles = new ArrayList<>();
 

src/main/java/com/moment/the/answer/AnswerDomain.java

@@ -21,7 +21,7 @@ public class AnswerDomain {
     @Column(name = "content", length = 1000, nullable = false)
     private String content;
 
-    @OneToOne(fetch = LAZY)
+    @OneToOne(fetch = LAZY, mappedBy = "answerDomain")
     @JoinColumn(name = "uncomfortable_id", nullable = false)
     private UncomfortableDomain uncomfortableDomain;
 
@@ -34,7 +34,7 @@ public void update(AnswerDto answerDto) {
         this.content = answerDto.getContent();
     }
 
-    public void updateTableDomain(UncomfortableDomain uncomfortableDomain){
+    public void updateAnswerDomain(UncomfortableDomain uncomfortableDomain){
         this.uncomfortableDomain = uncomfortableDomain;
         this.uncomfortableDomain.updateAnswerDomain(this);
     }

src/main/java/com/moment/the/answer/service/AnswerService.java

@@ -33,11 +33,9 @@ public AnswerDomain createThisAnswer(AnswerDto answerDto, Long uncomfortableIdx)
         // AnswerDomain 생성 및 Table 과의 연관관계 맻음
         answerDto.setAdminDomain(adminDomain);
         AnswerDomain saveAnswerDomain = answerDto.toEntity();
-        saveAnswerDomain.updateTableDomain(uncomfortableDomain);
+        saveAnswerDomain.updateAnswerDomain(uncomfortableDomain);
 
-        AnswerDomain savedAnswerDomain = answerRepo.save(saveAnswerDomain);
-
-        return savedAnswerDomain;
+        return answerRepo.save(saveAnswerDomain);
     }
 
     // 답변 수정하기
@@ -59,14 +57,12 @@ public AnswerResDto getThisAnswer(Long uncomfortableIdx) {
         // 해당 uncomfortableIdx를 참조하는 answerDomain 찾기.
         AnswerDomain answerDomain = answerRepo.findTop1ByUncomfortableDomain_uncomfortableIdx(uncomfortableIdx);
 
-        AnswerResDto answerResDto = AnswerResDto.builder()
+        return AnswerResDto.builder()
                 .answerIdx(answerDomain.getAnswerIdx())
                 .title(answerDomain.getUncomfortableDomain().getContent())
                 .content(answerDomain.getContent())
                 .writer(answerDomain.getAdminDomain().getName())
                 .build();
-
-        return answerResDto;
     }
 
     // 답변 삭제하기

src/main/java/com/moment/the/uncomfortable/UncomfortableDomain.java

@@ -23,6 +23,7 @@ public class UncomfortableDomain {
     private int goods;
 
     @OneToOne(fetch = LAZY, cascade = CascadeType.ALL)
+    @JoinColumn(name = "answer_id")
     private AnswerDomain answerDomain;
 
     public void updateGoods(int goods){

src/main/java/com/moment/the/uncomfortable/service/UncomfortableService.java

@@ -105,9 +105,9 @@ public int getDateSinceProjectStart(){
      * D-day를 계산하는 메서드.
      * @return int
      */
-    public static int calculateAfterDate(){
-         //  today: 오늘 날짜
-         //  theMomentStart: the-moment 시작 날짜
+    private static int calculateAfterDate() {
+        //  today: 오늘 날짜
+        //  theMomentStart: the-moment 시작 날짜
         LocalDate today = LocalDate.now();
         LocalDate theMomentStart = LocalDate.of(2021, 6, 7);
 
@@ -116,4 +116,11 @@ public static int calculateAfterDate(){
 
         return period;
     }
+
+    private void refreshGoodsOnThisDayOfEveryMonth(){
+        LocalDate today = LocalDate.now();
+        if (today.getDayOfMonth() == 1 || today.getDayOfMonth() == 14){
+
+        }
+    }
 }