Skip to content

Commit

Permalink
Merge pull request #97 from DSM-Repo/notice
Browse files Browse the repository at this point in the history
공지 조회 api 추가 및 스웨거 설정 변경
  • Loading branch information
dkflfkd53 authored Sep 24, 2024
2 parents dcb164d + a96abef commit 1d263b8
Show file tree
Hide file tree
Showing 70 changed files with 795 additions and 205 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.repo.whopper.application.feedback.usecase.FindFeedbackUseCase;
import com.repo.whopper.application.teacher.component.CurrentTeacher;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;
import com.repo.whopper.application.student.component.CurrentStudent;
import com.repo.whopper.domain.feedback.FeedbackModel;
import com.repo.whopper.domain.feedback.FeedbackRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.repo.whopper.application.feedback.usecase;

import com.repo.whopper.interfaces.feedback.dto.response.FeedbackResponse;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;

public interface FindFeedbackUseCase {
DataResponseInfo<FeedbackResponse.StudentResponse> getCurrentStudentFeedbackList();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.file.impl;
package com.repo.whopper.application.file.service;

import com.repo.whopper.infrastructure.aws.s3.AwsS3Properties;
import io.awspring.cloud.s3.S3Operations;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.file.impl;
package com.repo.whopper.application.file.service;

import com.repo.whopper.common.exception.file.PdfUploadFailedException;
import com.repo.whopper.infrastructure.aws.s3.AwsS3Properties;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.file.impl;
package com.repo.whopper.application.file.service;

import com.repo.whopper.application.file.usecase.ImageUseCase;
import com.repo.whopper.infrastructure.aws.s3.AwsS3Properties;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.file.impl;
package com.repo.whopper.application.file.service;

import com.repo.whopper.application.file.usecase.PdfUseCase;
import com.repo.whopper.common.exception.file.ExtensionNotMatchException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.history.impl;
package com.repo.whopper.application.history.service;

import com.repo.whopper.application.history.usecase.CreateHistoryUseCase;
import com.repo.whopper.domain.history.HistoryModel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.history.impl;
package com.repo.whopper.application.history.service;

import com.repo.whopper.application.history.usecase.DeleteHistoryUseCase;
import com.repo.whopper.domain.history.HistoryRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.history.impl;
package com.repo.whopper.application.history.service;

import com.repo.whopper.application.history.usecase.ViewHistoryUseCase;
import com.repo.whopper.domain.history.HistoryRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.library.impl;
package com.repo.whopper.application.library.service;

import com.repo.whopper.application.library.usecase.ChangeLibraryAccessRightUseCase;
import com.repo.whopper.domain.library.LibraryRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.library.impl;
package com.repo.whopper.application.library.service;

import com.repo.whopper.application.file.usecase.PdfUseCase;
import com.repo.whopper.application.library.usecase.FindLibraryUseCase;
Expand All @@ -7,7 +7,7 @@
import com.repo.whopper.interfaces.library.dto.response.LibraryDetailResponse;
import com.repo.whopper.interfaces.library.dto.response.LibraryResponse;
import com.repo.whopper.common.exception.library.LibraryNotFoundException;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.repo.whopper.application.library.impl;
package com.repo.whopper.application.library.service;

import com.repo.whopper.application.library.usecase.CreateLibraryUseCase;
import com.repo.whopper.application.library.usecase.SaveLibraryUseCase;
import com.repo.whopper.domain.library.LibraryModel;
import com.repo.whopper.domain.library.LibraryRepository;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;
import com.repo.whopper.interfaces.library.dto.LibraryElementDto;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand All @@ -13,12 +13,12 @@

@Service
@RequiredArgsConstructor
public class CreateLibraryService implements CreateLibraryUseCase {
public class SaveLibraryService implements SaveLibraryUseCase {
private final LibraryRepository libraryRepository;

@Override
@Transactional
public void createLibrary(Integer grade, String filePath, DataResponseInfo<LibraryElementDto.ResumeIndex> index) {
public void saveLibrary(Integer grade, String filePath, DataResponseInfo<LibraryElementDto.ResumeIndex> index) {
LocalDateTime now = LocalDateTime.now();

libraryRepository.save(new LibraryModel(null, now.getYear(), grade, filePath, now, LibraryElementDto.AccessRight.PRIVATE, index.data()));
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.repo.whopper.interfaces.library.dto.response.LibraryDetailResponse;
import com.repo.whopper.interfaces.library.dto.response.LibraryResponse;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;

public interface FindLibraryUseCase {
LibraryDetailResponse findLibraryDetail(String libraryId);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.repo.whopper.application.library.usecase;

import com.repo.whopper.common.http.dto.DataResponseInfo;
import com.repo.whopper.interfaces.library.dto.LibraryElementDto;

public interface SaveLibraryUseCase {
void saveLibrary(Integer grade, String filePath, DataResponseInfo<LibraryElementDto.ResumeIndex> index);
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.major.impl;
package com.repo.whopper.application.major.service;

import com.repo.whopper.application.major.usecase.AddMajorUseCase;
import com.repo.whopper.domain.major.MajorModel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.major.impl;
package com.repo.whopper.application.major.service;

import com.repo.whopper.application.major.usecase.DeleteMajorUseCase;
import com.repo.whopper.domain.major.MajorRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.repo.whopper.application.major.impl;
package com.repo.whopper.application.major.service;

import com.repo.whopper.application.major.usecase.FindMajorUseCase;
import com.repo.whopper.domain.major.MajorModel;
import com.repo.whopper.domain.major.MajorRepository;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.repo.whopper.application.major.usecase;

import com.repo.whopper.domain.major.MajorModel;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;

public interface FindMajorUseCase {
DataResponseInfo<MajorModel> findAll();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.repo.whopper.application.notice.impl;

import com.repo.whopper.application.notice.usecase.FetchNoticeUseCase;
import com.repo.whopper.common.exception.notice.NoticeNotFoundException;
import com.repo.whopper.common.http.dto.DataResponseInfo;
import com.repo.whopper.domain.notice.NoticeModel;
import com.repo.whopper.domain.notice.NoticeRepository;
import com.repo.whopper.interfaces.notice.dto.response.NoticeDetailResponse;
import com.repo.whopper.interfaces.notice.dto.response.NoticeResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
@RequiredArgsConstructor
public class FetchNoticeService implements FetchNoticeUseCase {
private final NoticeRepository noticeRepository;

@Override
@Transactional(readOnly = true)
public NoticeDetailResponse fetchNoticeDetailResponse(String noticeId){
NoticeModel notice = noticeRepository.findById(noticeId)
.orElseThrow(() -> NoticeNotFoundException.EXCEPTION);

var newNotice = notice.checkNotice();
noticeRepository.save(newNotice);

return new NoticeDetailResponse(notice);
}

@Override
@Transactional(readOnly = true)
public DataResponseInfo<NoticeResponse> fetchNotice() {
var notice = noticeRepository.findAll();

return DataResponseInfo.of(notice
.map(NoticeResponse::fromModel)
.toList());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.repo.whopper.application.notice.usecase;

import com.repo.whopper.common.http.dto.DataResponseInfo;
import com.repo.whopper.interfaces.notice.dto.response.NoticeDetailResponse;
import com.repo.whopper.interfaces.notice.dto.response.NoticeResponse;

public interface FetchNoticeUseCase {
NoticeDetailResponse fetchNoticeDetailResponse(String noticeId);
DataResponseInfo<NoticeResponse> fetchNotice();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.repo.whopper.application.notice.usecase;

public interface WriteNoticeUseCase {
void writeNotice(String title, String content);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.repo.whopper.interfaces.resume.dto.response.*;
import com.repo.whopper.common.exception.resume.ResumeNotFoundException;
import com.repo.whopper.application.student.component.CurrentStudent;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.repo.whopper.interfaces.resume.dto.response.FullResumeResponse;
import com.repo.whopper.interfaces.resume.dto.response.ReleasedResumeResponse;
import com.repo.whopper.interfaces.resume.dto.response.SearchResumeResponse;
import com.repo.whopper.common.http.response.DataResponseInfo;
import com.repo.whopper.common.http.dto.DataResponseInfo;

public interface FindResumeUseCase {
ResumeResponse getIntroduceRecentlySharedResumes();
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.repo.whopper.application.student.service;

import com.repo.whopper.application.student.usecase.FetchCurrentStudentInfoUseCase;
import com.repo.whopper.interfaces.student.dto.CurrentStudentInfoResponse;
import com.repo.whopper.application.student.component.CurrentStudent;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

@Service
@RequiredArgsConstructor
public class FetchCurrentStudentInfoService implements FetchCurrentStudentInfoUseCase {
private final CurrentStudent currentStudent;

@Override
public CurrentStudentInfoResponse fetch() {
final var currentStudent = this.currentStudent.getStudent();

return CurrentStudentInfoResponse.fromStudentModel(
currentStudent
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.repo.whopper.application.student.usecase;

import com.repo.whopper.interfaces.student.dto.CurrentStudentInfoResponse;

public interface FetchCurrentStudentInfoUseCase {
CurrentStudentInfoResponse fetch();
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.application.teacher.impl;
package com.repo.whopper.application.teacher.service;

import com.repo.whopper.application.teacher.component.CurrentTeacher;
import com.repo.whopper.application.teacher.usecase.GetCurrentTeacherInfoUseCase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public enum ErrorCode {
// library
LIBRARY_NOT_FOUND(404, "요청하신 라이브러리를 찾지 못했습니다."),

// notice
NOTICE_NOT_FOUND(404, "요청하신 공지를 찾지 못했습니다."),

IMAGE_REQUEST_SIZE_MISMATCH(422, "프로젝트의 갯수와, 이미지 갯수가 맞지 않습니다."),

// general
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.repo.whopper.common.exception.notice;

import com.repo.whopper.common.error.exception.ErrorCode;
import com.repo.whopper.common.error.exception.WhopperException;

public class NoticeNotFoundException extends WhopperException {
public static final WhopperException EXCEPTION = new NoticeNotFoundException();

private NoticeNotFoundException() {
super(ErrorCode.NOTICE_NOT_FOUND);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.repo.whopper.common.http.response;
package com.repo.whopper.common.http.dto;

import java.util.List;

Expand Down
Loading

0 comments on commit 1d263b8

Please sign in to comment.