Merge pull request #269 from Modagbul/develop

[MNG-11, MNG-19]

Author: minsu20

.github/workflows/CD-dev.yml

@@ -40,7 +40,6 @@ jobs:
 
       # 설정 파일 생성
       - run: |
-          mkdir ./src/main/resources
           cd ./src/main/resources
           touch ./application.yml 
           echo "${{env.APPLICATION}}" > ./application.yml

.github/workflows/CD-prod.yml

@@ -40,7 +40,6 @@ jobs:
 
       # 설정 파일 생성
       - run: |
-          mkdir ./src/main/resources
           cd ./src/main/resources
           touch ./application.yml 
           echo "${{env.APPLICATION}}" > ./application.yml

.github/workflows/CI-dev.yml

@@ -41,7 +41,6 @@ jobs:
 
       # 설정 파일 생성
       - run: |
-          mkdir ./src/main/resources
           cd ./src/main/resources
           touch ./application.yml 
           echo "${{env.APPLICATION}}" > ./application.yml

.github/workflows/CI-prod.yml

@@ -41,7 +41,6 @@ jobs:
 
       # 설정 파일 생성
       - run: |
-          mkdir ./src/main/resources
           cd ./src/main/resources
           touch ./application.yml 
           echo "${{env.APPLICATION}}" > ./application.yml

build.gradle

@@ -99,7 +99,7 @@ dependencies {
 
 	//log
 	implementation 'org.springframework.boot:spring-boot-starter-logging'
-
+	implementation 'org.springframework.boot:spring-boot-starter-aop'
 	implementation("org.springframework.boot:spring-boot-starter-actuator")
 	implementation("io.micrometer:micrometer-registry-prometheus") // 프로메테우스 마이크로미터
 

src/main/java/com/moing/backend/domain/fire/domain/repository/FireCustomRepository.java

@@ -2,9 +2,6 @@
 
 
 import com.moing.backend.domain.fire.application.dto.res.FireReceiveRes;
-import com.moing.backend.domain.fire.domain.entity.Fire;
-import com.moing.backend.domain.member.domain.entity.Member;
-import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 import java.util.Optional;
@@ -13,5 +10,6 @@ public interface FireCustomRepository {
 
     boolean hasFireCreatedWithinOneHour(Long throwMemberId, Long receiveMemberId);
     Optional<List<FireReceiveRes>> getFireReceivers(Long teamId, Long missionId, Long memberId);
-
-    }
+    Long getTodayFires();
+    Long getYesterdayFires();
+}

src/main/java/com/moing/backend/domain/fire/domain/repository/FireCustomRepositoryImpl.java

@@ -12,6 +12,7 @@
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.temporal.TemporalAdjusters;
 import java.util.List;
 import java.util.Optional;
@@ -74,6 +75,36 @@ public Optional<List<FireReceiveRes>> getFireReceivers(Long teamId, Long mission
 
     }
 
