feat: 반려동물 삭제 api 연동

fit-a-pet-client/fit-a-pet-client/API/AuthorizationAlamofire.swift

@@ -199,6 +199,20 @@ class AuthorizationAlamofire: TokenHandling {
             }
     }
 
+    func petDelete(_ petId: Int, completion: @escaping (Result<Data?, Error>) -> Void) {
+        os_log("AuthorizationAlamofire - petDelete() called", log: .default, type: .info)
+
+        self.session.request(PetRouter.petDelete(petId: petId))
+            .response { response in
+                switch response.result {
+                case .success(let data):
+                    completion(.success(data))
+                case .failure(let error):
+                    completion(.failure(error))
+                }
+            }
+    }
+
 
     //MARK: UserInfoRouter
 

fit-a-pet-client/fit-a-pet-client/API/Router/PetRouter.swift

@@ -9,6 +9,7 @@ enum PetRouter: URLRequestConvertible {
     case userPetsList, userPetInfoList
     case petTotalInfoCheck(petId: Int)
     case petInfoEdit(petId: Int, combinedData: [String:Any])
+    case petDelete(petId: Int)
 
     //pet care
     case createCare(combinedData: [String:Any], petId: Int)
@@ -25,6 +26,8 @@ enum PetRouter: URLRequestConvertible {
             return .get
         case .petInfoEdit:
             return .put
+        case .petDelete:
+            return .delete
         }
     }
     var baseURL: URL {
@@ -39,7 +42,7 @@ enum PetRouter: URLRequestConvertible {
             return "v2/users/\(UserDefaults.standard.string(forKey: "id")!)/pets/categories-check"
         case .registPet, .userPetCareInfoList, .createCare, .checkCareCategory, .petCareComplete, .userPetInfoList:
             return "v2/pets"
-        case .petTotalInfoCheck(let petId), .petInfoEdit(let petId, _):
+        case .petTotalInfoCheck(let petId), .petInfoEdit(let petId, _), .petDelete(let petId):
             return "v2/pets/\(petId)"
         }
     }
@@ -50,7 +53,7 @@ enum PetRouter: URLRequestConvertible {
             return ["petName": petName, "species": species, "gender": gender, "neutralization": neutralization, "birthdate": birthdate]
         case let .careCategoryCheck(categoryName, pets):
             return ["categoryName": categoryName, "pets": pets]
-        case .checkCareCategory, .userPetsList, .createCare, .userPetInfoList, .userPetCareInfoList, .petCareComplete, .petTotalInfoCheck, .petInfoEdit:
+        case .checkCareCategory, .userPetsList, .createCare, .userPetInfoList, .userPetCareInfoList, .petCareComplete, .petTotalInfoCheck, .petInfoEdit, .petDelete:
             return [:]
         }
     }
@@ -66,7 +69,7 @@ enum PetRouter: URLRequestConvertible {
             request.httpMethod = method.rawValue
             request = try JSONEncoding.default.encode(request, withJSONObject: combinedData)
 
-        case .userPetsList, .userPetInfoList, .petTotalInfoCheck(_):
+        case .userPetsList, .userPetInfoList, .petTotalInfoCheck(_), .petDelete(_):
             request = URLRequest(url: url)
             request.httpMethod = method.rawValue
 
@@ -90,6 +93,7 @@ enum PetRouter: URLRequestConvertible {
             request.httpMethod = method.rawValue
             request = try JSONEncoding.default.encode(request, withJSONObject: combinedData)
 
+
         default:
             request = URLRequest.createURLRequestWithBody(url: url, method: method, parameters: parameters)
         }

fit-a-pet-client/fit-a-pet-client/AppDelegate.swift

@@ -115,32 +115,33 @@ extension AppDelegate: MessagingDelegate {
         print("APNs fcm Token: \(String(describing: fcmToken!))")
        // sendDeviceTokenWithAPI(fcmToken: fcmToken ?? "")
 
-//        AuthorizationAlamofire.shared.registDeviceToken(String(describing: fcmToken!), device.systemVersion, modelName) {result in
-//            switch result {
-//            case .success(let data):
-//                if let responseData = data,
-//                   let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] {
-//                    print("response jsonData: \(jsonObject)")
-//                    
-//                }
-//                
-//            case .failure(let error):
-//                print("Error: \(error)")
-//            }
-//        }
-//        
-//        AuthorizationAlamofire.shared.pushNotificationAPI{result in
-//            switch result {
-//            case .success(let data):
-//                if let responseData = data,
-//                   let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] {
-//                    print("response jsonData: \(jsonObject)")
-//                }
-//                
-//            case .failure(let error):
-//                print("Error: \(error)")
-//            }
-//        }
+        AuthorizationAlamofire.shared.registDeviceToken(String(describing: fcmToken!), device.systemVersion, modelName) {result in
+            switch result {
+            case .success(let data):
+                if let responseData = data,
+                   let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] {
+                    print("response jsonData: \(jsonObject)")
+
+                    AuthorizationAlamofire.shared.pushNotificationAPI{result in
+                        switch result {
+                        case .success(let data):
+                            if let responseData = data,
+                               let jsonObject = try? JSONSerialization.jsonObject(with: responseData, options: []) as? [String: Any] {
+                                print("response jsonData: \(jsonObject)")
+                            }
+
+                        case .failure(let error):
+                            print("Error: \(error)")
+                        }
+                    }
+                }
+
+            case .failure(let error):
+                print("Error: \(error)")
+            }
+        }
+
+
 
     }
 }

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/apple_icon.imageset/Contents.json → fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/icon_oauth_apple.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "apple_icon.png",
+      "filename" : "icon_oauth_apple.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/naver_icon.imageset/Contents.json → fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/icon_oauth_google.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "naver_icon.png",
+      "filename" : "icon_oauth_google.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/kakao_icon.imageset/Contents.json → fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/icon_oauth_kakao.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "kakao_icon.png",
+      "filename" : "icon_oauth_kakao.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },

fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/google_icon.imageset/Contents.json → fit-a-pet-client/fit-a-pet-client/Assets.xcassets/OauthIcon/icon_oauth_naver.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "google_icon.png",
+      "filename" : "icon_oauth_naver.svg",
       "idiom" : "universal",
       "scale" : "1x"
     },

fit-a-pet-client/fit-a-pet-client/ViewControllers/FirstVC.swift

@@ -105,10 +105,10 @@ extension FirstVC{
         let googleLogin = UIButton()
         let appleLogin = UIButton()
 
-        naverLogin.setImage(UIImage(named: "naver_icon"), for: .normal)
-        kakaoLogin.setImage(UIImage(named: "kakao_icon"), for: .normal)
-        googleLogin.setImage(UIImage(named: "google_icon"), for: .normal)
-        appleLogin.setImage(UIImage(named: "apple_icon"), for: .normal)
+        naverLogin.setImage(UIImage(named: "icon_oauth_naver"), for: .normal)
+        kakaoLogin.setImage(UIImage(named: "icon_oauth_kakao"), for: .normal)
+        googleLogin.setImage(UIImage(named: "icon_oauth_google"), for: .normal)
+        appleLogin.setImage(UIImage(named: "icon_oauth_apple"), for: .normal)
 
 
         kakaoLogin.addTarget(self, action: #selector(kakaoLoginBtnTapped(_:)), for: .touchUpInside)
@@ -252,7 +252,7 @@ extension FirstVC{
                 let profilePicUrl = user.profile?.imageURL(withDimension: 320)
 
                 print("user: \(user)")
-                print("userId: \(userId)")
+                print("userId: \(String(describing: userId))")
                 print("emailAddress: \(String(describing: emailAddress))")
                 print("fullName: \(String(describing: fullName))")
                 print("profileUrl: \(String(describing: profilePicUrl))")
@@ -264,7 +264,7 @@ extension FirstVC{
                     let idToken = user.idToken?.tokenString
 
                     KeychainHelper.saveTempToken(tempToken: idToken!)
-                    print("idToken: \(idToken)")
+                    print("idToken: \(String(describing: idToken))")
 
                     OauthInfo.provider = "google"
                     OauthInfo.oauthId = userId!

fit-a-pet-client/fit-a-pet-client/ViewControllers/LoginVC.swift

@@ -169,7 +169,7 @@ class LoginVC: UIViewController{
         let mainVC = TabBarController()
         mainVC.modalPresentationStyle = .fullScreen
 
-        AnonymousAlamofire.shared.login("jayang", "dkssudgktpdy") { [weak self] loginResult in
+        AnonymousAlamofire.shared.login("heejin", "heejin123") { [weak self] loginResult in
             switch loginResult {
             case .success(let data):
                 if let responseData = data {

fit-a-pet-client/fit-a-pet-client/ViewControllers/TabBarVC/SettingVC.swift

@@ -1,6 +1,7 @@
 import UIKit
 import SnapKit
 
+
 //TODO: 알림 배경 수정 필요
 class SettingVC: UIViewController {