Merge pull request #141 from 4Ailen/feat/#123_marketAPI

Feat/#123 market api
4Ailen · Sep 8, 2023 · a268d9d · a268d9d
2 parents 061cfcf + 4d1c3c3
commit a268d9d
Show file tree

Hide file tree

Showing 6 changed files with 457 additions and 76 deletions.
diff --git a/assets/translations/en-US.json b/assets/translations/en-US.json
@@ -309,7 +309,8 @@
   "Slight_Defect": "SLIGHT_DEFECT",
   "Used": "USED",
   "sale": "SELL",
-  "sold-out":"SOLD_OUT",
+  "sold-out":"END",
+
 
   "search1": "Type Keyword",
   "search2": "Search for posts!"

diff --git a/lib/apis/apis.dart b/lib/apis/apis.dart
@@ -1630,6 +1630,9 @@ class APIs {
       request.fields['content'] = marketArticle.content!;
       request.fields['price'] = marketArticle.price.toString();
       request.fields['productStatus'] = marketArticle.productStatus!;
+      request.fields['marketArticleStatus'] = marketArticle.marketArticleStatus!;
+
+
 
       // 이미지 파일 필드 추가
       if (marketArticle.imageUrls != null &&
@@ -1650,11 +1653,14 @@ class APIs {
       var response = await request.send();
 
       // 성공
-      if (response.statusCode == 201) {
+      if (response.statusCode == 200) {
         print('상품 판매글 생성');
+        print(await response.stream.bytesToString());
         return true;
       } else {
         final responseBody = await response.stream.bytesToString();
+        print(await response.stream.bytesToString());
+
         final errorCode = json.decode(responseBody)['code'];
 
         if (errorCode == 'AT-C-002') {
@@ -1676,14 +1682,16 @@ class APIs {
   }
 
   /*특정 판매글 수정*/
-  static Future<String> updateMarketArticle(int articleId,
-      Map<String, dynamic> updateData) async {
+
+  static Future<bool> updateMarketArticle(int articleId, Map<String, dynamic> updateData) async {
     try {
+      print('Starting updateMarketArticle with articleId: $articleId');
+
       var jwtToken = await storage.read(key: 'token');
       final accessToken = json.decode(jwtToken!)['data']['accessToken'];
 
-      final url = Uri.parse(
-          'http://3.34.2.246:8080/api/v2/market-articles/$articleId');
+      final url = Uri.parse('http://3.34.2.246:8080/api/v2/market-articles/$articleId');
+      print('Update Data: $updateData');
 
       final response = await http.patch(
         url,
@@ -1696,8 +1704,12 @@ class APIs {
 
       if (response.statusCode == 200) {
         final responseBody = json.decode(utf8.decode(response.bodyBytes));
-        final message = responseBody['message'];
-        return message;
+        print('Successful Response Body: $responseBody');
+        return true;
+      } else if (response.statusCode == 500) {
+        final responseBody = json.decode(utf8.decode(response.bodyBytes));
+        print('500 Error Response Body: $responseBody');
+        return false;
       } else {
         final responseBody = json.decode(utf8.decode(response.bodyBytes));
         final errorCode = responseBody['code'];
@@ -1729,6 +1741,7 @@ class APIs {
         url,
         headers: {
           'Authorization': 'Bearer $accessToken',
+          'Content-Type': 'application/json',
         },
       );
 

diff --git a/lib/views/components/board_drawer_widget.dart b/lib/views/components/board_drawer_widget.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:aliens/mockdatas/mockdata_model.dart';
 import 'package:aliens/models/chatRoom_model.dart';
 import 'package:aliens/models/memberDetails_model.dart';
 import 'package:aliens/models/screenArgument.dart';
@@ -23,18 +24,22 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:web_socket_channel/status.dart';
 
 import '../../apis/apis.dart';
+import '../../mockdatas/mockdata_model.dart';
+import '../../mockdatas/mockdata_model.dart';
 import '../../models/market_articles.dart';
+import '../../models/members.dart';
 import '../../repository/sql_message_repository.dart';
 import '../pages/board/market_posting_board_page.dart';
 
 class BoardDrawerWidget extends StatefulWidget {
-  const BoardDrawerWidget({super.key, required this.screenArguments, required this.isTotalBoard, required this.onpressd, this.marketBoard});
+  const BoardDrawerWidget({super.key, required this.screenArguments, required this.isTotalBoard, required this.onpressd, this.marketBoard, this.memberDetails});
 
   final ScreenArguments screenArguments;
   final MarketBoard? marketBoard;
-  //final MemberDetails memberDetails;
+  final MemberDetails? memberDetails;
 
   final bool isTotalBoard;
   final VoidCallback onpressd;
@@ -51,12 +56,14 @@ class _BoardDrawerWidgetState extends State<BoardDrawerWidget> {
   @override
   Widget build(BuildContext context) {
 
+
     return Container(
       decoration: BoxDecoration(
         color: Color(0xffEBEBEB),
       ),
       child: ListView(
         children: [
+
           InkWell(
         onTap: () async {
               if(widget.isTotalBoard){
@@ -451,7 +458,7 @@ class _BoardDrawerWidgetState extends State<BoardDrawerWidget> {
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                      builder: (context) => MarketBoardPage(screenArguments: widget.screenArguments, marketBoard: widget.marketBoard, index:0,)),
+                      builder: (context) => MarketBoardPage(screenArguments: widget.screenArguments, marketBoard: widget.marketBoard, memberDetails: widget.screenArguments.memberDetails!)),
 
                 );
               }
@@ -460,7 +467,7 @@ class _BoardDrawerWidgetState extends State<BoardDrawerWidget> {
                 Navigator.push(
                   context,
                   MaterialPageRoute(
-                      builder: (context) => MarketBoardPage(screenArguments: widget.screenArguments, marketBoard: widget.marketBoard, index:0,)),
+                      builder: (context) => MarketBoardPage(screenArguments: widget.screenArguments, marketBoard: widget.marketBoard, memberDetails:widget.screenArguments.memberDetails!)),
                 );
               }
             },