#42 add workaround other species orgid

lib/Controllers/SpeciesController.dart

@@ -25,6 +25,26 @@ class SpeciesController extends GetxController {
     speciesList.assignAll(species.map((data) => Species.fromDbJson(data)).toList());
   }
 
+  Species? getSpeciesById(int id) {
+    for (var specie in speciesList) {
+      if (specie.id == id) {
+        return specie;
+      }
+    }
+
+    return null;
+  }
+
+  Species? getSpeciesByOrgId(int orgid) {
+    for (var specie in speciesList) {
+      if (specie.orgid == orgid) {
+        return specie;
+      }
+    }
+
+    return null;
+  }
+
   /// getSpeciesName
   String? getSpeciesName(int id) {
     for (var specie in speciesList) {

lib/Db/DBHelper.dart

@@ -204,7 +204,7 @@ class DBHelper {
 
   /// insertSighting
   static Future<int> insertSighting(Sighting newSighting) async {
-    return await _db?.insert(_tableNameSighting, newSighting.toJson(false, true)) ?? 1;
+    return await _db?.insert(_tableNameSighting, newSighting.toJson(false, true, false)) ?? 1;
   }
 
   /// querySighting
@@ -225,7 +225,7 @@ class DBHelper {
   static Future<int> updateSighting(Sighting uSighting) async {
     return await _db!.update(
         _tableNameSighting,
-        uSighting.toJson(false, true),
+        uSighting.toJson(false, true, false),
         where: 'id=?',
         whereArgs: [uSighting.id]
     );

lib/Models/Sighting.dart

@@ -1,10 +1,16 @@
+import 'dart:convert';
+
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:get/get_core/src/get_main.dart';
 import 'package:intl/intl.dart';
 import 'package:mwpaapp/Constants.dart';
 import 'package:mwpaapp/Util/UtilCheckJson.dart';
 import 'package:mwpaapp/Util/UtilTourFId.dart';
 
+import '../Controllers/SpeciesController.dart';
+
 /// Sighting
 class Sighting {
 
@@ -134,7 +140,7 @@ class Sighting {
   }
 
   /// toJson
-  Map<String, dynamic> toJson(bool withId, bool withSyncStatus) {
+  Map<String, dynamic> toJson(bool withId, bool withSyncStatus, bool? forSync) {
     final Map<String, dynamic> data = <String, dynamic>{};
 
     if (withId) {
@@ -190,6 +196,29 @@ class Sighting {
     data['freq_behaviour'] = freq_behaviour;
     data['recognizable_animals'] = recognizable_animals;
     data['other_species'] = other_species;
+
+    // only for repairing a bug
+    if (forSync != null) {
+      if (forSync) {
+        Map<String, dynamic> newdata = {};
+        Map<String, dynamic> olddata = jsonDecode(other_species!);
+        final SpeciesController _speciesController = Get.find<SpeciesController>();
+
+        olddata.forEach((key, value) {
+          if (value != "") {
+            var species = _speciesController.getSpeciesById(int.parse(value));
+
+            if (species != null) {
+              var orgid = species.orgid;
+              newdata["$key"] = "$orgid";
+            }
+          }
+        });
+
+        data['other_species'] = const JsonEncoder().convert(newdata);
+      }
+    }
+
     data['other'] = other;
     data['other_vehicle'] = other_vehicle;
     data['note'] = note;

lib/Mwpa/Models/SightingSaveResponse.dart

@@ -2,12 +2,14 @@ import 'package:mwpaapp/Mwpa/Models/DefaultReturn.dart';
 
 class SightingSaveResponse extends DefaultReturn {
   final String? unid;
+  final bool? canDelete;
 
-  SightingSaveResponse({required super.statusCode, super.msg, this.unid});
+  SightingSaveResponse({required super.statusCode, super.msg, this.unid, this.canDelete});
 
   factory SightingSaveResponse.fromJson(Map<String, dynamic> json) {
     String? msg;
     String? unid;
+    bool? canDelete;
 
     if (json.containsKey('unid')) {
       unid = json['unid'];
@@ -17,10 +19,15 @@ class SightingSaveResponse extends DefaultReturn {
       msg = json['msg'];
     }
 
+    if (json.containsKey('canDelete')) {
+      canDelete = json['canDelete'];
+    }
+
     return SightingSaveResponse(
       statusCode: json['statusCode'],
       msg: msg,
-      unid: unid
+      unid: unid,
+      canDelete: canDelete
     );
   }
 }

lib/Mwpa/MwpaAPI.dart

@@ -441,7 +441,7 @@ class MwpaApi {
     try {
       var url = getUrl(MwpaApi.URL_SIGHTING_SAVE);
 
-      var postBody = jsonEncode(sigh.toJson(false, false));
+      var postBody = jsonEncode(sigh.toJson(false, false, true));
 
       var response = await http.post(
         Uri.parse(url),

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.7+8
+version: 1.0.10+11
 
 environment:
   sdk: ">=2.17.5 <3.0.0"