+    @Override
+    public Long getTodayFires() {
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+        LocalDateTime startOfToday = now.toLocalDate().atStartOfDay();
+        LocalDateTime endOfToday = startOfToday.plusDays(1);
+        LocalDateTime startOfYesterday = startOfToday.minusDays(1);
+
+        long todayFires = queryFactory
+                .selectFrom(fire)
+                .where(fire.createdDate.between(startOfToday, endOfToday))
+                .fetchCount();
+
+        return todayFires;
+    }
+
+    @Override
+    public Long getYesterdayFires(){
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+        LocalDateTime startOfToday = now.toLocalDate().atStartOfDay();
+        LocalDateTime endOfToday = startOfToday.plusDays(1);
+        LocalDateTime startOfYesterday = startOfToday.minusDays(1);
+
+        long yesterdayFires = queryFactory
+                .selectFrom(fire)
+                .where(fire.createdDate.between(startOfYesterday, startOfToday))
+                .fetchCount();
+
+        return yesterdayFires;
+    }
+
 
     private BooleanExpression createRepeatTypeConditionByArchive() {
         LocalDate now = LocalDate.now();
@@ -84,6 +115,7 @@ private BooleanExpression createRepeatTypeConditionByArchive() {
         return missionArchive.createdDate.goe(startOfWeek.atStartOfDay())
                 .and(missionArchive.createdDate.loe(endOfWeek.atStartOfDay().plusDays(1).minusNanos(1)));
     }
+
     private BooleanExpression hasAlreadyVerifiedToday() {
         LocalDateTime today = LocalDateTime.now();
         LocalDateTime startOfToday = today.withHour(0).withMinute(0).withSecond(0).withNano(0);

src/main/java/com/moing/backend/domain/fire/domain/service/FireQueryService.java

@@ -1,12 +1,8 @@
 package com.moing.backend.domain.fire.domain.service;
 
 import com.moing.backend.domain.fire.application.dto.res.FireReceiveRes;
-import com.moing.backend.domain.fire.domain.entity.Fire;
-import com.moing.backend.domain.fire.domain.repository.FireCustomRepository;
 import com.moing.backend.domain.fire.domain.repository.FireRepository;
-import com.moing.backend.domain.fire.exception.NotFoundFireException;
 import com.moing.backend.domain.fire.exception.NotFoundFireReceiversException;
-import com.moing.backend.domain.member.domain.entity.Member;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -26,4 +22,10 @@ public List<FireReceiveRes> getNotYetMissionMember(Long teamId, Long missionId,
         return fireRepository.getFireReceivers(teamId, missionId,memberId).orElseThrow(NotFoundFireReceiversException::new);
     }
 
+    public Long getTodayFires(){
+        return fireRepository.getTodayFires();
+    }
+    public Long getYesterdayFires(){
+        return fireRepository.getYesterdayFires();
+    }
 }

src/main/java/com/moing/backend/domain/member/domain/repository/MemberCustomRepository.java

@@ -1,7 +1,6 @@
 package com.moing.backend.domain.member.domain.repository;
 
 import com.moing.backend.domain.member.domain.entity.Member;
-import com.moing.backend.domain.statistics.application.dto.DailyStats;
 
 import java.util.List;
 import java.util.Optional;
@@ -12,7 +11,7 @@ public interface MemberCustomRepository {
     Optional<Member> findNotDeletedBySocialId(String socialId);
     Optional<Member> findNotDeletedByEmail(String email);
     Optional<Member> findNotDeletedByMemberId(Long id);
-    DailyStats getDailyStats();
-
+    Long getTodayNewMembers();
+    Long getYesterdayNewMembers();
     Optional<List<Member>> findAllMemberOnPushAlarm();
 }

src/main/java/com/moing/backend/domain/member/domain/repository/MemberCustomRepositoryImpl.java

@@ -1,8 +1,6 @@
 package com.moing.backend.domain.member.domain.repository;
 
 import com.moing.backend.domain.member.domain.entity.Member;
-import com.moing.backend.domain.mission.domain.entity.constant.MissionType;
-import com.moing.backend.domain.statistics.application.dto.DailyStats;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 
 import javax.persistence.EntityManager;
@@ -12,8 +10,6 @@
 import java.util.Optional;
 
 import static com.moing.backend.domain.member.domain.entity.QMember.member;
-import static com.moing.backend.domain.mission.domain.entity.QMission.mission;
-import static com.moing.backend.domain.team.domain.entity.QTeam.team;
 
 public class MemberCustomRepositoryImpl implements MemberCustomRepository {
 
@@ -61,7 +57,7 @@ public Optional<Member> findNotDeletedByMemberId(Long id) {
     }
 
     @Override
-    public DailyStats getDailyStats() {
+    public Long getTodayNewMembers() {
         LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
         LocalDateTime startOfToday = now.toLocalDate().atStartOfDay();
         LocalDateTime endOfToday = startOfToday.plusDays(1);
@@ -72,58 +68,23 @@ public DailyStats getDailyStats() {
                 .where(member.createdDate.between(startOfToday, endOfToday))
                 .fetchCount();
 
-        long yesterdayNewMembers = queryFactory
-                .selectFrom(member)
-                .where(member.createdDate.between(startOfYesterday, startOfToday))
-                .fetchCount();
-
-        long todayNewTeams = queryFactory
-                .selectFrom(team)
-                .where(team.createdDate.between(startOfToday, endOfToday))
-                .fetchCount();
-
-        long yesterdayNewTeams = queryFactory
-                .selectFrom(team)
-                .where(team.createdDate.between(startOfYesterday, startOfToday))
-                .fetchCount();
-
-        long todayRepeatMissions = queryFactory
-                .select(mission)
-                .from(mission)
-                .where(mission.createdDate.between(startOfToday, endOfToday)
-                        .and(mission.type.eq(MissionType.REPEAT)))
-                .fetchCount();
+        return todayNewMembers;
+    }
 
-        long yesterdayRepeatMissions = queryFactory
-                .select(mission)
-                .from(mission)
-                .where(mission.createdDate.between(startOfYesterday, startOfToday)
-                        .and(mission.type.eq(MissionType.REPEAT)))
-                .fetchCount();
+    @Override
+    public Long getYesterdayNewMembers() {
+        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
+        LocalDateTime startOfToday = now.toLocalDate().atStartOfDay();
+        LocalDateTime endOfToday = startOfToday.plusDays(1);
+        LocalDateTime startOfYesterday = startOfToday.minusDays(1);
 
-        long todayOnceMissions = queryFactory
-                .select(mission)
-                .from(mission)
-                .where(mission.createdDate.between(startOfToday, endOfToday)
-                        .and(mission.type.eq(MissionType.ONCE)))
-                .fetchCount();
 
-        long yesterdayOnceMissions = queryFactory
-                .select(mission)
-                .from(mission)
-                .where(mission.createdDate.between(startOfYesterday, startOfToday)
-                        .and(mission.type.eq(MissionType.ONCE)))
+        long yesterdayNewMembers = queryFactory
+                .selectFrom(member)
+                .where(member.createdDate.between(startOfYesterday, startOfToday))
                 .fetchCount();
 
-        return new DailyStats(
-                todayNewMembers,
-                yesterdayNewMembers,
-                todayNewTeams,
-                yesterdayNewTeams,
-                todayRepeatMissions,
-                yesterdayRepeatMissions,
-                todayOnceMissions,
-                yesterdayOnceMissions);
+        return yesterdayNewMembers;
     }
 
     @Override

src/main/java/com/moing/backend/domain/member/domain/service/MemberGetService.java

@@ -4,12 +4,10 @@
 import com.moing.backend.domain.member.domain.repository.MemberRepository;
 import com.moing.backend.domain.member.exception.NotFoundBySocialIdException;
 import com.moing.backend.domain.member.exception.NotFoundRemindAlarmException;
-import com.moing.backend.domain.statistics.application.dto.DailyStats;
 import com.moing.backend.global.annotation.DomainService;
 import lombok.RequiredArgsConstructor;
 
 import javax.transaction.Transactional;
-import java.math.BigInteger;
 import java.util.List;
 
 @DomainService
@@ -26,10 +24,15 @@ public Member getMemberByMemberId(Long memberId) {
         return memberRepository.findNotDeletedByMemberId(memberId).orElseThrow(()->new NotFoundBySocialIdException());
     }
 
-    public DailyStats getDailyStats(){
-        return memberRepository.getDailyStats();
+    public Long getTodayNewMembers(){
+        return memberRepository.getTodayNewMembers();
     }
 
+    public Long getYesterdayNewMembers(){
+        return memberRepository.getYesterdayNewMembers();
+    }
+
+
     public List<Member> getAllMemberOfPushAlarm() {
         return memberRepository.findAllMemberOnPushAlarm().orElseThrow(NotFoundRemindAlarmException::new);
     }

src/main/java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepository.java

@@ -17,7 +17,7 @@ public interface MissionCustomRepository {
 
     Optional<List<GatherSingleMissionRes>> findSingleMissionByMemberId(Long memberId, List<Long> teams);
 
-    Optional<List<GatherRepeatMissionRes>> findRepeatMissionByMemberId(Long memberId, List<Long>teams);
+    Optional<List<GatherRepeatMissionRes>> findRepeatMissionByMemberId(Long memberId, List<Long> teams);
 
     Optional<List<Mission>> findMissionByDueTo();
 
@@ -27,10 +27,15 @@ public interface MissionCustomRepository {
 
     Optional<List<Member>> findRepeatMissionPeopleByStatus(MissionStatus missionStatus);
 
-
-        boolean findRepeatMissionsByTeamId(Long teamId);
+    boolean findRepeatMissionsByTeamId(Long teamId);
 
     Optional<MissionReadRes> findByIds(Long memberId, Long missionId);
 
+    Long getTodayOnceMissions();
+
+    Long getYesterdayOnceMissions();
+
+    Long getTodayRepeatMissions();
 
-    }
+    Long getYesterdayRepeatMissions();
+}