From 0ebb1e1a70ce0fdafdbd3e840eeab987aa16b94a Mon Sep 17 00:00:00 2001 From: gme_2 Date: Mon, 17 Sep 2018 17:56:48 +0900 Subject: [PATCH] removed unwanted codes --- GMERemittance/RestApiManager.swift | 196 ++++++++--------------------- 1 file changed, 49 insertions(+), 147 deletions(-) diff --git a/GMERemittance/RestApiManager.swift b/GMERemittance/RestApiManager.swift index 8146cf7f..a5eed3c6 100644 --- a/GMERemittance/RestApiManager.swift +++ b/GMERemittance/RestApiManager.swift @@ -876,9 +876,7 @@ class RestApiMananger { func performTransfer(parameters: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getTransferURL())!, @@ -918,9 +916,7 @@ class RestApiMananger { func getCDDListFor(cddCode: String, param: [String: String]?, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getCDDURL(code: cddCode))!, @@ -961,9 +957,7 @@ class RestApiMananger { func submitKYCInfo(param: [String: String], userId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + Alamofire.request( @@ -1004,9 +998,7 @@ class RestApiMananger { func submitDocument(param: [String: String], userId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getKycDocumentURL(userId: userId))!, @@ -1045,9 +1037,7 @@ class RestApiMananger { func submitUserImage(param: [String: String], userId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getUserProfileURL(userId: userId))!, @@ -1086,9 +1076,7 @@ class RestApiMananger { func getUserDetails(userId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getUserProfileURL(userId: userId))!, @@ -1130,9 +1118,7 @@ class RestApiMananger { func fetchUserInfoFromKyc(userId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getKYCURL(userId: userId))!, @@ -1169,9 +1155,7 @@ class RestApiMananger { func updateUserInfoForKyc(userId: String, parameter: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( @@ -1219,9 +1203,7 @@ class RestApiMananger { downloadTasks.forEach { $0.cancel() } } - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getPayoutsURL())!, @@ -1264,9 +1246,7 @@ class RestApiMananger { cancelExistingNetworkCalls() - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getRecipientListURL(userId: userId))!, @@ -1338,9 +1318,7 @@ class RestApiMananger { return } - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getTransactionListURL())!, @@ -1413,9 +1391,7 @@ class RestApiMananger { return } - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getTransactionListURL())!, @@ -1454,9 +1430,7 @@ class RestApiMananger { func submitMessage(supportIndex: Int, param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getMessageURL(supportIndex: supportIndex))!, @@ -1496,9 +1470,7 @@ class RestApiMananger { func withdrawBalance(requestDetails: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getWithdrawURL())!, @@ -1545,9 +1517,7 @@ class RestApiMananger { downloadTasks.forEach { $0.cancel() } } - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getBranchURL(bankId: bankId))!, @@ -1586,9 +1556,7 @@ class RestApiMananger { func changePassword(userId: String, currentPassword: String, newPassword: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getPasswordChangeURL(userId: userId))!, @@ -1634,9 +1602,7 @@ class RestApiMananger { urlString = UrlManager.sharedInstance.getWalletURL() } - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: urlString)!, @@ -1675,9 +1641,7 @@ class RestApiMananger { /// Create Invitee func createInvitee(param: [String: String], completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getNewInviteeURL())!, @@ -1717,9 +1681,7 @@ class RestApiMananger { /// GetInvitee func getInvitee(userId: String, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getInviteeURL(userId:userId))!, @@ -1758,9 +1720,7 @@ class RestApiMananger { func getcmRegistrationId(userId: String, cmRegistrationId: String, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getcmRegistrationIdURL(userId: userId))!, @@ -1800,9 +1760,7 @@ class RestApiMananger { func getNotification(userId: String, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getNotificationURL(userId: userId))!, @@ -1841,9 +1799,7 @@ class RestApiMananger { func getNotification(userId: String,page:Int,size:Int, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getNotificationURL(userId: userId))!, @@ -1883,9 +1839,7 @@ class RestApiMananger { func patchNotification(notificationId: String, viewed: String, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.patchNotificationURL(notificationId: notificationId))!, @@ -1928,9 +1882,7 @@ class RestApiMananger { func fetchCountryList(completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getCountryURL())!, @@ -1968,9 +1920,7 @@ class RestApiMananger { func getCountryInfo(countryId:String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getCountryURL())!, @@ -2009,9 +1959,7 @@ class RestApiMananger { func getCountryPayoutMode(countryId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getCountryPayoutModeURL())!, @@ -2048,9 +1996,7 @@ class RestApiMananger { } func fetchAgentLocation(countryId: String,completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getPayoutsURL())!, method: .get, @@ -2087,9 +2033,7 @@ class RestApiMananger { func getPayoutBankDetail(countryId: String, payoutMethodId: String, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getPayoutsURL())!, @@ -2127,9 +2071,7 @@ class RestApiMananger { func getPayoutBankBranchDetail(countryId: String, payoutId: String, completion: @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getPayoutsBranchURL(payoutId: payoutId))!, @@ -2173,9 +2115,7 @@ class RestApiMananger { //CREATE Social Feeds func createSocialFeed(param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getCRUDFeedURL())!, method: .post, parameters: param, @@ -2213,9 +2153,7 @@ class RestApiMananger { //READ Social Feeds func getSocialFeeds(param : [String: String], completion : @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string : (UrlManager.sharedInstance.getCRUDFeedURL()))!, @@ -2256,9 +2194,7 @@ class RestApiMananger { let url = UrlManager.sharedInstance.getCRUDFeedURL() + "/" + feedId - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: url)!, method: .put, @@ -2299,9 +2235,7 @@ class RestApiMananger { let url = UrlManager.sharedInstance.getCRUDFeedURL() + "/" + feedId - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: url)!, method: .delete, @@ -2341,9 +2275,7 @@ class RestApiMananger { let url = UrlManager.sharedInstance.getCRUDFeedURL() + "/" + feedId + "/reports?" - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: url)!, method: .post, @@ -2394,9 +2326,7 @@ class RestApiMananger { data = UIImageJPEGRepresentation(imageData as! UIImage, 0.25)! } - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.upload( multipartFormData: { multipartFormData in multipartFormData.append(data, withName: "file", fileName: fileName, mimeType: mimeType) @@ -2456,9 +2386,7 @@ class RestApiMananger { methodType = .post } - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getLikeDislikeFeedURL(feedId: feedId))!, method: methodType, @@ -2497,9 +2425,7 @@ class RestApiMananger { //LIKES for Social Feed func getAllLikesFor(feedId: String, completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getLikeDislikeFeedURL(feedId: feedId))!, method: .get, headers: getContentHeaderAfterLogin()) @@ -2536,9 +2462,7 @@ class RestApiMananger { //COMMENTS for Social Feed func getAllCommentsFor(feedId: String, param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getCommentFeedURL(feedId: feedId))!, method: .get, @@ -2576,9 +2500,7 @@ class RestApiMananger { //CREATE NEW COMMENT func createComment(feedId: String, param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getCreateCommentURL(feedId: feedId))!, method: .post, @@ -2617,9 +2539,7 @@ class RestApiMananger { //EDIT COMMENT func editComment(feedId: String, commentId: String, param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getEditDeleteCommentURL(feedId: feedId, commentId: commentId))!, method: .put, @@ -2658,9 +2578,7 @@ class RestApiMananger { //REMOVE COMMENT func deleteComment(feedId: String, commentId: String, param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getEditDeleteCommentURL(feedId: feedId, commentId: commentId))!, method: .delete, @@ -2698,9 +2616,7 @@ class RestApiMananger { //FETCH REWARDS func fetchRewards(completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getRewardsURL())!, method: .get, @@ -2736,9 +2652,7 @@ class RestApiMananger { //REDEEM REWARD func redeemReward(rewardId: String, param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request(URL(string: UrlManager.sharedInstance.getRedeemRewardURL(rewardId: rewardId))!, method: .post, @@ -2779,9 +2693,7 @@ class RestApiMananger { */ func getCurrencies(param: [String: String],completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getCurrencyURL())!, @@ -2823,9 +2735,7 @@ class RestApiMananger { */ func getExchangeRates(param: [String: Any], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getExchangeRateURL())!, @@ -2866,9 +2776,7 @@ class RestApiMananger { //USE THIS FUNCTION TO UPDATE USER PROFILE IMAGE AND CMREGISTRATION CODE func updateUserDetail(userId: String, param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getUserUpdateURL(userId: userId))!, @@ -2906,9 +2814,7 @@ class RestApiMananger { } func validateReferralCode(param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getReferralCodeValidationURL())!, @@ -2947,9 +2853,7 @@ class RestApiMananger { func rejectMoneyRequest(param: [String: String], completion: @escaping (ApiResult) -> Void) { - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string: UrlManager.sharedInstance.getRejectMoneyRequestURL())!, @@ -2990,9 +2894,7 @@ class RestApiMananger { func getParticularSocialFeed(feedId: String, param : [String: String], completion : @escaping (ApiResult) -> Void){ - let manager = Alamofire.SessionManager.default - manager.session.configuration.timeoutIntervalForRequest = 60 - manager.session.configuration.timeoutIntervalForResource = 60 + manager.request( URL(string : (UrlManager.sharedInstance.getParticularFeedURL(feedId: feedId)))!,