Merge pull request #208 from kookmin-sw/bug/fe/#197-fixBug

Bug/fe/#197 fix bug
kookmin-sw · May 15, 2024 · d6f0922 · d6f0922
2 parents feb8cbc + af31f9f
commit d6f0922
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 31 deletions.
diff --git a/front/capstone_front/lib/screens/helper/helper_board/helper_detail_screen.dart b/front/capstone_front/lib/screens/helper/helper_board/helper_detail_screen.dart
@@ -8,6 +8,7 @@ import 'package:capstone_front/utils/basic_button.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
 
 class HelperDetailScreen extends StatefulWidget {
@@ -25,13 +26,22 @@ class HelperDetailScreen extends StatefulWidget {
 class _HelperDetailScreenState extends State<HelperDetailScreen> {
   late HelperArticleModel helperArticleModel;
   bool isLoading = true;
+  bool isMyArticle = true;
 
   void loadDetail() async {
+    FlutterSecureStorage storage = const FlutterSecureStorage();
     helperArticleModel =
         await HelperService.getDetailById(widget.helperArticlePreviewModel.id);
     setState(() {
       isLoading = false;
     });
+    final uuid = await storage.read(key: "uuid");
+    print(uuid);
+    print(helperArticleModel.uuid);
+    if (uuid != helperArticleModel.uuid) {
+      isMyArticle = false;
+    }
+    setState(() {});
   }
 
   @override
@@ -111,15 +121,18 @@ class _HelperDetailScreenState extends State<HelperDetailScreen> {
               const SizedBox(
                 height: 20,
               ),
-              BasicButton(
-                  text: tr('helper.start_chat'),
-                  onPressed: () {
-                    var chatInitModel = ChatInitModel.fromJson({
-                      'author': widget.helperArticlePreviewModel.author,
-                      'uuid': helperArticleModel.uuid,
-                    });
-                    context.push("/chatroom", extra: chatInitModel);
-                  })
+              isMyArticle
+                  ? const SizedBox.shrink()
+                  : BasicButton(
+                      text: tr('helper.start_chat'),
+                      onPressed: () {
+                        var chatInitModel = ChatInitModel.fromJson({
+                          'author': widget.helperArticlePreviewModel.author,
+                          'uuid': helperArticleModel.uuid,
+                        });
+                        context.push("/chatroom", extra: chatInitModel);
+                      },
+                    )
             ],
           ),
         ));

diff --git a/front/capstone_front/lib/screens/helper/helper_chatting/helper_chatting_card.dart b/front/capstone_front/lib/screens/helper/helper_chatting/helper_chatting_card.dart
@@ -40,9 +40,11 @@ class _HelperChattingCardState extends State<HelperChattingCard> {
 
   Future<void> initInitialState() async {
     var chatHistory = await loadChatData(widget.chatRoomModel.userId);
-    setState(() {
-      lastMessageId = chatHistory.last.id;
-    });
+    if (chatHistory.isNotEmpty) {
+      setState(() {
+        lastMessageId = chatHistory.last.id;
+      });
+    }
   }
 
   @override

diff --git a/front/capstone_front/lib/screens/helper/helper_chatting/helper_chatting_list_screen.dart b/front/capstone_front/lib/screens/helper/helper_chatting/helper_chatting_list_screen.dart
@@ -47,12 +47,9 @@ class _HelperChattingListScreenState extends State<HelperChattingListScreen> {
   Future<void> startPolling(Map<String, dynamic> roomInfo) async {
     try {
       while (isActive) {
-        // loadChatRooms();
         try {
           var currentNewChatsInfos =
               await ChatService.pollingChatList(roomInfo);
-          print('roominfo');
-          print(roomInfo);
           for (var newChatInfo in currentNewChatsInfos) {
             var flag = true; // 새로운 채팅방인지 아닌지 확인
             for (var chatRoom in chatRoomList) {
@@ -67,15 +64,17 @@ class _HelperChattingListScreenState extends State<HelperChattingListScreen> {
 
             if (flag) {
               // 새로운 채팅방일 때
-              chatRoomList.add(ChatRoomModel(
-                chatRoomId: newChatInfo.chatRoomId,
-                userId: newChatInfo.userId,
-                userName: newChatInfo.userId,
-                lastMessageId: 0,
-                lastMessagePreviewId: newChatInfo.id,
-                chatRoomMessage: newChatInfo.content,
-                chatRoomDate: newChatInfo.timestamp,
-              ));
+              if (newChatInfo.id != 0) {
+                chatRoomList.add(ChatRoomModel(
+                  chatRoomId: newChatInfo.chatRoomId,
+                  userId: newChatInfo.userId,
+                  userName: newChatInfo.userId,
+                  lastMessageId: 0,
+                  lastMessagePreviewId: newChatInfo.id,
+                  chatRoomMessage: newChatInfo.content,
+                  chatRoomDate: newChatInfo.timestamp,
+                ));
+              }
             }
           }
 
@@ -117,13 +116,17 @@ class _HelperChattingListScreenState extends State<HelperChattingListScreen> {
       body: ListView.builder(
         itemCount: chatRoomList.length,
         itemBuilder: (BuildContext context, int index) {
-          return Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 15),
-            child: HelperChattingCard(
-              chatRoomModel: chatRoomList[index],
-              chatRoomListUpdate: loadChatRooms,
-            ),
-          );
+          if (chatRoomList[index].lastMessageId != 0) {
+            return Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 15),
+              child: HelperChattingCard(
+                chatRoomModel: chatRoomList[index],
+                chatRoomListUpdate: loadChatRooms,
+              ),
+            );
+          } else {
+            return const SizedBox.shrink();
+          }
         },
       ),
     );