From 1c567b5020bbd110ea257842883faac5d33f0bef Mon Sep 17 00:00:00 2001
From: gme_2 <gme_2@gme-2s-iMac.local>
Date: Wed, 17 Oct 2018 18:12:42 +0900
Subject: [PATCH] device info sent in dasboard

---
 .../Interactor/HomeInteractor.swift           | 18 ++++++-
 .../Interactor/RegisterInteractor.swift       | 54 +++++--------------
 GMERemittance/Utility/AppConstants.swift      | 31 +++++++++++
 3 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/GMERemittance/Module/Home/Application Logic/Interactor/HomeInteractor.swift b/GMERemittance/Module/Home/Application Logic/Interactor/HomeInteractor.swift
index e56b24ad..9faf742e 100644
--- a/GMERemittance/Module/Home/Application Logic/Interactor/HomeInteractor.swift	
+++ b/GMERemittance/Module/Home/Application Logic/Interactor/HomeInteractor.swift	
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import FirebaseInstanceID
 
 class HomeInteractor {
     
@@ -20,8 +21,14 @@ class HomeInteractor {
     init(service: HomeServiceType) {
         self.service = service
     }
+    
 
     // MARK: Converting entities
+    
+    private func getFcmToken() -> String? {
+        let token = InstanceID.instanceID().token()
+        return token
+    }
 }
 
 // MARK: Home interactor input interface
@@ -29,7 +36,16 @@ class HomeInteractor {
 extension HomeInteractor: HomeInteractorInput {
     func fetchUserInfo() {
         let userId = Utility.getMyUserName()
-        let param = ["userId" : userId]
+        var param = ["userId" : userId]
+        
+       
+        param["uuid"] = Utility.getUUid() ?? ""
+        param["appVersion"] = Utility.getAppVersion()
+        param["phoneBrand"] = Utility.getPhoneBrand()
+        param["phoneOs"] = Utility.getPhoneOs()
+        param["fcmId"] = self.getFcmToken()
+        param["osVersion"] =  Utility.getOsVersion()
+        
         self.service.fetchUserInfo(param: param, success: { user in
             self.output?.show(model: user)
             
diff --git a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift
index cbc757be..e3c2a973 100644
--- a/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift	
+++ b/GMERemittance/Module/Register/Application Logic/Interactor/RegisterInteractor.swift	
@@ -21,43 +21,7 @@ class RegisterInteractor {
     init(service: RegisterServiceType) {
         self.service = service
     }
-    
-    private func getAppVersion () -> String? {
-        let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
-        return version
-    }
 
-    private func getOsVersion() -> String {
-        let version = UIDevice.current.systemVersion
-        return version
-    }
-    
-    private func getPhoneBrand() -> String {
-        let phoneName = UIDevice.current.model
-        return phoneName
-    }
-    
-    private func getPhoneOs() -> String {
-        let os = UIDevice.current.systemName
-        return os
-    }
-    
-    private func getUUid() -> String? {
-        let uuid =  UIDevice.current.identifierForVendor?.uuidString
-        return uuid
-    }
-    
-    private func getFcmToken() -> String? {
-        let token = InstanceID.instanceID().token()
-        return token
-    }
-    
-    private func getCliendId() -> String {
-        return "172017F9EC11222E8107142733"
-    }
-    
-
-    
     private func isValidPasword(password: String, confirmPassword: String) -> (isValid: Bool, error: String) {
         var error = ""
         var isValid = true
@@ -152,6 +116,11 @@ class RegisterInteractor {
     }
     
     
+    private func getFcmToken() -> String? {
+        let token = InstanceID.instanceID().token()
+        return token
+    }
+    
 
 }
 
@@ -163,13 +132,14 @@ extension RegisterInteractor: RegisterInteractorInput {
             self.output?.show(error: validationResult.error)
             return
         }
-        model.uuid = self.getUUid()
-        model.appVersion = self.getAppVersion()
-        model.phoneBrand = self.getPhoneBrand()
-        model.phoneOs = self.getPhoneOs()
-        model.osVersion = self.getOsVersion()
+        
+        model.uuid = Utility.getUUid()
+        model.appVersion = Utility.getAppVersion()
+        model.phoneBrand = Utility.getPhoneBrand()
+        model.phoneOs = Utility.getPhoneOs()
+        model.osVersion = Utility.getOsVersion()
         model.fcmId = self.getFcmToken()
-        model.clientId = self.getCliendId()
+        model.clientId = Utility.getCliendId()
         
         self.service.register(params: model.serialize(), success: { (message) in
             self.output?.success(message: message ?? "")
diff --git a/GMERemittance/Utility/AppConstants.swift b/GMERemittance/Utility/AppConstants.swift
index c88ecde1..98ffd8e5 100644
--- a/GMERemittance/Utility/AppConstants.swift
+++ b/GMERemittance/Utility/AppConstants.swift
@@ -131,4 +131,35 @@ class Utility {
          save(value: user?.yearlyLimit, forKey: UserKeys.yearlyLimit)
         save(value: user?.dateOfBirth, forKey: UserKeys.dateOfBirth)
     }
+    
+    
+    
+    static func getAppVersion () -> String? {
+        let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
+        return version
+    }
+    
+    static func getOsVersion() -> String {
+        let version = UIDevice.current.systemVersion
+        return version
+    }
+    
+    static func getPhoneBrand() -> String {
+        let phoneName = UIDevice.current.model
+        return phoneName
+    }
+    
+    static func getPhoneOs() -> String {
+        let os = UIDevice.current.systemName
+        return os
+    }
+    
+    static func getUUid() -> String? {
+        let uuid =  UIDevice.current.identifierForVendor?.uuidString
+        return uuid
+    }
+    
+    static func getCliendId() -> String {
+        return "172017F9EC11222E8107142733"
+    }
 }