Merge pull request #207 from Kernel360/develop

배포
Kernel360 · Aug 29, 2024 · b5a1a9b · b5a1a9b
2 parents ff05e04 + f798969
commit b5a1a9b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -59,14 +59,14 @@ jobs:
           sudo docker pull ${{ secrets.DOCKERHUB_CONTAINERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:latest
           
           # Stop and remove the existing container if it exists
-          sudo docker ps -q -f name=speech2 | xargs -r sudo docker stop
+          sudo docker ps -q -f name=speechup-spring | xargs -r sudo docker stop
           sudo docker images --filter "dangling=true" -q | xargs sudo docker rmi
-          sudo docker ps -a -q -f name=speech2 | xargs -r sudo docker rm
+          sudo docker ps -a -q -f name=speechup-spring | xargs -r sudo docker rm
           
           # Run the new container with environment variables
           sudo docker run -d \
             -p 8080:8080 \
-            --name speech2 \
+            --name speechup-spring -v /root/logs/:/root/logs/ \
             ${{ secrets.DOCKERHUB_CONTAINERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:latest
 
           # Clean up old Docker images on the server

diff --git a/src/main/java/com/speech/up/admin/dto/StatisticsAdd.java b/src/main/java/com/speech/up/admin/dto/StatisticsAdd.java
@@ -11,15 +11,13 @@ public class StatisticsAdd {
 	@Builder
 	@ToString
 	public static class Request{
-		private final Long id;
 		private final Long report;
 		private final Long script;
 		private final Long record;
 		private final double score;
 		private final LocalDateTime createAt;
 
-		private Request(Long id, Long report, Long script, Long record, double score, LocalDateTime createAt) {
-			this.id = id;
+		private Request(Long report, Long script, Long record, double score, LocalDateTime createAt) {
 			this.report = report;
 			this.script = script;
 			this.record = record;

diff --git a/src/main/java/com/speech/up/admin/entity/StatisticsEntity.java b/src/main/java/com/speech/up/admin/entity/StatisticsEntity.java
@@ -36,7 +36,6 @@ public class StatisticsEntity {
 	private LocalDateTime createAt;
 
 	public StatisticsEntity(StatisticsAdd.Request statisticsAdd) {
-		this.id = statisticsAdd.getId();
 		this.report = statisticsAdd.getReport();
 		this.script = statisticsAdd.getScript();
 		this.record = statisticsAdd.getRecord();

diff --git a/src/main/java/com/speech/up/admin/service/StatisticsScheduling.java b/src/main/java/com/speech/up/admin/service/StatisticsScheduling.java
@@ -15,6 +15,7 @@
 import com.speech.up.report.repository.ReportRepository;
 import com.speech.up.script.repository.ScriptRepository;
 
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -27,7 +28,8 @@ public class StatisticsScheduling {
 	private final StatisticsRepository statisticsRepository;
 
 
-	@Scheduled(cron = "0 0 0 * * ?")  // 매일 자정에 실행
+	@Scheduled(cron = "0 0 1 * * *")
+	@Transactional
 	public void runStatisticsSetter() {
 		statisticsSetter();
 	}
@@ -45,8 +47,9 @@ void statisticsSetter(){
 			.score(getAvgScore())
 			.createAt(LocalDateTime.now())
 			.build();
+		StatisticsEntity statisticsEntity = StatisticsEntity.create(request);
 
-		statisticsRepository.save(StatisticsEntity.create(request));
+		statisticsRepository.save(statisticsEntity);
 	}
 
 	double getAvgScore(){