From 215e2ff4308cf2396d3c35e980fc944ba974178c Mon Sep 17 00:00:00 2001
From: HAJIHYUK <168079884+HAJIHYUK@users.noreply.github.com>
Date: Sat, 22 Mar 2025 14:22:42 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=82=A0=EC=A7=9C=EA=B0=92=20=EB=A1=9C?=
 =?UTF-8?q?=EC=9E=91=20=EC=9D=BC=EC=9A=94=EC=9D=BC=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/swyp/goal/service/GoalService.java  |  7 +------
 .../src/main/resources/application.properties    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Location-based-target-authentication/src/main/java/com/swyp/goal/service/GoalService.java b/Location-based-target-authentication/src/main/java/com/swyp/goal/service/GoalService.java
index 9f6317f..9b0eaed 100644
--- a/Location-based-target-authentication/src/main/java/com/swyp/goal/service/GoalService.java
+++ b/Location-based-target-authentication/src/main/java/com/swyp/goal/service/GoalService.java
@@ -379,14 +379,9 @@ public List<LocalDate> DateRangeCalculator(Long goalId) {
         LocalDate thisWeekStart = today.minusDays(today.getDayOfWeek().getValue());
 
         // startDate가 오늘 이후라면, startDate가 속한 주의 시작일을 기준으로 설정
-        // 단, startDate가 일요일인 경우는 startDate 그대로 사용
         LocalDate baseWeekStart;
         if (startDate.isAfter(today)) {
-            if (startDate.getDayOfWeek() == java.time.DayOfWeek.SUNDAY) {
-                baseWeekStart = startDate; // startDate가 일요일인 경우, 그대로 사용
-            } else {
-                baseWeekStart = startDate.minusDays(startDate.getDayOfWeek().getValue());
-            }
+            baseWeekStart = startDate.minusDays(startDate.getDayOfWeek().getValue());
         } else {
             baseWeekStart = thisWeekStart; // startDate가 오늘 이전이거나 오늘 포함인 경우
         }
diff --git a/Location-based-target-authentication/src/main/resources/application.properties b/Location-based-target-authentication/src/main/resources/application.properties
index b4f1c2c..c91b764 100644
--- a/Location-based-target-authentication/src/main/resources/application.properties
+++ b/Location-based-target-authentication/src/main/resources/application.properties
@@ -4,7 +4,7 @@ spring.application.name=Location-based-target-authentication
 spring.main.allow-bean-definition-overriding=true
 
 # Profile
-spring.profiles.active=secret
+spring.profiles.active=local
 spring.config.import=classpath:application-secret.properties
 logging.level.com.swyp.location=INFO
 logging.level.org.springframework.web.reactive.function.client=INFO
@@ -16,13 +16,13 @@ server.http.port=8080
 server.address=0.0.0.0
 server.servlet.context-path=/
 
-# SSL Configuration
-server.ssl.enabled=true
-server.ssl.key-store=/etc/ssl/willgo/keystore.p12
-server.ssl.key-store-password=willgo86
-server.ssl.key-store-type=PKCS12
-server.ssl.key-alias=tomcat
-security.require-ssl=true
+# # SSL Configuration
+# server.ssl.enabled=true
+# server.ssl.key-store=/etc/ssl/willgo/keystore.p12
+# server.ssl.key-store-password=willgo86
+# server.ssl.key-store-type=PKCS12
+# server.ssl.key-alias=tomcat
+# security.require-ssl=true
 
 
 # Database Configuration

From c3c2ee9dc84312bb48cd6e8cd8e023e08751b990 Mon Sep 17 00:00:00 2001
From: HAJIHYUK <168079884+HAJIHYUK@users.noreply.github.com>
Date: Sat, 22 Mar 2025 14:23:49 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=A0=84=EC=B2=B4=EB=AA=A9=ED=91=9C?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=9D=B8=EC=A6=9D=EA=B0=92=20=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=20=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Location-based-target-authentication/src/main/resources/application.properties b/Location-based-target-authentication/src/main/resources/application.properties
index c91b764..b4f1c2c 100644
--- a/Location-based-target-authentication/src/main/resources/application.properties
+++ b/Location-based-target-authentication/src/main/resources/application.properties
@@ -4,7 +4,7 @@ spring.application.name=Location-based-target-authentication
 spring.main.allow-bean-definition-overriding=true
 
 # Profile
-spring.profiles.active=local
+spring.profiles.active=secret
 spring.config.import=classpath:application-secret.properties
 logging.level.com.swyp.location=INFO
 logging.level.org.springframework.web.reactive.function.client=INFO
@@ -16,13 +16,13 @@ server.http.port=8080
 server.address=0.0.0.0
 server.servlet.context-path=/
 
-# # SSL Configuration
-# server.ssl.enabled=true
-# server.ssl.key-store=/etc/ssl/willgo/keystore.p12
-# server.ssl.key-store-password=willgo86
-# server.ssl.key-store-type=PKCS12
-# server.ssl.key-alias=tomcat
-# security.require-ssl=true
+# SSL Configuration
+server.ssl.enabled=true
+server.ssl.key-store=/etc/ssl/willgo/keystore.p12
+server.ssl.key-store-password=willgo86
+server.ssl.key-store-type=PKCS12
+server.ssl.key-alias=tomcat
+security.require-ssl=true
 
 
 # Database Configuration