Merge pull request #130 from YAPP-Github/develop

Release 0.2.6

.gitignore

@@ -19,7 +19,7 @@ build/
 *.iws
 *.iml
 *.ipr
-out/
+out/**
 
 ### NetBeans ###
 /nbproject/private/

src/main/java/com/yapp/artie/domain/archive/controller/ArtworkController.java

@@ -10,7 +10,7 @@
 import com.yapp.artie.domain.archive.dto.artwork.CreateArtworkResponseDto;
 import com.yapp.artie.domain.archive.dto.artwork.UpdateArtworkRequestDto;
 import com.yapp.artie.domain.archive.service.ArtworkService;
-import com.yapp.artie.global.exception.response.ErrorResponse;
+import com.yapp.artie.global.common.exception.ErrorResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;

src/main/java/com/yapp/artie/domain/archive/controller/ExhibitController.java

@@ -13,7 +13,7 @@
 import com.yapp.artie.domain.archive.dto.exhibit.PostInfoDto;
 import com.yapp.artie.domain.archive.dto.exhibit.UpdateExhibitRequestDto;
 import com.yapp.artie.domain.archive.service.ExhibitService;
-import com.yapp.artie.global.exception.response.ErrorResponse;
+import com.yapp.artie.global.common.exception.ErrorResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;

src/main/java/com/yapp/artie/domain/archive/domain/artwork/Artwork.java

@@ -2,7 +2,7 @@
 
 import com.yapp.artie.domain.archive.domain.exhibit.Exhibit;
 import com.yapp.artie.domain.archive.domain.tag.Tag;
-import com.yapp.artie.global.common.BaseEntity;
+import com.yapp.artie.global.common.persistence.BaseEntity;
 import java.util.ArrayList;
 import java.util.List;
 import javax.persistence.CascadeType;

src/main/java/com/yapp/artie/domain/archive/domain/category/Category.java

@@ -1,8 +1,8 @@
 package com.yapp.artie.domain.archive.domain.category;
 
 import com.yapp.artie.domain.archive.domain.exhibit.Exhibit;
-import com.yapp.artie.domain.user.domain.User;
-import com.yapp.artie.global.common.BaseEntity;
+import com.yapp.artie.domain.user.adapter.out.persistence.UserJpaEntity;
+import com.yapp.artie.global.common.persistence.BaseEntity;
 import java.util.ArrayList;
 import java.util.List;
 import javax.persistence.CascadeType;
@@ -30,7 +30,7 @@ public class Category extends BaseEntity {
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "user_id", nullable = false)
-  private User user;
+  private UserJpaEntity user;
 
   @Column(nullable = false)
   private String name;
@@ -41,13 +41,13 @@ public class Category extends BaseEntity {
   @Column(nullable = false, name = "seq")
   private int sequence;
 
-  private Category(User user, String name, int sequence) {
+  private Category(UserJpaEntity user, String name, int sequence) {
     this.user = user;
     this.name = name;
     this.sequence = sequence;
   }
 
-  public static Category create(User user, String name, int sequence) {
+  public static Category create(UserJpaEntity user, String name, int sequence) {
     return new Category(user, name, sequence);
   }
 
@@ -56,7 +56,7 @@ public void addExhibit(Exhibit exhibit) {
     exhibit.categorize(this);
   }
 
-  public boolean ownedBy(User user) {
+  public boolean ownedBy(UserJpaEntity user) {
     return this.user.equals(user);
   }
 

src/main/java/com/yapp/artie/domain/archive/domain/exhibit/Exhibit.java

@@ -3,8 +3,8 @@
 
 import com.yapp.artie.domain.archive.domain.artwork.Artwork;
 import com.yapp.artie.domain.archive.domain.category.Category;
-import com.yapp.artie.domain.user.domain.User;
-import com.yapp.artie.global.common.BaseEntity;
+import com.yapp.artie.domain.user.adapter.out.persistence.UserJpaEntity;
+import com.yapp.artie.global.common.persistence.BaseEntity;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +38,7 @@ public class Exhibit extends BaseEntity {
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "user_id", nullable = false)
-  private User user;
+  private UserJpaEntity user;
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "category_id", nullable = false)
@@ -57,7 +57,7 @@ public class Exhibit extends BaseEntity {
   @Column(nullable = false, columnDefinition = "varchar(32) default 'NONE'")
   private PinType pinType;
 
-  private Exhibit(User user, Category category, ExhibitContents contents, Publication publication) {
+  private Exhibit(UserJpaEntity user, Category category, ExhibitContents contents, Publication publication) {
     this.user = user;
     this.category = category;
     this.contents = contents;
@@ -77,7 +77,7 @@ public void categorize(Category category) {
     this.category = category;
   }
 
-  public boolean ownedBy(User user) {
+  public boolean ownedBy(UserJpaEntity user) {
     return this.user.equals(user);
   }
 
@@ -98,7 +98,7 @@ public void addArtwork(Artwork artwork) {
     artwork.display(this);
   }
 
-  public static Exhibit create(String name, LocalDate postDate, Category category, User user,
+  public static Exhibit create(String name, LocalDate postDate, Category category, UserJpaEntity user,
       String attachedLink) {
     ExhibitContents contents = new ExhibitContents(name, null, attachedLink, postDate);
     Publication publication = new Publication();

src/main/java/com/yapp/artie/domain/archive/domain/tag/Tag.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.domain.tag;
 
 import com.yapp.artie.domain.archive.domain.artwork.Artwork;
-import com.yapp.artie.domain.user.domain.User;
+import com.yapp.artie.domain.user.adapter.out.persistence.UserJpaEntity;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -25,7 +25,7 @@ public class Tag {
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "user_id", nullable = false)
-  private User user;
+  private UserJpaEntity user;
 
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "image_id", nullable = false)
@@ -37,7 +37,7 @@ public class Tag {
   @Column(nullable = false)
   private String name;
 
-  public Tag(User user, Artwork artwork, int sequence, String name) {
+  public Tag(UserJpaEntity user, Artwork artwork, int sequence, String name) {
     this.user = user;
     this.artwork = artwork;
     this.sequence = sequence;

src/main/java/com/yapp/artie/domain/archive/exception/ArtworkNotFoundException.java

@@ -1,8 +1,8 @@
 package com.yapp.artie.domain.archive.exception;
 
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class ArtworkNotFoundException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/CategoryAlreadyExistException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class CategoryAlreadyExistException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/CategoryNotFoundException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class CategoryNotFoundException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/ChangeCategoryWrongLengthException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class ChangeCategoryWrongLengthException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/ExceededCategoryCountException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class ExceededCategoryCountException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/ExhibitAlreadyPublishedException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class ExhibitAlreadyPublishedException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/ExhibitNotFoundException.java

@@ -1,8 +1,8 @@
 package com.yapp.artie.domain.archive.exception;
 
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class ExhibitNotFoundException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/NotOwnerOfArtworkException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class NotOwnerOfArtworkException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/NotOwnerOfCategoryException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class NotOwnerOfCategoryException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/exception/NotOwnerOfExhibitException.java

@@ -1,7 +1,7 @@
 package com.yapp.artie.domain.archive.exception;
 
-import com.yapp.artie.global.exception.common.BusinessException;
-import com.yapp.artie.global.exception.response.ErrorCode;
+import com.yapp.artie.global.common.exception.BusinessException;
+import com.yapp.artie.global.common.exception.ErrorCode;
 
 public class NotOwnerOfExhibitException extends BusinessException {
 

src/main/java/com/yapp/artie/domain/archive/repository/CategoryRepository.java

@@ -2,7 +2,7 @@
 
 import com.yapp.artie.domain.archive.domain.category.Category;
 import com.yapp.artie.domain.archive.dto.cateogry.CategoryDto;
-import com.yapp.artie.domain.user.domain.User;
+import com.yapp.artie.domain.user.adapter.out.persistence.UserJpaEntity;
 import java.util.List;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -15,20 +15,20 @@
 public interface CategoryRepository extends JpaRepository<Category, Long> {
 
   @Query("select new com.yapp.artie.domain.archive.dto.cateogry.CategoryDto(c.id, c.name, c.sequence) from Category c where c.user = :user order by c.sequence")
-  List<CategoryDto> findCategoryDto(@Param("user") User user);
+  List<CategoryDto> findCategoryDto(@Param("user") UserJpaEntity user);
 
   @Modifying(clearAutomatically = true)
   @Query("update Category c set c.sequence = c.sequence - 1 where c.sequence > :sequence and c.user = :user")
-  void bulkSequenceMinus(@Param("user") User user, @Param("sequence") int sequence);
+  void bulkSequenceMinus(@Param("user") UserJpaEntity user, @Param("sequence") int sequence);
 
   @EntityGraph(attributePaths = {"user"})
   Category findCategoryEntityGraphById(Long id);
 
-  int countCategoriesByUser(@Param("user") User user);
+  int countCategoriesByUser(@Param("user") UserJpaEntity user);
 
-  List<Category> findCategoriesByUserOrderBySequence(User user);
+  List<Category> findCategoriesByUserOrderBySequence(UserJpaEntity user);
 
   @Modifying(clearAutomatically = true)
-  void deleteAllByUser(User user);
+  void deleteAllByUser(UserJpaEntity user);
 }
 

src/main/java/com/yapp/artie/domain/archive/repository/ExhibitRepository.java

@@ -6,7 +6,7 @@
 import com.yapp.artie.domain.archive.dto.exhibit.CalenderQueryResultDto;
 import com.yapp.artie.domain.archive.dto.exhibit.ExhibitByDateResponseDto;
 import com.yapp.artie.domain.archive.dto.exhibit.PostInfoDto;
-import com.yapp.artie.domain.user.domain.User;
+import com.yapp.artie.domain.user.adapter.out.persistence.UserJpaEntity;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
@@ -25,7 +25,7 @@ public interface ExhibitRepository extends JpaRepository<Exhibit, Long> {
   @Query("select count(e.id) from Exhibit e "
       + "where e.user = :user "
       + "and  e.publication.isPublished = true")
-  int countExhibit(@Param("user") User user);
+  int countExhibit(@Param("user") UserJpaEntity user);
 
   @EntityGraph(attributePaths = {"user"})
   Optional<Exhibit> findExhibitEntityGraphById(Long id);
@@ -36,25 +36,29 @@ public interface ExhibitRepository extends JpaRepository<Exhibit, Long> {
   @Query("select new com.yapp.artie.domain.archive.dto.exhibit."
       + "PostInfoDto(e.id, e.contents.name, e.contents.date, e.contents.attachedLink, e.publication.isPublished) "
       + "from Exhibit e where e.user = :user and e.publication.isPublished = false")
-  List<PostInfoDto> findDraftExhibitDto(@Param("user") User user);
+  List<PostInfoDto> findDraftExhibitDto(@Param("user") UserJpaEntity user);
 
   @Query(
       value = "select e from Exhibit e "
           + "where e.user = :user "
           + "and e.category = :category "
           + "and e.publication.isPublished = true",
-      countQuery = "select count(e.id) from Exhibit e"
+      countQuery = "select count(e.id) from Exhibit e "
+          + "where e.publication.isPublished = true "
+          + "and e.category = :category"
   )
-  Page<Exhibit> findExhibitByCategoryAsPage(Pageable pageable, @Param("user") User user,
+  Page<Exhibit> findExhibitByCategoryAsPage(Pageable pageable, @Param("user") UserJpaEntity user,
       @Param("category") Category category);
 
   @Query(
       value = "select e from Exhibit e "
           + "where e.user = :user "
           + "and e.publication.isPublished = true",
-      countQuery = "select count(e.id) from Exhibit e"
+      countQuery = "select count(e.id) from Exhibit e "
+          + "where e.publication.isPublished = true "
+          + "and e.user = :user"
   )
-  Page<Exhibit> findExhibitAsPage(Pageable pageable, @Param("user") User user);
+  Page<Exhibit> findExhibitAsPage(Pageable pageable, @Param("user") UserJpaEntity user);
 
   @Query(value = "SELECT p.calenderDate, p.postId, p.postNum, image. `uri` FROM "
       + "( SELECT DATE(created_at) as calenderDate, MAX(id) AS postId, count(*) postNum FROM post "
@@ -81,7 +85,7 @@ void updateExhibitCreatedAt(@Param("createdAt") LocalDateTime createdAt,
           + "WHERE e.createdAt BETWEEN :start AND :end "
           + "AND e.user = :user AND e.publication.isPublished = true "
           + "ORDER BY e.createdAt DESC")
-  List<ExhibitByDateResponseDto> findExhibitsByDate(@Param("user") User user,
+  List<ExhibitByDateResponseDto> findExhibitsByDate(@Param("user") UserJpaEntity user,
       @Param("start") LocalDateTime start,
       @Param("end") LocalDateTime end);