[Release] v2.0.8 릴리즈

.github/workflows/deploy.yml

@@ -83,6 +83,9 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/eatssu-prod
             sudo docker run -d -p 9000:9000 \
+            --log-driver=json-file \
+            --log-opt max-size=20m \
+            --log-opt max-file=5 \
             -e EATSSU_DB_URL_PROD="${{ secrets.EATSSU_DB_URL_PROD }}" \
             -e EATSSU_DB_USERNAME="${{ secrets.EATSSU_DB_USERNAME }}" \
             -e EATSSU_DB_PASSWORD="${{ secrets.EATSSU_DB_PASSWORD }}" \
@@ -107,6 +110,9 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/eatssu-dev
             sudo docker run -d -p 9000:9000 \
+            --log-driver=json-file \
+            --log-opt max-size=20m \
+            --log-opt max-file=5 \
             -e EATSSU_DB_URL_DEV="${{ secrets.EATSSU_DB_URL_DEV }}" \
             -e EATSSU_DB_USERNAME="${{ secrets.EATSSU_DB_USERNAME }}" \
             -e EATSSU_DB_PASSWORD="${{ secrets.EATSSU_DB_PASSWORD }}" \

.gitignore

@@ -45,4 +45,8 @@ out/
 ### env file ###
 .env
 
-/src/main/resources/application-local.yml
+/src/main/resources/application-local.yml
+
+### DS File ###
+.DS_Store
+*/.DS_Store

Dockerfile

