From 3bcd2b7dbafae3663f0847bf808ec28566dff4c8 Mon Sep 17 00:00:00 2001
From: Yu Sung <hwchon1234@gmail.com>
Date: Wed, 13 Sep 2023 14:39:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EB=A1=9C=EB=94=A9=20=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Message/Text/TextMessageView.swift        | 16 ++++++++++++-
 .../Message/Text/TextMessageViewModel.swift   | 23 ++++++++++++++++---
 .../Message/Voice/VoiceMessageViewModel.swift | 20 ++++++++--------
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/SodaLive/Sources/Message/Text/TextMessageView.swift b/SodaLive/Sources/Message/Text/TextMessageView.swift
index ef7234c..9a9cd0c 100644
--- a/SodaLive/Sources/Message/Text/TextMessageView.swift
+++ b/SodaLive/Sources/Message/Text/TextMessageView.swift
@@ -22,7 +22,8 @@ struct TextMessageView: View {
                     ScrollView(.vertical, showsIndicators: false) {
                         if viewModel.items.count > 0 {
                             LazyVStack(spacing: 26.7) {
-                                ForEach(viewModel.items, id: \.self) { item in
+                                ForEach(0..<viewModel.items.count, id: \.self) { index in
+                                    let item = viewModel.items[index]
                                     TextMessageItemView(item: item)
                                         .frame(width: screenSize().width - 26.7)
                                         .contentShape(Rectangle())
@@ -33,6 +34,7 @@ struct TextMessageView: View {
                                                     messageBox: viewModel.currentFilter,
                                                     refresh: {
                                                         viewModel.page = 1
+                                                        viewModel.isLast = false
                                                         switch viewModel.currentFilter {
                                                         case .receive:
                                                             viewModel.getReceivedTextMessage()
@@ -45,6 +47,18 @@ struct TextMessageView: View {
                                                 )
                                             )
                                         }
+                                        .onAppear {
+                                            if index == viewModel.items.count - 1 && !viewModel.isLast {
+                                                switch viewModel.currentFilter {
+                                                case .receive:
+                                                    viewModel.getReceivedTextMessage()
+                                                case .sent:
+                                                    viewModel.getSentTextMessage()
+                                                case .keep:
+                                                    viewModel.getKeepTextMessage()
+                                                }
+                                            }
+                                        }
                                 }
                             }
                             .padding(.top, 26.7)
diff --git a/SodaLive/Sources/Message/Text/TextMessageViewModel.swift b/SodaLive/Sources/Message/Text/TextMessageViewModel.swift
index 4bdda82..b582cc5 100644
--- a/SodaLive/Sources/Message/Text/TextMessageViewModel.swift
+++ b/SodaLive/Sources/Message/Text/TextMessageViewModel.swift
@@ -21,6 +21,7 @@ final class TextMessageViewModel: ObservableObject {
     @Published var currentFilter: MessageFilterTab = .receive {
         willSet(newVal) {
             page = 1
+            isLast = false
             
             switch newVal {
             case .receive:
@@ -43,6 +44,7 @@ final class TextMessageViewModel: ObservableObject {
     
     let placeholder = "내용을 입력해 주세요."
     
+    var isLast = false
     var page = 1
     private let size = 10
     
@@ -128,7 +130,12 @@ final class TextMessageViewModel: ObservableObject {
                     let decoded = try jsonDecoder.decode(ApiResponse<GetTextMessageResponse>.self, from: responseData)
                     
                     if let data = decoded.data, decoded.success {
-                        self.items.append(contentsOf: data.items)
+                        if data.items.count <= 0 {
+                            self.isLast = true
+                        } else {
+                            self.items.append(contentsOf: data.items)
+                            self.page += 1
+                        }
                     } else {
                         if let message = decoded.message {
                             self.errorMessage = message
@@ -171,7 +178,12 @@ final class TextMessageViewModel: ObservableObject {
                     let decoded = try jsonDecoder.decode(ApiResponse<GetTextMessageResponse>.self, from: responseData)
                     
                     if let data = decoded.data, decoded.success {
-                        self.items.append(contentsOf: data.items)
+                        if data.items.count <= 0 {
+                            self.isLast = true
+                        } else {
+                            self.items.append(contentsOf: data.items)
+                            self.page += 1
+                        }
                     } else {
                         if let message = decoded.message {
                             self.errorMessage = message
@@ -214,7 +226,12 @@ final class TextMessageViewModel: ObservableObject {
                     let decoded = try jsonDecoder.decode(ApiResponse<GetTextMessageResponse>.self, from: responseData)
                     
                     if let data = decoded.data, decoded.success {
-                        self.items.append(contentsOf: data.items)
+                        if data.items.count <= 0 {
+                            self.isLast = true
+                        } else {
+                            self.items.append(contentsOf: data.items)
+                            self.page += 1
+                        }
                     } else {
                         if let message = decoded.message {
                             self.errorMessage = message
diff --git a/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift b/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift
index 36f64cf..4f83d6c 100644
--- a/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift
+++ b/SodaLive/Sources/Message/Voice/VoiceMessageViewModel.swift
@@ -57,15 +57,17 @@ final class VoiceMessageViewModel: ObservableObject {
     }
     
     func loadMessage() {
-        switch currentFilter {
-        case .receive:
-            getReceivedVoiceMessage()
-            
-        case .sent:
-            getSentVoiceMessage()
-            
-        case .keep:
-            getKeepVoiceMessage()
+        if !isLast {
+            switch currentFilter {
+            case .receive:
+                getReceivedVoiceMessage()
+                
+            case .sent:
+                getSentVoiceMessage()
+                
+            case .keep:
+                getKeepVoiceMessage()
+            }
         }
     }