Semi Final 7th Aug 2024

lib/services/api_service.dart

@@ -363,7 +363,7 @@ class ApiService extends GetxService{
       }),
     );
 
-    if (response.statusCode == 201) {
+    if (response.statusCode == 200 || response.statusCode == 201) {
       final decodedResponse = utf8.decode(response.bodyBytes);
       return User.fromJson(json.decode(decodedResponse));
     } else {
@@ -511,6 +511,8 @@ class ApiService extends GetxService{
 
       return Entry.fromJson(json.decode(decodedResponse));
     } else {
+      final decodedResponse = utf8.decode(response.bodyBytes);
+      print("decodedResponse = $decodedResponse");
       throw Exception('Failed to create entry');
     }
   }
@@ -552,7 +554,7 @@ class ApiService extends GetxService{
   }
 
 
-  Future<Entry> updateEntry(int entryId, int teamId, int eventId, int categoryId, DateTime date) async {
+  Future<Entry> updateEntry(int entryId, int teamId, int eventId, int categoryId, DateTime date,int zekken_number) async {
     init();
     getToken();
 
@@ -572,6 +574,7 @@ class ApiService extends GetxService{
         'event': eventId,
         'category': categoryId,
         'date': formattedDate,
+        'zekken_number': zekken_number,
       }),
     );
 
@@ -580,6 +583,9 @@ class ApiService extends GetxService{
 
       return Entry.fromJson(json.decode(decodedResponse));
     } else {
+      final decodedResponse = utf8.decode(response.bodyBytes);
+      final blk = json.decode(decodedResponse);
+
       throw Exception('Failed to update entry');
     }
   }

lib/services/auth_service.dart

@@ -164,9 +164,10 @@ class AuthService {
       },
       body: jsonEncode(<String, String>{'email': email, 'password': password, 'password2': password2}),
     );
-    //print(response.body);
+    cats = json.decode(utf8.decode(response.bodyBytes));
+    print("result=$cats");
     if (response.statusCode == 201) {
-      cats = json.decode(utf8.decode(response.bodyBytes));
+    }else{
     }
     return cats;
   }

lib/services/external_service.dart

@@ -202,6 +202,7 @@ class ExternalService {
                   colorText: Colors.white
                 );
               }
+
             }
           } else {
             Get.snackbar("サーバーエラーがおきました", "サーバーと通信できませんでした",
@@ -273,7 +274,8 @@ class ExternalService {
         Get.find<DestinationController>();
 
     // チームIDを取得
-    int teamId = indexController.currentUser[0]["user"]["team"]["id"];
+
+    //int teamId = indexController.currentUser[0]["user"]["team"]["id"];
 
     debugPrint("== goal Rogaining ==");
 
@@ -283,7 +285,7 @@ class ExternalService {
       id: 1,
       team_name: teamname,
       event_code: eventcode,
-      user_id: teamId,  //userId,
+      user_id: userId,  // 中身はteamid
       cp_number: -1,
       checkintime: DateTime.now().toUtc().microsecondsSinceEpoch,
       image: image,
@@ -305,7 +307,7 @@ class ExternalService {
       },
       // 'id', 'user', 'goalimage', 'goaltime', 'team_name', 'event_code','cp_number'
       body: jsonEncode(<String, String>{
-        'user': teamId.toString(),  //userId.toString(),
+        'user': userId.toString(),  //userId.toString(),
         'team_name': teamname,
         'event_code': eventcode,
         'goaltime': goalTime,
@@ -318,34 +320,42 @@ class ExternalService {
     String url = '$serverUrl/gifuroge/goal_from_rogapp';
     //print('++++++++$url');
     if (response.statusCode == 201) {
-      Map<String, dynamic> res = json.decode(utf8.decode(response.bodyBytes));
-      // print('----_res : $res ----');
-      // print('---- image url ${res["goalimage"]} ----');
-      final http.Response response2 = await http.post(
-        Uri.parse(url),
-        headers: <String, String>{
-          'Content-Type': 'application/json; charset=UTF-8',
-        },
-        body: jsonEncode(<String, String>{
+      try {
+        Map<String, dynamic> res = json.decode(utf8.decode(response.bodyBytes));
+        // print('----_res : $res ----');
+        // print('---- image url ${res["goalimage"]} ----');
+        final http.Response response2 = await http.post(
+          Uri.parse(url),
+          headers: <String, String>{
+            'Content-Type': 'application/json; charset=UTF-8',
+          },
+          body: jsonEncode(<String, String>{
+            'team_name': teamname,
+            'event_code': eventcode,
+            'goal_time': goalTime,
+            'image': res["goalimage"].toString().replaceAll(
+                'http://localhost:8100', serverUrl)
+            //'http://rogaining.sumasen.net')
+          }),
+        );
+        String rec = jsonEncode(<String, String>{
           'team_name': teamname,
           'event_code': eventcode,
           'goal_time': goalTime,
-          'image': res["goalimage"].toString().replaceAll(
-              'http://localhost:8100', serverUrl)  //'http://rogaining.sumasen.net')
-        }),
-      );
-      String rec = jsonEncode(<String, String>{
-        'team_name': teamname,
-        'event_code': eventcode,
-        'goal_time': goalTime,
-        'image': res["goalimage"]
-            .toString()
-            .replaceAll('http://localhost:8100', serverUrl)  //'http://rogaining.sumasen.net')
-      });
-      //print("-- json -- $rec");
-      //print('----- response2 is $response2 --------');
-      if (response2.statusCode == 200) {
-        res2 = json.decode(utf8.decode(response2.bodyBytes));
+          'image': res["goalimage"]
+              .toString()
+              .replaceAll('http://localhost:8100', serverUrl)
+          //'http://rogaining.sumasen.net')
+        });
+        //print("-- json -- $rec");
+        //print('----- response2 is $response2 --------');
+        if (response2.statusCode == 200) {
+          res2 = json.decode(utf8.decode(response2.bodyBytes));
+        } else {
+          res2 = json.decode(utf8.decode(response2.bodyBytes));
+        }
+      } catch(e){
+        print( "Error {$e}" );
       }
     }
     //}