Skip to content

[#83]Fix: 쪽지 작성 user null저장 현상 해결 #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mummhy0811 merged 2 commits into from
Nov 14, 2023
Merged

[#83]Fix: 쪽지 작성 user null저장 현상 해결 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d31d53
[#83]Fix: 쪽지 작성 user null저장 현상 해결
mummhy0811 Nov 14, 2023
d7b0a1b
Refactor: 쪽지 공개 cron 변경
mummhy0811 Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/onestep/server/controller/letter/LetterController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.onestep.server.entity.Letter;
import com.onestep.server.entity.letter.LetterListDTO;
import com.onestep.server.entity.letter.WriteLetterDto;
import com.onestep.server.service.letter.LetterService;
import com.onestep.server.service.question.GptService;
import lombok.RequiredArgsConstructor;
Expand All @@ -17,7 +18,7 @@ public class LetterController {

//익명 쪽지 작성
@PostMapping(value = "/letter/write")
public Letter writeLetter(@RequestBody Letter letter){
public WriteLetterDto writeLetter(@RequestBody WriteLetterDto letter){
letterService.writeLetter(letter);
return letter;
}
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/com/onestep/server/entity/letter/WriteLetterDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.onestep.server.entity.letter;

import lombok.Getter;
import lombok.Setter;

@Setter
@Getter
public class WriteLetterDto {
private String writer_id;
private String letter_title;
private String letter_txt;
}
14 changes: 12 additions & 2 deletions src/main/java/com/onestep/server/service/letter/LetterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.onestep.server.entity.Letter;
import com.onestep.server.entity.User;
import com.onestep.server.entity.letter.LetterListDTO;
import com.onestep.server.entity.letter.WriteLetterDto;
import com.onestep.server.repository.IFamilyRepository;
import com.onestep.server.repository.ILetterRepository;
import com.onestep.server.repository.IUserRepository;
Expand All @@ -14,6 +15,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;

Expand All @@ -26,13 +28,21 @@ public class LetterService {
private final IUserRepository iUserRepository;
private final IFamilyRepository iFamilyRepository;

@Scheduled(cron = "0 0 6 ? * 5", zone = "Asia/Seoul") //매주 금요일 오전 6시마다
@Scheduled(cron = "0 0 6 ? * FRI", zone = "Asia/Seoul") //매주 금요일 오전 6시마다
public void changeLetterState(){
iLetterRepository.changeLetterState();
}

//익명 쪽지 작성
public void writeLetter(Letter letter){
public void writeLetter(WriteLetterDto letterDto){
Optional<User> optionalUser = iUserRepository.findById(letterDto.getWriter_id());
if(optionalUser.isEmpty()) throw new IllegalArgumentException("아이디를 찾을 수 없습니다.");
Letter letter = new Letter();
letter.setLetter_id(null);
letter.setLetter_txt(letterDto.getLetter_txt());
letter.setLetter_title(letterDto.getLetter_title());
letter.setWrite_date(new Date());
letter.setUser(optionalUser.get());
iLetterRepository.save(letter);
}

Expand Down