Merge branch 'feat/#25-mypage' of https://github.com/OnAndOff-UMC/iOS …

…into feat/#25-mypage
OnAndOff-UMC · Feb 18, 2024 · 4809d35 · 4809d35
2 parents a874019 + 8305640
commit 4809d35
Show file tree

Hide file tree

Showing 3 changed files with 10 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
@@ -281,7 +281,7 @@ final class HomeViewController: UIViewController {
         bindFutureRelay(output: output)
         bindClickImagePlusButton()
         bindClickImageButton()
-        bindAddWorkLifeBalanceFeedButton()
+        bindAddWorkLifeBalanceFeedButton(output: output)
         bindSelectedFeedTableViewCell()
         bindCheckToday(output: output)
         bindMoveInquireMemoirsViewController()
@@ -460,11 +460,14 @@ final class HomeViewController: UIViewController {
     }
 
     /// 워라벨 피드 추가 버튼
-    private func bindAddWorkLifeBalanceFeedButton() {
+    private func bindAddWorkLifeBalanceFeedButton(output: HomeViewModel.Output) {
         offUIView.clickedAddfeedButton
             .bind { [weak self] in
                 guard let self = self else { return }
-                presentInsertWLBFeedView(insertFeed: nil)
+                presentInsertWLBFeedView(insertFeed: Feed(feedId: nil,
+                                                          isChecked: nil,
+                                                          date: output.dayListRelay.value[output.selectedDayIndex.value.row].totalDate,
+                                                          content: nil))
             }
             .disposed(by: disposeBag)
     }

diff --git a/On_off_iOS/On_off_iOS/Home/Off/Service/InsertWorkLifeBalanceFeedService.swift b/On_off_iOS/On_off_iOS/Home/Off/Service/InsertWorkLifeBalanceFeedService.swift
@@ -17,8 +17,8 @@ final class InsertWorkLifeBalanceFeedService {
     func addFeed(feed: AddFeed) -> Observable<Bool> {
         let url = Domain.RESTAPI + FeedPath.workLifeBalacne.rawValue
         let header = Header.header.getHeader()
-        print(url)
-        
+        print(url, feed)
+
         return Observable.create { observer in
             AF.request(url,
                        method: .post,
@@ -27,6 +27,7 @@ final class InsertWorkLifeBalanceFeedService {
                        headers: header)
             .validate(statusCode: 200..<201)
             .responseDecodable(of: Response<Feed>.self) { response in
+
                 print(#function, response)
                 switch response.result {
                 case .success(let data):

diff --git a/On_off_iOS/On_off_iOS/Home/Off/ViewModel/InsertWorkLifeBalanceFeedViewModel.swift b/On_off_iOS/On_off_iOS/Home/Off/ViewModel/InsertWorkLifeBalanceFeedViewModel.swift
@@ -96,7 +96,7 @@ final class InsertWorkLifeBalanceFeedViewModel {
 
     /// Add Feed To Backend Server
     private func addFeed(output: Output) {
-        let feed: AddFeed = AddFeed(date: formatDate(date: Date()),
+        let feed: AddFeed = AddFeed(date: output.insertRelay.value?.date ?? "",
                                     content: output.textRelay.value)
         print(feed)
         service.addFeed(feed: feed)