Skip to content

Commit

Permalink
Merge pull request #115 from Team-GAJI/feature/#107-InfoPost-RoomPost…
Browse files Browse the repository at this point in the history
…-API/GAJI-128

Feature/#107 info post room post api/gaji 128
  • Loading branch information
mmingoo authored Aug 18, 2024
2 parents b8cf32a + 33bc058 commit 9667f85
Show file tree
Hide file tree
Showing 108 changed files with 1,724 additions and 555 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gaji/service/domain/alram/Alarm.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gaji.service.domain.alram;

import gaji.service.domain.user.entity.User;
import gaji.service.domain.enums.IsConfirmed;
import gaji.service.domain.user.entity.User;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gaji.service.domain.common.annotation;

import gaji.service.domain.common.validation.PageNumberValidator;
import jakarta.validation.Payload;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;

import java.lang.annotation.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import java.util.List;

import static gaji.service.domain.common.entity.QSelectCategory.selectCategory;
import static gaji.service.domain.common.entity.QCategory.category1;
import static gaji.service.domain.common.entity.QSelectCategory.selectCategory;


@Repository
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package gaji.service.domain.common.repository;

import gaji.service.domain.common.entity.SelectCategory;
import gaji.service.domain.common.repository.SelectCategoryQueryDslRepository;
import gaji.service.domain.enums.PostTypeEnum;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;

