Merge pull request #135 from Mango-Butter/dev

release: dev -> main

Author: hyunzzii

.github/workflows/cd-dev.yml

@@ -143,6 +143,7 @@ jobs:
             echo "TOSS_PAYMENT_SECRET_KEY=${{ secrets.TOSS_PAYMENT_SECRET_KEY }}" >> .env 
             echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
             echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> .env
+            echo "REDIS_URL=${{ secrets.REDIS_URL }}" >> .env
             
             
             echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin

app/src/main/java/com/mangoboss/app/api/facade/store/BossStoreFacade.java

@@ -48,7 +48,6 @@ public class BossStoreFacade {
 	@Transactional
 	public StoreCreateResponse createStore(final Long userId, final StoreCreateRequest request) {
 		final UserEntity boss = userService.getUserById(userId);
-		storeService.validateBusinessNumber(request.businessNumber());
 		final StoreEntity saved = storeService.createStore(request, boss);
 		payrollSettingService.initPayrollSettingForStore(saved);
 		requiredDocumentService.initRequiredDocuments(saved);

app/src/main/java/com/mangoboss/app/api/facade/store/StaffStoreFacade.java

@@ -26,7 +26,7 @@ public class StaffStoreFacade {
     public StaffJoinResponse joinStaff(final Long userId, final StaffJoinRequest request) {
         final UserEntity user = userService.getUserById(userId);
         final StoreEntity store = storeService.getStoreByInviteCode(request.inviteCode());
-        staffService.createStaff(user, store);
+        staffService.createStaff(user, store, store.getBoss());
         return StaffJoinResponse.fromEntity(store);
     }
 

app/src/main/java/com/mangoboss/app/api/facade/subscription/SubscriptionFacade.java

@@ -2,9 +2,11 @@
 
 import com.mangoboss.app.domain.service.billing.BillingService;
 import com.mangoboss.app.domain.service.subscription.SubscriptionService;
+import com.mangoboss.app.domain.service.user.UserService;
 import com.mangoboss.app.dto.subscription.request.SubscriptionCreateRequest;
 import com.mangoboss.app.dto.subscription.response.SubscriptionOrderResponse;
 import com.mangoboss.app.dto.subscription.response.SubscriptionResponse;
+import com.mangoboss.storage.user.UserEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -16,10 +18,12 @@ public class SubscriptionFacade {
 
     private final SubscriptionService subscriptionService;
     private final BillingService billingService;
+    private final UserService userService;
 
     public void createOrReplaceSubscription(Long bossId, SubscriptionCreateRequest request) {
         billingService.validateBillingExists(bossId);
-        subscriptionService.createOrReplaceSubscription(bossId, request.planType());
+        UserEntity boss = userService.getUserById(bossId);
+        subscriptionService.createOrReplaceSubscription(boss, request.planType());
     }
 
     public SubscriptionResponse getSubscription(Long bossId) {

app/src/main/java/com/mangoboss/app/api/facade/workreport/StaffWorkReportFacade.java

@@ -1,6 +1,7 @@
 package com.mangoboss.app.api.facade.workreport;
 
 import com.mangoboss.app.common.util.S3PreSignedUrlManager;
+import com.mangoboss.app.domain.service.notification.NotificationService;
 import com.mangoboss.app.domain.service.staff.StaffService;
 import com.mangoboss.app.domain.service.workreport.WorkReportService;
 import com.mangoboss.app.dto.s3.response.UploadPreSignedUrlResponse;
@@ -9,6 +10,7 @@
 import com.mangoboss.storage.metadata.S3FileType;
 import com.mangoboss.storage.staff.StaffEntity;
 import com.mangoboss.storage.workreport.WorkReportEntity;
+import com.mangoboss.storage.workreport.WorkReportTargetType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -21,11 +23,18 @@ public class StaffWorkReportFacade {
 
     private final WorkReportService workReportService;
     private final StaffService staffService;
+    private final NotificationService notificationService;
     private final S3PreSignedUrlManager s3PreSignedUrlManager;
 
     public WorkReportResponse createWorkReport(final Long storeId, final Long userId, final WorkReportCreateRequest request) {
         StaffEntity staff = staffService.getVerifiedStaff(userId, storeId);
         final WorkReportEntity entity = workReportService.createWorkReport(storeId, staff.getId(), request.content(), request.reportImageUrl(), request.targetType());
+
+        if (request.targetType() == WorkReportTargetType.TO_BOSS) {
+            final Long bossUserId = staff.getStore().getBoss().getId();
+            notificationService.saveWorkReportNotificationToBoss(bossUserId, storeId, staff.getUser().getName());
+        }
+
         return WorkReportResponse.fromEntity(entity, staff);
     }
 

app/src/main/java/com/mangoboss/app/common/exception/CustomErrorInfo.java

@@ -68,6 +68,7 @@ public enum CustomErrorInfo {
     DOCUMENT_NOT_BELONG_TO_STAFF(403, "이 서류는 해당 알바생의 서류가 아닙니다.", 403006),
     FORBIDDEN_TASK_LOG_DELETE(403, "해당 업무 완료 기록을 삭제할 권한이 없습니다.", 403007),
     WORK_REPORT_ACCESS_DENIED(403, "보고사항 접근 권한이 없습니다.", 403008),
+    PLAN_LIMIT_EXCEEDED(403, "무료 요금제는 매장 2개, 알바생 5명 까지만 가능합니다.",403009),
 
     // 422 Unprocessable Entity
     CONTRACT_PDF_TAMPERED(422, "계약서 PDF의 무결성이 손상되었습니다.", 422001),

app/src/main/java/com/mangoboss/app/domain/repository/SubscriptionRepository.java

@@ -5,7 +5,7 @@
 import java.util.Optional;
 
 public interface SubscriptionRepository {
-    void save(SubscriptionEntity subscriptionEntity);
+    SubscriptionEntity save(SubscriptionEntity subscriptionEntity);
     Optional<SubscriptionEntity> findByBossId(Long bossId);
     void delete(SubscriptionEntity subscriptionEntity);
     boolean existsByBossId(Long bossId);

app/src/main/java/com/mangoboss/app/domain/service/notification/NotificationService.java

@@ -28,11 +28,15 @@ private void saveNotification(final Long userId, final Long storeId, final Strin
                                   final String content, final NotificationType type, final String path) {
         final String clickUrl = frontendUrl + path;
         final List<String> tokens = deviceTokenRepository.findActiveTokensByUserId(userId);
-        for (String token : tokens) {
-            final NotificationEntity notification = NotificationEntity.create(
-                    userId, storeId, title, content, null, clickUrl, type, token
-            );
+
+        if (tokens.isEmpty()) {
+            final NotificationEntity notification = NotificationEntity.create(userId, storeId, title, content, null, clickUrl, type, null);
             notificationRepository.save(notification);
+        } else {
+            for (String token : tokens) {
+                final NotificationEntity notification = NotificationEntity.create(userId, storeId, title, content, null, clickUrl, type, token);
+                notificationRepository.save(notification);
+            }
         }
     }
 
@@ -159,4 +163,17 @@ public void saveAttendanceEditRejectNotification(final AttendanceEditEntity atte
     public List<NotificationEntity> getNotificationsByUserAndStore(final Long userId, final Long storeId) {
         return notificationRepository.findByUserIdAndStoreIdOrderByCreatedAtDesc(userId, storeId);
     }
+
+    @Transactional
+    public void saveWorkReportNotificationToBoss(final Long bossUserId, final Long storeId, final String staffName) {
+        String content = String.format("%s님이 보고사항을 작성했어요.", staffName);
+        saveNotification(
+                bossUserId,
+                storeId,
+                "보고사항 작성",
+                content,
+                NotificationType.WORK_REPORT,
+                "/boss/task?type=report"
+        );
+    }
 }

app/src/main/java/com/mangoboss/app/domain/service/staff/StaffService.java

@@ -19,15 +19,23 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class StaffService {
+    private static final int PLAN_LIMIT_STAFF_NUM = 5;
     private final StaffRepository staffRepository;
 
     @Transactional
-    public StaffEntity createStaff(final UserEntity user, final StoreEntity store) {
+    public StaffEntity createStaff(final UserEntity user, final StoreEntity store, final UserEntity boss) {
         isAlreadyJoin(user, store);
+        if (boss.getSubscription() == null && getStaffsNum(store.getId()) >= PLAN_LIMIT_STAFF_NUM) {
+            throw new CustomException(CustomErrorInfo.PLAN_LIMIT_EXCEEDED);
+        }
         final StaffEntity staff = StaffEntity.create(user, store);
         return staffRepository.save(staff);
     }
 
+    private Integer getStaffsNum(final Long storeId) {
+        return getStaffsForStore(storeId).size();
+    }
+
     public StaffEntity validateStaffBelongsToStore(final Long storeId, final Long staffId) {
         return staffRepository.getByIdAndStoreId(staffId, storeId);
     }

app/src/main/java/com/mangoboss/app/domain/service/store/StoreService.java

@@ -23,6 +23,7 @@
 @Transactional
 public class StoreService {
     private static final String CHAR_POOL = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    private static final int PLAN_LIMIT_STORE_NUM = 2;
     private static final int INVITE_CODE_LENGTH = 6;
     private static final int QR_CODE_LENGTH = 12;
 
@@ -58,13 +59,20 @@ public StoreEntity getStoreById(final Long storeId) {
 
     @Transactional
     public StoreEntity createStore(final StoreCreateRequest request, final UserEntity boss) {
+        if (boss.getSubscription() == null && getStoresNum(boss.getId()) >= PLAN_LIMIT_STORE_NUM){
+            throw new CustomException(CustomErrorInfo.PLAN_LIMIT_EXCEEDED);
+        }
         validateBusinessNumber(request.businessNumber());
         final String inviteCode = generateInviteCode();
         final String attendanceQrCode = generateQrCode();
         final StoreEntity store = request.toEntity(boss, inviteCode, attendanceQrCode);
         return storeRepository.save(store);
     }
 
+    private Integer getStoresNum(final Long bossId) {
+        return storeRepository.findAllByBossId(bossId).size();
+    }
+
     private String generateInviteCode() {
         String code;
         do {