Skip to content
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

Jump to bottom

Hotfix/program #39

Merged
merged 3 commits into from
Nov 23, 2023
Merged

Hotfix/program #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f04ddd
hot fix : 이미지 변경사항이 있는지 공고등록 model에 추가
MyunghyunNero Nov 23, 2023
b8b67fb
hot fix : 공고 등록할때 마감일이 현재시간보다 전이면 마감상태로 저장
MyunghyunNero Nov 23, 2023
cdfff45
hotfix : 진행중인 공고 마감일 오타 수정
MyunghyunNero Nov 23, 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
10 changes: 6 additions & 4 deletions src/main/java/kusitms/gallae/controller/ManagerController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public ResponseEntity<BaseResponse<Long>> saveProgram(
PostModel model
) throws IOException {
String photoUrl = null;
if(model.getPhoto() != null && !model.getPhoto().isEmpty()) {
if(model.getPhoto() != null && model.getPhotoCheck().equals("1")) {
photoUrl = s3Service.upload(model.getPhoto());
}

Expand All @@ -112,6 +112,7 @@ public ResponseEntity<BaseResponse<Long>> saveProgram(
programPostReq.setLink(model.getLink());
programPostReq.setHashtag(model.getHashtag());
programPostReq.setBody(model.getBody());
programPostReq.setPhotoCheck(model.getPhotoCheck());

return ResponseEntity.ok(new BaseResponse<>(this.managerService.postProgram(programPostReq, principal.getName())));
}
Expand Down Expand Up @@ -208,7 +209,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
EditModel model
) throws IOException {
String photoUrl = null;
if(model.getPhoto() != null) {
if(model.getPhoto() != null && model.getPhotoCheck().equals("1")) {
photoUrl = s3Service.upload(model.getPhoto());
}
ProgramPostReq programPostReq = new ProgramPostReq();
Expand All @@ -227,6 +228,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
programPostReq.setLink(model.getLink());
programPostReq.setHashtag(model.getHashtag());
programPostReq.setBody(model.getBody());
programPostReq.setPhotoCheck(model.getPhotoCheck());


return ResponseEntity.ok(new BaseResponse<>(this.managerService.editProgram(programPostReq, principal.getName())));
Expand All @@ -249,7 +251,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
PostModel model
) throws IOException {
String photoUrl = null;
if(model.getPhoto() != null && !model.getPhoto().isEmpty()) {
if(model.getPhoto() != null && model.getPhotoCheck().equals("1")) {
photoUrl = s3Service.upload(model.getPhoto());
}
ProgramPostReq programPostReq = new ProgramPostReq();
Expand All @@ -267,7 +269,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
programPostReq.setLink(model.getLink());
programPostReq.setHashtag(model.getHashtag());
programPostReq.setBody(model.getBody());

programPostReq.setPhotoCheck(model.getPhotoCheck());

return ResponseEntity.ok(new BaseResponse<>(this.managerService.postTempProgram(programPostReq, principal.getName())));
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/kusitms/gallae/dto/model/EditModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@ public class EditModel {
private String body;

private MultipartFile photo;

private String photoCheck;
}
2 changes: 2 additions & 0 deletions src/main/java/kusitms/gallae/dto/model/PostModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ public class PostModel {
private String body;

private MultipartFile photo;

private String photoCheck;
}
2 changes: 1 addition & 1 deletion src/main/java/kusitms/gallae/dto/program/ProgramManagerRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ public class ProgramManagerRes {
private LocalDate recruitStartDate;

@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
private LocalDate recuritEndDate;
private LocalDate recruitEndDate;
}
2 changes: 2 additions & 0 deletions src/main/java/kusitms/gallae/dto/program/ProgramPostReq.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,6 @@ public class ProgramPostReq {
private String hashtag;

private String body;

private String photoCheck;
}
35 changes: 28 additions & 7 deletions src/main/java/kusitms/gallae/service/admin/ManagerServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -97,6 +98,8 @@ public ProgramPostReq getTempProgram(String username) {
}
@Override
public Long postProgram(ProgramPostReq programPostReq ,String username) {
LocalDateTime localDateTime = LocalDateTime.now().plusHours(9);
LocalDate localdate = localDateTime.toLocalDate();
User user = userRepository.findById(Long.valueOf(username)).get();
Program tempProgram = programRespository.findByUserIdAndStatus(user.getId(), //나중에 유저 생기면 수정 필요
Program.ProgramStatus.TEMP);
Expand All @@ -106,25 +109,35 @@ public Long postProgram(ProgramPostReq programPostReq ,String username) {
Program saveProgram = this.getProgramEntity(program,programPostReq);
saveProgram.setUser(user);
saveProgram.setStatus(Program.ProgramStatus.SAVE);
if(saveProgram.getRecruitEndDate().isBefore(localdate)){
saveProgram.setStatus(Program.ProgramStatus.FINISH);
}
Program programId = programRespository.save(saveProgram);
return programId.getId();
}else { //임시 저장이 있으면
Program saveProgram = this.getProgramEntity(tempProgram, programPostReq);
saveProgram.setStatus(Program.ProgramStatus.SAVE);
if(saveProgram.getRecruitEndDate().isBefore(localdate)){
saveProgram.setStatus(Program.ProgramStatus.FINISH);
}
return tempProgram.getId();
}
}

@Override
public Long editProgram(ProgramPostReq programPostReq ,String username) {

LocalDateTime localDateTime = LocalDateTime.now().plusHours(9);
LocalDate localdate = localDateTime.toLocalDate();
User user = userRepository.findById(Long.valueOf(username)).get();
Program tempProgram = programRespository.findById(programPostReq.getProgramId()).orElse(null);
if(user.getId() != tempProgram.getUser().getId()) {
throw new BaseException(BaseResponseStatus.NOT_WRITER);
}

Program saveProgram = this.getProgramEntity(tempProgram,programPostReq);
if(saveProgram.getRecruitEndDate().isBefore(localdate)){
saveProgram.setStatus(Program.ProgramStatus.FINISH);
}
saveProgram.setStatus(Program.ProgramStatus.SAVE);
Program programId = programRespository.save(saveProgram);
return programId.getId();
Expand All @@ -135,17 +148,24 @@ public Long postTempProgram(ProgramPostReq programPostReq , String username) {
User user = userRepository.findById(Long.valueOf(username)).get();
Program tempProgram = programRespository.findByUserIdAndStatus(user.getId(), //나중에 유저 생기면 수정 필요
Program.ProgramStatus.TEMP);

LocalDateTime localDateTime = LocalDateTime.now().plusHours(9);
LocalDate localdate = localDateTime.toLocalDate();
if(tempProgram == null) { //임시 저장이 없으면
Program program = new Program();
Program saveProgram = this.getProgramEntity(program,programPostReq);
saveProgram.setUser(user);
saveProgram.setStatus(Program.ProgramStatus.TEMP);
if(saveProgram.getRecruitEndDate().isBefore(localdate)){
saveProgram.setStatus(Program.ProgramStatus.FINISH);
}
Program programId = programRespository.save(saveProgram);
return programId.getId();
}else { //임시 저장이 있으면
Program saveProgram = this.getProgramEntity(tempProgram, programPostReq);
saveProgram.setStatus(Program.ProgramStatus.TEMP);
if(saveProgram.getRecruitEndDate().isBefore(localdate)){
saveProgram.setStatus(Program.ProgramStatus.FINISH);
}
return saveProgram.getId();
}
}
Expand Down Expand Up @@ -192,17 +212,17 @@ private List<ProgramManagerRes> getProgramManagerRes(List<Program> programs){
programManagerRes.setLike(program.getProgramLike());
programManagerRes.setViewCount(program.getViewCount());
programManagerRes.setRecruitStartDate(program.getRecruitStartDate());
programManagerRes.setRecuritEndDate(program.getRecruitEndDate());
programManagerRes.setRecruitEndDate(program.getRecruitEndDate());
return programManagerRes;
}).collect(Collectors.toList());
}

private Program getProgramEntity(Program program ,ProgramPostReq programPostReq) {
program.setProgramName(programPostReq.getProgramName());
if(program.getPhotoUrl()==null) {
program.setPhotoUrl(programPostReq.getPhotoUrl());
}else{
s3Service.deleteFile(program.getPhotoUrl());
if(programPostReq.getPhotoCheck().equals("1")) {
if (program.getPhotoUrl() != null) {
s3Service.deleteFile(program.getPhotoUrl());
}
program.setPhotoUrl(programPostReq.getPhotoUrl());
}
program.setLocation(programPostReq.getLocation());
Expand All @@ -219,6 +239,7 @@ private Program getProgramEntity(Program program ,ProgramPostReq programPostReq)
program.setDescription(programPostReq.getBody());
program.setProgramLike(0L);
program.setViewCount(0L);

return program;
}
}
Loading