public interface SelectCategoryRepository extends JpaRepository<SelectCategory, Long>, SelectCategoryQueryDslRepository {

SelectCategory findByEntityIdAndType(Long entityId, PostTypeEnum type);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import java.util.List;

import static gaji.service.domain.common.entity.QSelectHashtag.selectHashtag;
import static gaji.service.domain.common.entity.QHashtag.hashtag;
import static gaji.service.domain.common.entity.QSelectHashtag.selectHashtag;


@Repository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@
import gaji.service.domain.common.entity.Category;
import gaji.service.domain.common.entity.SelectCategory;
import gaji.service.domain.common.repository.CategoryRepository;
import gaji.service.domain.common.repository.SelectCategoryRepository;
import gaji.service.domain.common.web.dto.CategoryResponseDTO;
import gaji.service.domain.enums.CategoryEnum;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.common.repository.SelectCategoryRepository;
import gaji.service.global.exception.RestApiException;
import gaji.service.global.exception.code.status.GlobalErrorStatus;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.stream.Collectors;

@Service
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package gaji.service.domain.common.validation;

import gaji.service.domain.common.annotation.CheckHashtagBlank;
import gaji.service.domain.common.annotation.CheckHashtagLength;
import gaji.service.global.exception.code.status.GlobalErrorStatus;
import jakarta.validation.ConstraintValidator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import gaji.service.domain.message.entity.Message;
import gaji.service.domain.message.enums.MessageTypeEnum;
import gaji.service.domain.message.web.dto.MessageRequestDTO;
import gaji.service.domain.message.web.dto.MessageResponseDTO;
import gaji.service.domain.user.entity.User;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package gaji.service.domain.message.entity;

import gaji.service.domain.user.entity.User;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gaji.service.domain.message.service;

import gaji.service.domain.message.converter.MessageBodyConverter;
import gaji.service.domain.message.entity.Message;
import gaji.service.domain.message.converter.MessageConverter;
import gaji.service.domain.message.entity.Message;
import gaji.service.domain.message.entity.MessageBody;
import gaji.service.domain.message.repository.MessageBodyRepository;
import gaji.service.domain.message.repository.MessageRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gaji.service.domain.message.web.controller;

import gaji.service.domain.message.entity.Message;
import gaji.service.domain.message.converter.MessageConverter;
import gaji.service.domain.message.entity.Message;
import gaji.service.domain.message.service.MessageCommandService;
import gaji.service.domain.message.service.MessageQueryService;
import gaji.service.domain.message.web.dto.MessageRequestDTO;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/gaji/service/domain/myRepeat/MyRepeat.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package gaji.service.domain.myRepeat;

import gaji.service.domain.room.entity.RoomEvent;
import gaji.service.domain.enums.Frequency;
import jakarta.persistence.*;
import lombok.AccessLevel;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package gaji.service.domain.myRepeat;

import gaji.service.domain.room.entity.RoomEvent;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public enum CommunityPostErrorStatus implements BaseErrorCodeInterface {

@Override
public BaseCodeDto getErrorCode() {
return gaji.service.global.exception.code.BaseCodeDto.builder()
return BaseCodeDto.builder()
.httpStatus(httpStatus)
.isSuccess(isSuccess)
.code(code)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
import gaji.service.domain.common.web.dto.HashtagResponseDTO;
import gaji.service.domain.enums.PostStatusEnum;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.PostBookmark;
import gaji.service.domain.post.entity.PostLikes;
import gaji.service.domain.post.service.CommunityPostBookMarkService;
import gaji.service.domain.post.service.CommunityPostLikesService;
import gaji.service.domain.post.web.dto.PostRequestDTO;
import gaji.service.domain.post.web.dto.CommunityPostResponseDTO;
import gaji.service.domain.post.web.dto.PostRequestDTO;
import gaji.service.domain.user.entity.User;
import gaji.service.global.converter.DateConverter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gaji.service.domain.post.repository;

import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.post.entity.CommunityComment;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import com.querydsl.core.types.OrderSpecifier;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.impl.JPAQueryFactory;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.post.entity.CommunityComment;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package gaji.service.domain.post.repository;

import com.querydsl.core.Tuple;
import gaji.service.domain.enums.SortType;
import gaji.service.domain.enums.PostStatusEnum;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.enums.SortType;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.user.entity.User;
import org.springframework.data.domain.Pageable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.impl.JPAQueryFactory;
import gaji.service.domain.common.service.CategoryService;
import gaji.service.domain.enums.SortType;
import gaji.service.domain.enums.PostStatusEnum;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.enums.SortType;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.user.entity.User;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gaji.service.domain.post.service;

import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.PostBookmark;
import gaji.service.domain.post.entity.PostLikes;
import gaji.service.domain.post.web.dto.PostRequestDTO;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
import gaji.service.domain.common.service.CategoryService;
import gaji.service.domain.common.service.HashtagService;
import gaji.service.domain.post.converter.CommunityPostConverter;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.PostBookmark;
import gaji.service.domain.post.entity.PostLikes;
import gaji.service.domain.post.repository.CommunityPostBookmarkRepository;
import gaji.service.domain.post.repository.CommunityPostLikesRepository;
import gaji.service.domain.post.repository.CommunityPostJpaRepository;
import gaji.service.domain.post.repository.CommunityPostLikesRepository;
import gaji.service.domain.post.web.dto.PostRequestDTO;
import gaji.service.domain.user.entity.User;
import gaji.service.domain.user.service.UserQueryService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gaji.service.domain.post.service;

import gaji.service.domain.enums.SortType;
import gaji.service.domain.enums.PostStatusEnum;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.enums.SortType;
import gaji.service.domain.post.entity.CommnuityPost;
import org.springframework.data.domain.Slice;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gaji.service.domain.post.service;

import gaji.service.domain.enums.SortType;
import gaji.service.domain.enums.PostStatusEnum;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.enums.SortType;
import gaji.service.domain.post.code.CommunityPostErrorStatus;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.post.repository.CommunityPostBookmarkRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package gaji.service.domain.post.web.controller;

import gaji.service.domain.enums.SortType;
import gaji.service.domain.enums.PostStatusEnum;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.enums.SortType;
import gaji.service.domain.post.converter.CommunityCommentConverter;
import gaji.service.domain.post.converter.CommunityPostConverter;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.CommnuityPost;
import gaji.service.domain.post.entity.CommunityComment;
import gaji.service.domain.post.entity.PostBookmark;
import gaji.service.domain.post.entity.PostLikes;
import gaji.service.domain.post.service.CommunityCommentService;
import gaji.service.domain.post.service.CommunityPostCommandService;
import gaji.service.domain.post.service.CommunityPostQueryService;
import gaji.service.domain.post.web.dto.CommunityPostCommentResponseDTO;
import gaji.service.domain.post.web.dto.PostRequestDTO;
import gaji.service.domain.post.web.dto.CommunityPostResponseDTO;
import gaji.service.domain.post.web.dto.PostRequestDTO;
import gaji.service.global.base.BaseResponse;
import gaji.service.jwt.service.TokenProviderService;
import io.swagger.v3.oas.annotations.Operation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package gaji.service.domain.post.web.dto;

import gaji.service.domain.common.annotation.CheckHashtagLength;
import gaji.service.domain.common.annotation.ExistsCategory;
import gaji.service.domain.common.annotation.CheckHashtagBlank;
import gaji.service.domain.common.annotation.CheckHashtagLength;
import gaji.service.domain.enums.PostTypeEnum;
import gaji.service.domain.post.annotation.ExistPostType;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

import gaji.service.domain.common.entity.SelectCategory;
import gaji.service.domain.enums.CategoryEnum;
import gaji.service.domain.enums.Role;
import gaji.service.domain.recruit.entity.RecruitPostBookmark;
import gaji.service.domain.recruit.entity.RecruitPostLikes;
import gaji.service.domain.user.entity.User;
import gaji.service.domain.enums.Role;
import gaji.service.domain.recruit.entity.StudyComment;
import gaji.service.domain.recruit.web.dto.RecruitRequestDTO;
import gaji.service.domain.recruit.web.dto.RecruitResponseDTO;
import gaji.service.domain.room.entity.Material;
import gaji.service.domain.room.entity.Room;
import gaji.service.domain.studyMate.entity.StudyMate;
import gaji.service.domain.user.entity.User;
import gaji.service.global.converter.DateConverter;
import org.springframework.data.domain.Slice;
import org.springframework.stereotype.Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package gaji.service.domain.recruit.entity;

import gaji.service.domain.user.entity.User;
import gaji.service.domain.common.entity.BaseEntity;
import gaji.service.domain.enums.CommentStatus;
import gaji.service.domain.room.entity.Room;
import gaji.service.domain.user.entity.User;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import java.util.List;

import static gaji.service.domain.room.entity.QRoom.room;
import static gaji.service.domain.common.entity.QSelectCategory.selectCategory;
import static gaji.service.domain.room.entity.QRoom.room;

@RequiredArgsConstructor
@Repository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.SliceImpl;
import org.springframework.stereotype.Repository;

import java.util.List;

import static gaji.service.domain.recruit.entity.QStudyComment.studyComment;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
import gaji.service.domain.recruit.code.RecruitErrorStatus;
import gaji.service.domain.recruit.converter.RecruitConverter;
import gaji.service.domain.recruit.repository.RecruitRepository;
import gaji.service.domain.recruit.web.dto.RecruitResponseDTO;
import gaji.service.domain.room.entity.Room;
import gaji.service.domain.room.service.RoomCommandService;
import gaji.service.domain.room.service.RoomQueryService;
import gaji.service.domain.user.entity.User;
import gaji.service.domain.recruit.web.dto.RecruitResponseDTO;
import gaji.service.domain.room.entity.Room;
import gaji.service.domain.user.service.UserQueryService;
import gaji.service.global.exception.RestApiException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import gaji.service.global.base.BaseResponse;
import gaji.service.jwt.service.TokenProviderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import jakarta.validation.Valid;
import jakarta.validation.constraints.Min;
import lombok.RequiredArgsConstructor;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gaji/service/domain/room/entity/Room.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import gaji.service.domain.common.entity.BaseEntity;
import gaji.service.domain.curriculum.Curriculum;
import gaji.service.domain.user.entity.User;
import gaji.service.domain.enums.RecruitPostTypeEnum;
import gaji.service.domain.recruit.entity.RecruitPostBookmark;
import gaji.service.domain.recruit.entity.RecruitPostLikes;
import gaji.service.domain.roomBoard.entity.common.RoomBoard;
import gaji.service.domain.roomBoard.entity.RoomBoard;
import gaji.service.domain.studyMate.entity.Chat;
import gaji.service.domain.studyMate.entity.StudyApplicant;
import gaji.service.domain.studyMate.entity.StudyMate;
import gaji.service.domain.user.entity.User;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import gaji.service.domain.studyMate.entity.QStudyMate;
import gaji.service.domain.user.entity.User;
import lombok.AllArgsConstructor;

import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.data.domain.SliceImpl;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package gaji.service.domain.room.repository;

import gaji.service.domain.room.entity.RoomEvent;
import gaji.service.domain.room.web.dto.RoomResponseDto;
import gaji.service.domain.studyMate.entity.WeeklyUserProgress;
import gaji.service.domain.user.entity.User;
import org.springframework.data.jpa.repository.JpaRepository;
Expand Down
Loading

0 comments on commit 9667f85

Please sign in to comment.