Architecture improvements

.github/workflows/publish.yml

@@ -0,0 +1,12 @@
+name: PUBLISH
+
+on:
+  push:
+    tags:
+      - "[0-9]+.[0-9]+.[0-9]+*"
+
+jobs:
+  publish:
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    # with:
+    #   working-directory: path/to/package/within/repository

.github/workflows/task.yml

@@ -0,0 +1,31 @@
+name: TASK
+on:
+  pull_request:
+    branches:
+      - release
+  push:
+    branches: [develop]
+
+jobs:
+  TASK:
+    if: |
+      github.event_name == 'push'
+    name: TASK
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🔄
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.push.head.sha }}
+
+      - uses: BaharaJr/[email protected]
+        with:
+          CLICKUP_TOKEN: ${{secrets.CLICKTOKEN}}
+          LIST_ID: ${{secrets.LIST_ID}}
+          TASK_STATUS: ${{secrets.STATUS}}
+          ASSIGNEES: ${{secrets.ASSIGNEES}}
+          FIELDS: ${{secrets.FIELDS}}
+          MESSAGE: ${{github.event.head_commit.message}}
+          AUTHOR: ${{ github.event.commits[0].author.username ||
+            github.event.commits[0].author.login }}

CHANGELOG.md

@@ -1,3 +1,80 @@
+## [1.1.9] 04/12/2024
+
+- Add nullable support in program module
+- Improve perfomance 
+
+## [1.1.8] 14/10/2024 - Happy Nyerere Day
+
+- Add APiToken grant type to HTTP requests for personal access tokens
+
+## [1.1.7] 20/09/2024
+
+- Add timestamp to check token expiry time
+- Add implementation to renew tokens on expiry
+
+## [1.1.6] - 09/09/2024
+
+- Add put method in httpClient
+
+## [1.1.5] 04/09/2024
+
+- Improve runtime type checking for values in user orgunit model
+- Add fallback for dirty value
+
+## [1.1.4] 04/09/2024
+
+- Fix error on type of user organisations in user entity
+
+## [1.1.3] - 09/08/2024
+
+- Add delete function in httpClient
+- Add d2 evaluation and parsing date objects
+- Add option group module
+- Add option group column to program rule action
+- Fix error saving relationships
+- Add functionality to re-evaluate math expressions for not operators
+- Add program rule expression execution for arithmetics
+- Fix error saving dataValueSets for missing filters
+
+## [1.1.2] - 13/02/2024
+
+- Add checks on dynamic data to check for possible null values
+- Add checks for availability of response body before getting resource
+- Add saved attribute to tracked entity and event data
+- Add default import summaries for uknown network errors
+- Improve insert performance by wrapping in try catch
+- Remove hardcoded program status
+- Use a different field for user selected fields to avoid conflicts
+- Add functionality for user fields selection on download
+
+## [1.1.1] - 07/08/2023
+
+- Add support to upload relationships when uploading tracker entity instances
+
+## [1.1.0] - 06/08/2023
+
+- Add support to download program relationships
+- Add support to donwload and upload tracker relationships
+- Fix issue on clearing of shared preference on log out
+- Fix data synchronization issues when local data is in dirty state
+
+### Fixes
+
+- Improve events program rules queueing on failing rules response
+- Fix error with missing code column in user authority
+
+## [1.0.3] - 23/03/2023
+
+### Fixes
+
+- Improve events program rules queueing on failing rules response
+- Fix error with missing code column in user authority
+
+### New
+
+- Add job title and phone number properties to user entity
+- Add data store module
+
 ## [1.0.2] - 17/09/2022
 
 ## [1.0.0-beta.13] - 09/09/2022

database_builder.sh

@@ -1 +1 @@
-flutter packages pub run build_runner build --delete-conflicting-outputs
+flutter pub cache clean && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs

lib/core/annotations/column.annotation.dart

@@ -5,7 +5,7 @@ import 'package:reflectable/reflectable.dart';
 
 import 'entity.annotation.dart';
 
-enum ColumnType { TEXT, INTEGER, BOOLEAN }
+enum ColumnType { TEXT, INTEGER, BOOLEAN, JSON }
 
 enum RelationType { OneToMany, ManyToOne, OneToOne }
 
@@ -75,6 +75,8 @@ class Column {
         return 'INTEGER';
       case ColumnType.BOOLEAN:
         return 'BOOLEAN';
+      case ColumnType.JSON:
+        return 'JSON';
       default:
         return 'TEXT';
     }
