From 6ab5bc4acd5f881e6a06a928a121a1310d776501 Mon Sep 17 00:00:00 2001
From: InKwon James Kim <devikkim@gmail.com>
Date: Fri, 12 Jul 2019 10:22:59 +0900
Subject: [PATCH] rechange calculate d-day

---
 GMERemittance/Utility/AppConstants.swift | 14 ++++++++++++--
 GMERemittanceTests/FunctionTest.swift    |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/GMERemittance/Utility/AppConstants.swift b/GMERemittance/Utility/AppConstants.swift
index bdfab3f3..fda64767 100644
--- a/GMERemittance/Utility/AppConstants.swift
+++ b/GMERemittance/Utility/AppConstants.swift
@@ -429,9 +429,19 @@ class Utility {
     
     let now = Date()
     
-    let interval = expireDate.timeIntervalSince(now)
+//    let interval = expireDate.timeIntervalSince(now)
+//    return "\(Int(interval / 86400))"
+    let calendar = Calendar.current
     
-    return "\(Int(interval / 86400))"
+    // Replace the hour (time) of both dates with 00:00
+    let date1 = calendar.startOfDay(for: now)
+    let date2 = calendar.startOfDay(for: expireDate)
+    
+    guard let remindDay = calendar.dateComponents([.day], from: date1, to: date2).day else {
+      return nil
+    }
+    
+    return "\(remindDay)"
   }
   
   static func numberWithoutprecedingZero(str: String) -> String {
diff --git a/GMERemittanceTests/FunctionTest.swift b/GMERemittanceTests/FunctionTest.swift
index 47f85b41..e21a0f64 100644
--- a/GMERemittanceTests/FunctionTest.swift
+++ b/GMERemittanceTests/FunctionTest.swift
@@ -11,13 +11,13 @@ import XCTest
 
 class FunctionTest: XCTestCase {
   func testExpireDate() {
-    guard let remindDay = Utility.calculateDDay(registDate: "7/10/2019 4:19:37 PM")
+    guard let remindDay = Utility.calculateDDay(registDate: "7/10/2018 4:19:37 PM")
       else {
         XCTAssert(false)
         return
     }
-    XCTAssert(remindDay == "365")
-    
+    print("remindDay: \(remindDay)")
+    XCTAssert(true)
   }
   
   func testDateFormat() {