@@ -22,4 +22,4 @@ COPY --from=builder /home/gradle/project/build/libs/*.jar app.jar
 EXPOSE 9000
 
 # 애플리케이션 실행
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

build.gradle

@@ -80,6 +80,7 @@ def generated = 'src/main/generated'
 
 tasks.withType(JavaCompile) {
     options.getGeneratedSourceOutputDirectory().set(file(generated))
+    options.compilerArgs += ['-parameters']
 }
 
 sourceSets {
@@ -88,4 +89,4 @@ sourceSets {
 
 clean {
     delete file('src/main/generated')
-}
+}

src/main/java/ssu/eatssu/domain/auth/dto/AppleLoginRequest.java

@@ -1,9 +1,11 @@
 package ssu.eatssu.domain.auth.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "애플 로그인 및 회원가입")
 public record AppleLoginRequest(
+        @LogMask
         @Schema(description = "identityToken", example = "eyJraWQiOiJXNldjT0tCIiwiYWxnIjoi...")
         String identityToken
 ) {

src/main/java/ssu/eatssu/domain/auth/dto/KakaoLoginRequest.java

@@ -3,14 +3,17 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "카카오 로그인 및 회원가입")
 public record KakaoLoginRequest(
+        @LogMask
         @NotBlank(message = "이메일을 입력해주세요.")
         @Email(message = "올바른 이메일 주소를 입력해주세요.")
         @Schema(description = "이메일", example = "[email protected]")
         String email,
 
+        @LogMask
         @Schema(description = "providerId", example = "10378247832195")
         String providerId
 ) {

src/main/java/ssu/eatssu/domain/auth/dto/ValidRequest.java

@@ -2,9 +2,11 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "유효한 토큰 확인")
 public record ValidRequest(
+        @LogMask
         @NotBlank(message = "토큰을 입력해주세요")
         @Schema(description = "토큰", example = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJpZFwiOjcsXCJlbWFpbFwiOlwidGVzdEBlbWFpbC5jb21cIixcInJvbGVcIjpcIlJPTEVfVVNFUlwifSIsImF1dGgiOiJST0xFX1VTRVIiLCJleHAiOjE3NDQzNzQ0MjB9.mhIWYX_Vj3xW1eXuVflbzpH6vLTcC9b1twbIcqovVjDVnS7tjegu3nQHGXUsUa_WG2DIAtJMFZT_Q1XcVq1jPw")
         String token

src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java

@@ -14,7 +14,6 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import ssu.eatssu.domain.auth.security.JwtAuthenticationFilter;
 import ssu.eatssu.domain.auth.security.JwtTokenProvider;
-import ssu.eatssu.domain.slack.service.SlackErrorNotifier;
 import ssu.eatssu.global.handler.JwtAccessDeniedHandler;
 import ssu.eatssu.global.handler.JwtAuthenticationEntryPoint;
 

src/main/java/ssu/eatssu/domain/auth/security/JwtAuthenticationFilter.java

@@ -15,8 +15,6 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
-
-
 import java.io.IOException;
 import java.util.List;
 

src/main/java/ssu/eatssu/domain/inquiry/dto/CreateInquiryRequest.java

@@ -3,15 +3,18 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "문의 남기기")
 @NoArgsConstructor
 @Getter
 public class CreateInquiryRequest {
 
     @Schema(description = "답장 받을 이메일", example = "[email protected]")
+    @LogMask
     private String email;
 
     @Schema(description = "문의 내용", example = "어쩌고 저쩌고 문의 남깁니다")
+    @LogMask
     private String content;
 }

src/main/java/ssu/eatssu/domain/inquiry/service/InquiryService.java

@@ -1,6 +1,7 @@
 package ssu.eatssu.domain.inquiry.service;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ssu.eatssu.domain.auth.security.CustomUserDetails;
@@ -10,6 +11,7 @@
 import ssu.eatssu.domain.user.entity.User;
 import ssu.eatssu.domain.user.repository.UserRepository;
 import ssu.eatssu.global.handler.response.BaseException;
+import ssu.eatssu.global.log.event.LogEvent;
 
 import static ssu.eatssu.global.handler.response.BaseResponseStatus.NOT_FOUND_USER;
 
@@ -20,14 +22,23 @@ public class InquiryService {
 
     private final UserRepository userRepository;
     private final InquiryRepository inquiryRepository;
+    private final ApplicationEventPublisher eventPublisher;
 
     public Inquiry createUserInquiry(CustomUserDetails userDetails, CreateInquiryRequest request) {
         User user = userRepository.findById(userDetails.getId())
-                                  .orElseThrow(() -> new BaseException(NOT_FOUND_USER));
+                .orElseThrow(() -> new BaseException(NOT_FOUND_USER));
 
         Inquiry inquiry = new Inquiry(request.getContent(), user, request.getEmail());
+        Inquiry saved = inquiryRepository.save(inquiry);
 
-        return inquiryRepository.save(inquiry);
+        eventPublisher.publishEvent(LogEvent.of(String.format(
+                "Inquiry created: id=%d, userId=%d, status=%s",
+                saved.getId(),
+                user.getId(),
+                saved.getStatus()
+        )));
+
+        return saved;
     }
 
 }

src/main/java/ssu/eatssu/domain/menu/entity/Meal.java

@@ -64,4 +64,10 @@ public List<String> getMenuNames() {
     public void addMealMenu(MealMenu mealMenu) {
         mealMenus.add(mealMenu);
     }
+
+    public List<Menu> getMenus() {
+        return mealMenus.stream()
+                        .map(MealMenu::getMenu)
+                        .toList();
+    }
 }

src/main/java/ssu/eatssu/domain/menu/entity/Menu.java

@@ -33,6 +33,8 @@ public class Menu {
     private final Reviews reviews = new Reviews();
     @OneToMany(mappedBy = "menu", cascade = CascadeType.ALL)
     private final List<MealMenu> mealMenus = new ArrayList<>();
+    @Column(name = "unlike_count")
+    private Integer unlikeCount = 0;
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "menu_id")
@@ -44,15 +46,10 @@ public class Menu {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "menu_category_id")
     private MenuCategory category;
-
     private boolean isDiscontinued = false;
-
     @Column(name = "like_count")
     private Integer likeCount = 0;
 
-    @Column(name = "unlike_count")
-    private final Integer unlikeCount = 0;
-
     private Menu(String name, Restaurant restaurant, Integer price, MenuCategory category) {
         this.name = name;
         this.restaurant = restaurant;

src/main/java/ssu/eatssu/domain/menu/persistence/QuerydslMenuRatingCalculator.java

@@ -27,7 +27,6 @@ public Double getMainRatingAverage(Long menuId) {
     }
 
 
-
     private BooleanExpression menuIdEq(Long menuId) {
         return menu.id.eq(menuId);
     }

src/main/java/ssu/eatssu/domain/menu/presentation/dto/response/MenusInMealResponse.java

@@ -6,6 +6,7 @@
 import lombok.NoArgsConstructor;
 import ssu.eatssu.domain.menu.entity.Meal;
 import ssu.eatssu.domain.menu.entity.MealMenu;
+import ssu.eatssu.domain.menu.entity.Menu;
 
 import java.util.List;
 
@@ -18,9 +19,8 @@ public class MenusInMealResponse {
     @Schema(description = "식단 속 메뉴 목록", example = "[]")
     private List<BriefMenuResponse> briefMenus;
 
-    public static MenusInMealResponse from(Meal meal) {
-        List<BriefMenuResponse> menusInformation = meal.getMealMenus().stream()
-                                                       .map(MealMenu::getMenu)
+    public static MenusInMealResponse from(List<Menu> menus) {
+        List<BriefMenuResponse> menusInformation =  menus.stream()
                                                        .map(BriefMenuResponse::new)
                                                        .toList();
 

src/main/java/ssu/eatssu/domain/menu/service/MealService.java

@@ -39,8 +39,15 @@ public class MealService {
     public MenusInMealResponse getMenusInMealByMealId(Long mealId) {
         Meal meal = mealRepository.findById(mealId)
                                   .orElseThrow(() -> new BaseException(BaseResponseStatus.NOT_FOUND_MEAL));
+        List<Menu> menus = meal.getMealMenus().stream()
+                .map(MealMenu::getMenu)
+                .toList();
+
+        if (menus.isEmpty()) {
+            log.warn("Meal[{}] has no menus.", mealId);
+        }
 
-        return MenusInMealResponse.from(meal);
+        return MenusInMealResponse.from(menus);
     }
 
     public List<MealDetailResponse> getMealDetailsByDateAndRestaurantAndTimePart(

src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java

@@ -28,9 +28,11 @@ public static PartnershipInfo fromEntity(Partnership partnership,
                               .startDate(partnership.getStartDate())
                               .endDate(partnership.getEndDate())
                               .collegeName(partnership.getPartnershipCollege() == null && partnership.getPartnershipDepartment() == null
-                                                ? "총학생회"
-                                                : (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege().getName() : null))
-                              .departmentName(partnership.getPartnershipDepartment() != null ? partnership.getPartnershipDepartment().getName() : null)
+                                                   ? "총학생회"
+                                                   : (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege()
+                                                                                                               .getName() : null))
+                              .departmentName(partnership.getPartnershipDepartment() != null ? partnership.getPartnershipDepartment()
+                                                                                                          .getName() : null)
                               .likeCount(restaurant.getLikes() != null ? restaurant.getLikes().size() : 0)
                               .isLiked(isLiked)
                               .build();

src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java

@@ -2,8 +2,6 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -32,7 +30,7 @@ public class Partnership {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "partnership_id")
     private Long id;
-    
+
     @Column(name = "description", nullable = false)
     private String description;
 

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java

@@ -12,19 +12,19 @@
 
 public interface PartnershipRepository extends JpaRepository<Partnership, Long> {
     @Query("""
-        select distinct pr
-        from PartnershipRestaurant pr
-        join fetch pr.partnerships p
-        left join fetch p.partnershipCollege pc
-        left join fetch p.partnershipDepartment pd
-        where
-          (
-            pc = :college
-            or pd = :department
-            or (pc is null and pd is null)
-          )
-          and (p.endDate is null or p.endDate >= current_date)
-        """)
+            select distinct pr
+            from PartnershipRestaurant pr
+            join fetch pr.partnerships p
+            left join fetch p.partnershipCollege pc
+            left join fetch p.partnershipDepartment pd
+            where
+              (
+                pc = :college
+                or pd = :department
+                or (pc is null and pd is null)
+              )
+              and (p.endDate is null or p.endDate >= current_date)
+            """)
     List<PartnershipRestaurant> findRestaurantsWithMyPartnerships(
             @Param("college") College college,
             @Param("department") Department department

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRestaurantRepository.java

@@ -8,10 +8,11 @@
 
 public interface PartnershipRestaurantRepository extends JpaRepository<PartnershipRestaurant, Long> {
     @Query("""
-            SELECT DISTINCT pr FROM PartnershipRestaurant pr
-            LEFT JOIN FETCH pr.partnerships p
-            LEFT JOIN FETCH p.partnershipCollege
-            LEFT JOIN FETCH p.partnershipDepartment
-            WHERE p.endDate is null or p.endDate >= CURRENT_DATE""")
+        SELECT DISTINCT pr FROM PartnershipRestaurant pr
+        JOIN FETCH pr.partnerships p
+        LEFT JOIN FETCH p.partnershipCollege
+        LEFT JOIN FETCH p.partnershipDepartment
+        WHERE p.endDate IS NULL OR p.endDate >= CURRENT_DATE
+    """)
     List<PartnershipRestaurant> findAllWithDetails();
 }

src/main/java/ssu/eatssu/domain/partnership/service/PartnershipService.java

@@ -1,6 +1,8 @@
 package ssu.eatssu.domain.partnership.service;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ssu.eatssu.domain.auth.security.CustomUserDetails;
@@ -19,6 +21,7 @@
 import ssu.eatssu.domain.user.entity.User;
 import ssu.eatssu.domain.user.repository.UserRepository;
 import ssu.eatssu.global.handler.response.BaseException;
+import ssu.eatssu.global.log.event.LogEvent;
 
 import java.util.List;
 import java.util.Optional;
@@ -40,6 +43,7 @@ public class PartnershipService {
     private final UserRepository userRepository;
     private final PartnershipLikeRepository partnershipLikeRepository;
     private final PartnershipRestaurantRepository partnerShipRestaurantRepository;
+    private final ApplicationEventPublisher eventPublisher;
 
     @Transactional
     public void createPartnership(CreatePartnershipRequest request) {
@@ -68,22 +72,30 @@ public List<PartnershipResponse> getAllPartnerships(CustomUserDetails customUser
     @Transactional
     public void togglePartnershipLike(Long partnershipId, CustomUserDetails userDetails) {
         Partnership partnership = partnershipRepository.findById(partnershipId)
-                                                       .orElseThrow(() -> new BaseException(NOT_FOUND_PARTNERSHIP));
+                .orElseThrow(() -> new BaseException(NOT_FOUND_PARTNERSHIP));
         User user = userRepository.findById(userDetails.getId())
-                                  .orElseThrow(() -> new BaseException(NOT_FOUND_USER));
+                .orElseThrow(() -> new BaseException(NOT_FOUND_USER));
         PartnershipRestaurant partnershipRestaurant = partnership.getPartnershipRestaurant();
 
-        Optional<PartnershipLike> optionalPartnershipLike = partnershipLikeRepository.findByUserAndPartnershipRestaurant(
-                user,
-                partnershipRestaurant);
+        Optional<PartnershipLike> optionalPartnershipLike =
+                partnershipLikeRepository.findByUserAndPartnershipRestaurant(user, partnershipRestaurant);
+
         if (optionalPartnershipLike.isPresent()) {
             PartnershipLike partnershipLike = optionalPartnershipLike.get();
             partnershipRestaurant.getLikes().remove(partnershipLike);
             partnershipLikeRepository.delete(partnershipLike);
+
+            eventPublisher.publishEvent(LogEvent.of(
+                    String.format("User[%d] canceled like on PartnershipRestaurant[%d]",
+                            user.getId(), partnershipRestaurant.getId())));
         } else {
             PartnershipLike partnershipLike = new PartnershipLike(user, partnershipRestaurant);
             partnershipRestaurant.getLikes().add(partnershipLike);
             partnershipLikeRepository.save(partnershipLike);
+
+            eventPublisher.publishEvent(LogEvent.of(
+                    String.format("User[%d] liked PartnershipRestaurant[%d]",
+                            user.getId(), partnershipRestaurant.getId())));
         }
     }