@@ -95,6 +97,10 @@ class Column {
 
   static Column? getColumn(VariableMirror variableMirror, String columnName,
       bool ignoreRelationColumns) {
+    if (variableMirror.metadata.isEmpty) {
+      return null;
+    }
+
     dynamic variableElement = variableMirror.metadata[0];
 
     if (variableElement is Column || variableElement is PrimaryColumn) {

lib/core/annotations/entity.annotation.dart

@@ -51,10 +51,12 @@ class Entity {
 
       if (value is VariableMirror) {
         VariableMirror variableMirror = value;
-        Column column =
-            Column.getColumn(variableMirror, key, ignoreRelationColumns)
-                as Column;
-        columns.add(column);
+        Column? column =
+            Column.getColumn(variableMirror, key, ignoreRelationColumns);
+
+        if (column != null) {
+          columns.add(column);
+        }
       }
     }
 
@@ -63,10 +65,12 @@ class Entity {
 
       if (value is VariableMirror) {
         VariableMirror variableMirror = value;
-        Column column =
-            Column.getColumn(variableMirror, key, ignoreRelationColumns)
-                as Column;
-        columns.add(column);
+        Column? column =
+            Column.getColumn(variableMirror, key, ignoreRelationColumns);
+
+        if (column != null) {
+          columns.add(column);
+        }
       }
     }
 

lib/core/database/database.util.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/cupertino.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class DatabaseUtil {
+  /**
+   * Get database name form shared preferences
+   */
+  static Future<String?> getDatabaseName(
+      {Future<SharedPreferences>? sharedPreferenceInstance}) async {
+    WidgetsFlutterBinding.ensureInitialized();
+    SharedPreferences prefs =
+        await (sharedPreferenceInstance ?? SharedPreferences.getInstance());
+    return prefs.getString('databaseName');
+  }
+
+/**
+ * Set database name into the shared preferences
+ */
+  static Future<bool> setDatabaseName(
+      {required String databaseName,
+      required SharedPreferences sharedPreferenceInstance}) async {
+    return sharedPreferenceInstance.setString('databaseName', databaseName);
+  }
+
+  static Future<void> removeDatabaseName(
+      {Future<SharedPreferences>? sharedPreferenceInstance}) async {
+    SharedPreferences prefs =
+        await (sharedPreferenceInstance ?? SharedPreferences.getInstance());
+    await prefs.remove('databaseName');
+  }
+}

lib/core/database/database_manager.dart

@@ -12,8 +12,7 @@ class DatabaseManager {
   bool inMemory = false;
   DatabaseFactory? databaseFactory;
 
-  static final DatabaseManager _databaseInstance =
-      new DatabaseManager._internal();
+  static DatabaseManager? _databaseInstance;
 
   static Database? _database;
   final _initDatabaseMemoizer = AsyncMemoizer<Database>();
@@ -22,22 +21,25 @@ class DatabaseManager {
       {String? databaseName,
       bool? inMemory,
       DatabaseFactory? databaseFactory}) {
-    if (databaseName != null) {
-      _databaseInstance.databaseName = databaseName;
-    }
+    if (_databaseInstance == null) {
+      _databaseInstance = new DatabaseManager._internal();
+      if (databaseName != null) {
+        _databaseInstance?.databaseName = databaseName;
+      }
 
-    if (inMemory != null) {
-      _databaseInstance.inMemory = inMemory;
-    }
+      if (inMemory != null) {
+        _databaseInstance?.inMemory = inMemory;
+      }
 
-    _databaseInstance.databaseFactory = databaseFactory;
+      _databaseInstance?.databaseFactory = databaseFactory;
+    }
 
-    return _databaseInstance;
+    return _databaseInstance as DatabaseManager;
   }
 
   DatabaseManager._internal();
 
-  static DatabaseManager get instance => _databaseInstance;
+  static DatabaseManager? get instance => _databaseInstance;
 
   Future<Database> get database async {
     if (_database != null) {
@@ -50,8 +52,14 @@ class DatabaseManager {
   }
 
   initializeDatabase() async {
-    if (this.databaseFactory != null) {
-      return databaseFactory?.openDatabase(inMemoryDatabasePath);
+    if (databaseFactory != null) {
+      bool databaseExist = await databaseFactory!.databaseExists(databaseName);
+
+      if (databaseExist) {
+        await databaseFactory?.deleteDatabase(databaseName);
+      }
+      return databaseFactory?.openDatabase(databaseName,
+          options: OpenDatabaseOptions(onConfigure: _onConfigure));
     }
 
     Directory documentDirectory = await getApplicationDocumentsDirectory();
@@ -72,7 +80,15 @@ class DatabaseManager {
     await db.execute("PRAGMA foreign_keys = OFF");
   }
 
-  closeDatabase() {}
+  closeDatabase() async {
+    await _database?.close();
+  }
+
+  dispose() async {
+    await _database?.close();
+    await databaseFactory?.deleteDatabase(databaseName);
+    _databaseInstance = null;
+  }
 
   void _createDatabase(Database database, int version) async {}
 }

lib/core/models/d2_touch.model.dart

@@ -0,0 +1,21 @@
+import 'package:d2_touch/core/database/database_manager.dart';
+import 'package:d2_touch/modules/auth/user.module.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:sqflite/sqflite.dart';
+
+abstract class D2TouchModel {
+  String locale = 'en';
+  bool? inMemory;
+  DatabaseFactory? databaseFactory;
+  late SharedPreferences sharedPreferenceInstance;
+  DatabaseManager? databaseInstance;
+
+  Future<DatabaseManager> setDatabase({
+    required String databaseName,
+    bool? inMemory,
+    DatabaseFactory? databaseFactory,
+    required SharedPreferences sharedPreferenceInstance,
+  });
+
+  UserModule get userModule;
+}