From a9c9c85520ba88182b66e155f0c1c48f267dc5c5 Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Tue, 21 Nov 2023 14:56:55 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[fix]=20=EC=B1=84=EC=86=8C=20=EB=B3=84=20?= =?UTF-8?q?=EC=9D=BC=EA=B8=B0=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/farmusfarm/common/Utils.java | 13 +++++++++++++ .../veggie/dto/res/GetMyDiaryResponseDto.java | 1 + .../domain/veggie/service/DiaryService.java | 8 +++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/farmusfarm/common/Utils.java b/src/main/java/com/example/farmusfarm/common/Utils.java index d82f297..313e0f2 100644 --- a/src/main/java/com/example/farmusfarm/common/Utils.java +++ b/src/main/java/com/example/farmusfarm/common/Utils.java @@ -29,4 +29,17 @@ public static String dateTimeFormat(String dateTime) { return month + "/" + day + " " + hour + ":" + minute; } + + // mm/dd/yy, hh:mm PM -> yyyy년 mm월 dd일 + public static String dateTimeToDateFormat(String dateTime) { + String[] dateTimeArr = dateTime.split(" "); + String[] dateArr = dateTimeArr[0].split("/"); + + String month = dateArr[0]; + String day = dateArr[1]; + String year = dateArr[2].substring(0, 2); + + + return "20" + year + "년 " + month + "월 " + day + "일"; + } } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyDiaryResponseDto.java b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyDiaryResponseDto.java index 471cb16..0f6ae80 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyDiaryResponseDto.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/GetMyDiaryResponseDto.java @@ -12,4 +12,5 @@ public class GetMyDiaryResponseDto { private Long diaryId; private String content; private String image; + private String date; } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java b/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java index 9391500..5536b9e 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java @@ -1,6 +1,7 @@ package com.example.farmusfarm.domain.veggie.service; import com.example.farmusfarm.common.S3Service; +import com.example.farmusfarm.common.Utils; import com.example.farmusfarm.domain.challenge.dto.res.LikeMissionPostResponseDto; import com.example.farmusfarm.domain.challenge.entity.MissionPost; import com.example.farmusfarm.domain.challenge.entity.MissionPostLike; @@ -60,7 +61,12 @@ public CreateDiaryResponseDto createDiary(CreateDiaryRequestDto requestDto, Mult public List getVeggieDiaryList(Long veggieId) { List diaries = getDiaryByVeggieId(veggieId); return diaries.stream() - .map(diary -> GetMyDiaryResponseDto.of(diary.getId(), diary.getContent(), diary.getDiaryImages().get(0).getImageUrl())) + .map(diary -> GetMyDiaryResponseDto.of( + diary.getId(), + diary.getContent(), + diary.getDiaryImages().get(0).getImageUrl(), + Utils.dateTimeToDateFormat(diary.getCreatedDate()) + )) .collect(Collectors.toList()); } From 4a93efc750752b6aa872a29a4762f2186b728461 Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Tue, 21 Nov 2023 14:57:18 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[fix]=20=ED=8C=9C=ED=81=B4=EB=9F=BD=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EC=97=AC=EB=B6=80=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/challenge/dto/res/GetChallengeInfoResponse.java | 2 +- .../farmusfarm/domain/challenge/service/ChallengeService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java b/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java index 790fcf2..c6a2e18 100644 --- a/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java +++ b/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java @@ -30,5 +30,5 @@ public class GetChallengeInfoResponse { private String stepTip; private List stepImages; - private List diaries; + private Boolean isRegistered; } diff --git a/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java b/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java index abb7bad..2a1d914 100644 --- a/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java +++ b/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java @@ -273,7 +273,7 @@ public GetChallengeInfoResponse getMyChallengeInfo(Long userId, Long challengeId registration.getCurrentStepName(), tip, imageList, - getDiaryListByChallenge(challengeId) + true ); } @@ -307,7 +307,7 @@ public GetChallengeInfoResponse getOtherChallengeInfo(Long challengeId, String t "준비물을 챙겨요", tip, imageList, - null + false ); } From d89c097b63e83803da3dafa47a0662350e5c039c Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Tue, 21 Nov 2023 16:50:01 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[fix]=20=EC=9D=BC=EA=B8=B0=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=9A=94=EC=B2=AD=EA=B0=92=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?->=20=ED=8C=8C=ED=8A=B8=20=EB=91=90=EA=B0=9C=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=ED=8C=8C=ED=8A=B8,=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../challenge/controller/ChallengeController.java | 4 ++-- .../domain/veggie/controller/VeggieController.java | 8 +++++--- .../farmusfarm/domain/veggie/service/DiaryService.java | 10 +++++----- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/example/farmusfarm/domain/challenge/controller/ChallengeController.java b/src/main/java/com/example/farmusfarm/domain/challenge/controller/ChallengeController.java index d117d3e..8969f1f 100644 --- a/src/main/java/com/example/farmusfarm/domain/challenge/controller/ChallengeController.java +++ b/src/main/java/com/example/farmusfarm/domain/challenge/controller/ChallengeController.java @@ -43,9 +43,9 @@ public BaseResponseDto createRegistration( @PostMapping("/mission") public BaseResponseDto createMissionPost( + @RequestPart("image") MultipartFile image, @RequestParam("registrationId") Long registrationId, - @RequestParam("content") String content, - @RequestPart("image") MultipartFile image + @RequestParam("content") String content ) { return BaseResponseDto.of(SuccessMessage.CREATED, missionPostService.createMissionPost(registrationId, content, image)); } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java b/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java index d806f51..5101998 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/controller/VeggieController.java @@ -39,10 +39,12 @@ public BaseResponseDto createRoutine( @PostMapping("/diary") public BaseResponseDto createDiary( - @RequestPart("content") final CreateDiaryRequestDto requestDto, - @RequestPart("image") final MultipartFile image + @RequestPart("image") final MultipartFile image, + @RequestParam("veggieId") final Long veggieId, + @RequestParam("content") final String content, + @RequestParam("isOpen") final Boolean isOpen ) { - return BaseResponseDto.of(SuccessMessage.CREATED, diaryService.createDiary(requestDto, image)); + return BaseResponseDto.of(SuccessMessage.CREATED, diaryService.createDiary(veggieId, content, isOpen, image)); } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java b/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java index 5536b9e..cc9f95e 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/service/DiaryService.java @@ -39,15 +39,15 @@ public class DiaryService { private final S3Service s3Service; // 일기 생성 - public CreateDiaryResponseDto createDiary(CreateDiaryRequestDto requestDto, MultipartFile image) { - Veggie veggie = veggieRepository.findById(requestDto.getVeggieId()) + public CreateDiaryResponseDto createDiary(Long veggieId, String content, Boolean isOpen, MultipartFile image) { + Veggie veggie = veggieRepository.findById(veggieId) .orElseThrow(()-> new IllegalArgumentException("채소가 존재하지 않습니다.")); Diary diary; - if (veggie.getRegistration() != null && requestDto.getIsOpen()) { - diary = Diary.createDiaryWithChallenge(requestDto.getContent(), true, veggie, veggie.getRegistration().getChallenge()); + if (veggie.getRegistration() != null && isOpen) { + diary = Diary.createDiaryWithChallenge(content, true, veggie, veggie.getRegistration().getChallenge()); } else { - diary = Diary.createDiary(requestDto.getContent(), veggie); + diary = Diary.createDiary(content, veggie); } Diary newDiary = diaryRepository.save(diary); From 06f839537d7ea4ec9470859c9505eadba0fcb379 Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Tue, 21 Nov 2023 23:39:23 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[fix]=20=EB=A3=A8=ED=8B=B4=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=20=EC=A3=BC=EA=B8=B0=EB=A7=8C=ED=81=BC=20?= =?UTF-8?q?=EB=92=A4=EC=97=90=20=EB=8F=99=EC=9D=BC=20=EB=A3=A8=ED=8B=B4=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../farmusfarm/domain/veggie/entity/Routine.java | 2 +- .../domain/veggie/service/VeggieService.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/entity/Routine.java b/src/main/java/com/example/farmusfarm/domain/veggie/entity/Routine.java index 88575b9..dc8b323 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/entity/Routine.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/entity/Routine.java @@ -57,7 +57,7 @@ public void updatePeriod(int period) { } public void updateDone() { - this.isDone = !this.isDone; + this.isDone = true; } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java b/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java index a0c7a67..75bc834 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java @@ -148,6 +148,16 @@ public CheckRoutineResponseDto checkRoutine(CheckRoutineRequestDto requestDto) { Routine routine = getRoutine(requestDto.getRoutineId()); routine.updateDone(); + if (routine.getPeriod() != 0) { + Routine newRoutine = createRoutine( + LocalDate.now().plusDays(routine.getPeriod()).toString(), + routine.getContent(), + routine.getPeriod(), + routine.getVeggie() + ); + routineRepository.save(newRoutine); + } + return CheckRoutineResponseDto.of(routine.getId(), routine.getIsDone()); } From 34ffc4723f8f504a1465daa6fa03b7984903dd2b Mon Sep 17 00:00:00 2001 From: MinchoGreenT Date: Wed, 22 Nov 2023 20:10:23 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[fix]=20=ED=8C=9C=ED=81=B4=EB=9F=BD=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20id=20?= =?UTF-8?q?=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/challenge/dto/res/GetChallengeInfoResponse.java | 1 + .../farmusfarm/domain/challenge/service/ChallengeService.java | 2 ++ .../domain/veggie/dto/res/CreateRoutineResponseDto.java | 4 ++++ .../farmusfarm/domain/veggie/service/VeggieService.java | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java b/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java index c6a2e18..528c5ab 100644 --- a/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java +++ b/src/main/java/com/example/farmusfarm/domain/challenge/dto/res/GetChallengeInfoResponse.java @@ -12,6 +12,7 @@ @Getter public class GetChallengeInfoResponse { + private Long challengeId; private String veggieInfoId; private String challengeName; diff --git a/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java b/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java index 2a1d914..07f6cb2 100644 --- a/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java +++ b/src/main/java/com/example/farmusfarm/domain/challenge/service/ChallengeService.java @@ -259,6 +259,7 @@ public GetChallengeInfoResponse getMyChallengeInfo(Long userId, Long challengeId String tip = response.get(registration.getCurrentStep()).getTip(); return GetChallengeInfoResponse.of( + challengeId, challenge.getVeggieInfoId(), challenge.getChallengeName(), challenge.getVeggieName(), @@ -293,6 +294,7 @@ public GetChallengeInfoResponse getOtherChallengeInfo(Long challengeId, String t }); return GetChallengeInfoResponse.of( + challengeId, challenge.getVeggieInfoId(), challenge.getChallengeName(), challenge.getVeggieName(), diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/CreateRoutineResponseDto.java b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/CreateRoutineResponseDto.java index 508aa2d..636195d 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/CreateRoutineResponseDto.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/dto/res/CreateRoutineResponseDto.java @@ -10,4 +10,8 @@ public class CreateRoutineResponseDto { private Long id; + private String date; + private String content; + private int period; + private Boolean isDone; } diff --git a/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java b/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java index 75bc834..139f4f3 100644 --- a/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java +++ b/src/main/java/com/example/farmusfarm/domain/veggie/service/VeggieService.java @@ -54,7 +54,7 @@ public CreateRoutineResponseDto createNewRoutine(CreateRoutineRequestDto request Veggie veggie = getVeggie(requestDto.getVeggieId()); Routine newRoutine = createRoutine(requestDto.getDate(), requestDto.getContent(), 0, veggie); - return CreateRoutineResponseDto.of(newRoutine.getId()); + return CreateRoutineResponseDto.of(newRoutine.getId(), newRoutine.getDate().toString(), newRoutine.getContent(), newRoutine.getPeriod(), false); } // 채소 정보 조회