Merge pull request #147 from Hanaro-trip-together-bank/feature/dues_paid

refactor:fcm fix
Hanaro-trip-together-bank · Jun 7, 2024 · 7c74cd0 · 7c74cd0
2 parents 8c93879 + 0db5c01
commit 7c74cd0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/com/hanaro/triptogether/TriptogetherApplication.java b/src/main/java/com/hanaro/triptogether/TriptogetherApplication.java
@@ -10,9 +10,9 @@
 import java.util.TimeZone;
 
 @SpringBootApplication
-//@EnableScheduling
+@EnableScheduling
 @EnableJpaAuditing
-//@EnableBatchProcessing
+@EnableBatchProcessing
 public class TriptogetherApplication {
 
 	@PostConstruct

diff --git a/src/main/java/com/hanaro/triptogether/common/firebase/FirebaseConfig.java b/src/main/java/com/hanaro/triptogether/common/firebase/FirebaseConfig.java
@@ -4,6 +4,7 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.FirebaseOptions;
 import com.google.firebase.messaging.FirebaseMessaging;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonReader;
 import org.springframework.context.annotation.Bean;
@@ -25,8 +26,15 @@ public FirebaseApp firebaseApp() throws IOException {
         jsonReader.setLenient(true);
 
         // JsonParser를 사용하여 JSON 데이터를 파싱
-        var jsonElement = JsonParser.parseReader(jsonReader);
-        String jsonString = jsonElement.toString();
+//        var jsonElement = JsonParser.parseReader(jsonReader);
+//        String jsonString = jsonElement.toString();
+
+        // JsonParser를 사용하여 JSON 데이터를 파싱
+        JsonObject jsonObject = JsonParser.parseReader(jsonReader).getAsJsonObject();
+
+        // JSON 데이터를 문자열로 변환
+        String jsonString = jsonObject.toString();
+
 
         // 파싱된 JSON 데이터를 다시 InputStream으로 변환
         InputStream jsonInputStream = new ByteArrayInputStream(jsonString.getBytes(StandardCharsets.UTF_8));

diff --git a/src/main/java/com/hanaro/triptogether/exchangeRate/domain/entity/ExchangeRate.java b/src/main/java/com/hanaro/triptogether/exchangeRate/domain/entity/ExchangeRate.java
@@ -27,7 +27,7 @@ public class ExchangeRate {
     @Column(nullable = false, length = 10)
     private String curName;
 
-    @Column(nullable = false, length = 10)
+    @Column( length = 10)
     private String curIcon;
 
     @Column(nullable = false, precision = 20, scale = 2)