feat : main 풀 받으려고 커밋.

OnAndOff-UMC · Feb 16, 2024 · feee1f0 · feee1f0
1 parent c17ef6d
commit feee1f0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/On_off_iOS/On_off_iOS/Home/Base/View/HomeViewController.swift b/On_off_iOS/On_off_iOS/Home/Base/View/HomeViewController.swift
@@ -227,6 +227,7 @@ final class HomeViewController: UIViewController {
             .disposed(by: disposeBag)
     }
 
+
     /// Binding Month Label
     private func bindMonthLabel(output: HomeViewModel.Output) {
         output.monthRelay

diff --git a/On_off_iOS/On_off_iOS/Home/On/Worklog/Model/Worklog.swift b/On_off_iOS/On_off_iOS/Home/On/Worklog/Model/Worklog.swift
@@ -12,6 +12,8 @@ struct Worklog: Codable {
     let content: String?
     let isChecked: Bool?
     let date: String?
+    let createdAt: String?
+
 }
 
 struct AddWorklog: Codable {

diff --git a/On_off_iOS/On_off_iOS/Home/On/Worklog/Service/InsertWorkLogService.swift b/On_off_iOS/On_off_iOS/Home/On/Worklog/Service/InsertWorkLogService.swift
@@ -14,19 +14,19 @@ final class InsertWorkLogService {
 
     /// Add Worklog
     /// - Parameter Worklog: 추가할 log
-    /// - Returns: Worklog
-    func addWorklog(Worklog: AddWorklog) -> Observable<Bool> {
+    /// - Returns: worklog
+    func addWorklog(worklog: AddWorklog) -> Observable<Bool> {
         let url = Domain.RESTAPI + WorklogPath.addWorklog.rawValue
         let header = Header.header.getHeader()
         print(url)
 
         return Observable.create { observer in
             AF.request(url,
                        method: .post,
-                       parameters: Worklog,
+                       parameters: worklog,
                        encoder: JSONParameterEncoder.default,
                        headers: header)
-            .validate(statusCode: 200..<201)
+//            .validate(statusCode: 200..<201)
             .responseDecodable(of: Response<Worklog>.self) { response in
                 print(#function, response)
                 switch response.result {
@@ -36,7 +36,8 @@ final class InsertWorkLogService {
                     observer.onError(error)
                 }
             }
-
+            print("\(worklog) 되고 있니?")
+            print("\(url)/제대로 나오렴...")
             return Disposables.create()
         }
     }

diff --git a/On_off_iOS/On_off_iOS/Home/On/Worklog/ViewModel/InsertWorkLogViewModel.swift b/On_off_iOS/On_off_iOS/Home/On/Worklog/ViewModel/InsertWorkLogViewModel.swift
@@ -99,7 +99,7 @@ final class InsertWorkLogViewModel {
         let Worklog: AddWorklog = AddWorklog(date: formatDate(date: Date()),
                                     content: output.textRelay.value)
         print(Worklog)
-        service.addWorklog(Worklog: Worklog)
+        service.addWorklog(worklog: Worklog)
             .subscribe(onNext: { check in
                 if check {
                     output.successAddWorklogRelay.accept(check)

diff --git a/On_off_iOS/On_off_iOS/Launch/LaunchViewController.swift b/On_off_iOS/On_off_iOS/Launch/LaunchViewController.swift
@@ -42,6 +42,7 @@ final class LaunchViewController: UIViewController {
 
         setupAnim()
         finishAnimation()
+//        KeychainWrapper.delete(key: LoginKeyChain.refreshToken.rawValue)
      }
 
     /// Setup Lottie animation