Merge pull request #43 from Likelion12/42-be-develop-오류-해결

Fix : develop 오류 해결
Likelion12 · Aug 1, 2024 · 4aa8304 · 4aa8304
2 parents a53933e + 8baa032
commit 4aa8304
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -2,7 +2,7 @@ name: Java CI/CD with Gradle
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "develop" , "42-be-develop-오류-해결" ]
   pull_request:
     branches: [ "develop"]
     types: [ closed ]

diff --git a/src/main/java/com/example/likelion12/dto/Socialring.java b/src/main/java/com/example/likelion12/dto/Socialring.java
@@ -3,13 +3,15 @@
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.time.LocalDate;
+
 @Getter
 @AllArgsConstructor
 public class Socialring {
     private Long socialring_id;
     private String socialring_name;
     private String socialring_img;
-    private String socialring_date;
+    private LocalDate socialring_date;
     private String active_area_name;
     private Integer total_recruits;
     private Integer socialring_cost;

diff --git a/src/main/java/com/example/likelion12/service/HomeService.java b/src/main/java/com/example/likelion12/service/HomeService.java
@@ -42,7 +42,7 @@ public HomeResponse getHomeData(Long memberId) {
                         socialring.getSocialringId(),
                         socialring.getSocialringName(),
                         socialring.getSocialringImg(),
-                        formatDate(socialring.getSocialringDate()),
+                        socialring.getSocialringDate(),
                         socialring.getActivityRegion().getActivityRegionName(),
                         socialring.getTotalRecruits(),
                         socialring.getSocialringCost(),

diff --git a/src/main/java/com/example/likelion12/service/LoginService.java b/src/main/java/com/example/likelion12/service/LoginService.java
@@ -4,7 +4,7 @@
 import com.example.likelion12.domain.base.BaseStatus;
 import com.example.likelion12.dto.LoginResponse;
 import com.example.likelion12.repository.MemberRepository;
-import com.example.likelion12.util.JwtProvider;
+import com.example.likelion12.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.json.JSONObject;