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

✨ feat: 게시중 상태 내가 올린 공고 목록 조회 개발 #188

Merged
merged 2 commits into from
Feb 13, 2024
Merged

✨ feat: 게시중 상태 내가 올린 공고 목록 조회 개발 #188

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
f1ee0ba
:sparkles: feat: 게시중 상태 내가 올린 공고 목록 조회 개발
xxoznge Feb 13, 2024
2a12ba1
Merge branch 'develop' into feature/#180
xxoznge Feb 13, 2024
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
14 changes: 10 additions & 4 deletions src/main/java/com/sponus/sponusbe/domain/announcement/controller/AnnouncementController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,16 @@ public ApiResponse<AnnouncementDetailResponse> getAnnouncement(
return ApiResponse.onSuccess(announcementService.getAnnouncement(authOrganization, announcementId));
}

@GetMapping("/status")
public ApiResponse<List<AnnouncementSummaryResponse>> getListAnnouncement(
@RequestParam("status") AnnouncementStatus status) {
return ApiResponse.onSuccess(announcementService.getListAnnouncement(status));
// @GetMapping("/status")
// public ApiResponse<List<AnnouncementSummaryResponse>> getListAnnouncement(
// @RequestParam("status") AnnouncementStatus status) {
// return ApiResponse.onSuccess(announcementQueryService.getListAnnouncement(status));
// }

@GetMapping("/me")
public ApiResponse<List<AnnouncementSummaryResponse>> getMyAnnouncement(
@AuthOrganization Organization authOrganization){
return ApiResponse.onSuccess(announcementQueryService.getMyAnnouncement(authOrganization));
}

@GetMapping
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/sponus/sponusbe/domain/announcement/repository/AnnouncementRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
public interface AnnouncementRepository extends JpaRepository<Announcement, Long> {

List<Announcement> findByTitleContains(String title);
List<Announcement> findByWriterIdAndStatus(Long writerId, AnnouncementStatus status);

List<Announcement> findByStatus(AnnouncementStatus status);
// List<Announcement> findByStatus(AnnouncementStatus status);

List<Announcement> findByCategoryAndTypeOrderByCreatedAtDesc(AnnouncementCategory category, AnnouncementType type);

Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/sponus/sponusbe/domain/announcement/service/AnnouncementQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import com.sponus.sponusbe.auth.jwt.util.RedisUtil;
import com.sponus.sponusbe.domain.announcement.dto.response.AnnouncementSummaryResponse;
import com.sponus.sponusbe.domain.announcement.entity.Announcement;
import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementCategory;
import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementStatus;
import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementType;
Expand All @@ -32,6 +33,21 @@ public List<AnnouncementSummaryResponse> searchAnnouncement(String keyword) {
.map(AnnouncementSummaryResponse::from).toList();
}


// public List<AnnouncementSummaryResponse> getListAnnouncement(AnnouncementStatus status) {
// List<Announcement> announcements = announcementRepository.findByStatus(status);
// return announcements.stream()
// .map(AnnouncementSummaryResponse::from)
// .toList();
// }

public List<AnnouncementSummaryResponse> getMyAnnouncement(Organization authOrganization) {
List<Announcement> announcements = announcementRepository.findByWriterIdAndStatus(authOrganization.getId(), AnnouncementStatus.OPENED);
return announcements.stream()
.map(AnnouncementSummaryResponse::from)
.toList();
}

public List<AnnouncementSummaryResponse> getAnnouncementByCategory(AnnouncementCategory category,
AnnouncementType type) {
// 둘 다 값이 있는 경우
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/com/sponus/sponusbe/domain/announcement/service/AnnouncementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ public AnnouncementDetailResponse getAnnouncement(Organization organization, Lon
return AnnouncementDetailResponse.from(announcement);
}

public List<AnnouncementSummaryResponse> getListAnnouncement(AnnouncementStatus status) {
List<Announcement> announcements = announcementRepository.findByStatus(status);
return announcements.stream()
.map(AnnouncementSummaryResponse::from)
.toList();
}

public void deleteAnnouncement(Organization organization, Long announcementId) {
final Announcement announcement = announcementRepository.findById(announcementId)
.orElseThrow(() -> new AnnouncementException(AnnouncementErrorCode.ANNOUNCEMENT_NOT_FOUND));
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/sponus/sponusbe/domain/bookmark/service/BookmarkQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ public List<BookmarkGetResponse> getRecentBookmark(Organization organization) {
return bookmarkRepository.findByOrganizationOrderByCreatedAtDesc(organization)
.stream()
.map(bookmark -> BookmarkGetResponse.from(bookmark.getAnnouncement(), bookmark))
.collect(Collectors.toList());
.toList();
}

public List<BookmarkGetResponse> getViewedBookmark(Organization organization) {
List<Bookmark> bookmarks = bookmarkRepository.findByOrganizationOrderByAnnouncementViewCountDesc(organization);
return bookmarks.stream()
.map(bookmark -> BookmarkGetResponse.from(bookmark.getAnnouncement(), bookmark))
.collect(Collectors.toList());
.toList();
}

public List<BookmarkGetResponse> getSavedBookmark(Organization organization) {
List<Bookmark> bookmarks = bookmarkRepository.findByOrganizationOrderBySaveCountDesc(organization);
return bookmarks.stream()
.map(bookmark -> BookmarkGetResponse.from(bookmark.getAnnouncement(), bookmark))
.collect(Collectors.toList());
.toList();
}
}
Loading