added search by building name

egovernments · Dec 5, 2024 · c9a7b24 · c9a7b24
1 parent c36c17c
commit c9a7b24
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 14 deletions.
diff --git a/packages/registration_delivery/lib/data/repositories/local/household.dart b/packages/registration_delivery/lib/data/repositories/local/household.dart
@@ -102,6 +102,7 @@ class HouseholdLocalRepository
                   ? null
                   : AddressModel(
                       id: address.id,
+                      buildingName: address.buildingName,
                       relatedClientReferenceId: household.clientReferenceId,
                       tenantId: address.tenantId,
                       doorNo: address.doorNo,

diff --git a/packages/registration_delivery/lib/data/repositories/local/household_global_search.dart b/packages/registration_delivery/lib/data/repositories/local/household_global_search.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:digit_data_model/data_model.dart';
+import 'package:digit_data_model/models/entities/household_type.dart';
 import 'package:drift/drift.dart';
 import 'package:flutter/material.dart';
 import 'package:registration_delivery/models/entities/task.dart';
@@ -229,7 +230,12 @@ class HouseHoldGlobalSearchRepository extends LocalRepository {
           .individual
           .select()
           .join([joinName(sql), joinIndividualAddress(sql)]);
-      await searchByName(selectQuery, params, sql);
+      if (params.householdType == HouseholdType.community) {
+        await searchByBuildingName(selectQuery, params, sql);
+      } else {
+        await searchByName(selectQuery, params, sql);
+      }
+
       selectQuery = selectQuery.join([
         leftOuterJoin(
             sql.householdMember,
@@ -250,10 +256,14 @@ class HouseHoldGlobalSearchRepository extends LocalRepository {
     } else if (params.nameSearch != null &&
         params.nameSearch!.isNotEmpty &&
         selectQuery != null) {
-      selectQuery = selectQuery.join([
-        joinName(sql),
-      ]);
-      selectQuery = searchByName(selectQuery, params, sql);
+      if (params.householdType == HouseholdType.community) {
+        selectQuery = searchByBuildingName(selectQuery, params, sql);
+      } else {
+        selectQuery = selectQuery.join([
+          joinName(sql),
+        ]);
+        selectQuery = searchByName(selectQuery, params, sql);
+      }
     }
     return selectQuery;
   }
@@ -383,6 +393,16 @@ class HouseHoldGlobalSearchRepository extends LocalRepository {
     );
   }
 
+  searchByBuildingName(
+      selectQuery, GlobalSearchParameters params, LocalSqlDataStore sql) {
+    return selectQuery.where(buildAnd([
+      if (params.nameSearch != null)
+        buildOr([
+          sql.address.buildingName.contains(params.nameSearch!),
+        ]),
+    ]));
+  }
+
   joinHouseHoldAddress(LocalSqlDataStore sql) {
     return leftOuterJoin(
       sql.household,

diff --git a/packages/registration_delivery/lib/data/repositories/local/individual_global_search.dart b/packages/registration_delivery/lib/data/repositories/local/individual_global_search.dart
@@ -235,8 +235,10 @@ class IndividualGlobalSearchRepository extends LocalRepository {
           .individual
           .select()
           .join([joinName(sql), joinIndividualAddress(sql)]);
-      await searchByName(selectQuery, params, sql);
+
       if (params.householdClientReferenceId != null) {
+        await searchByName(selectQuery, params, sql);
+
         selectQuery = selectQuery.join([
           leftOuterJoin(
               sql.household,
@@ -259,6 +261,12 @@ class IndividualGlobalSearchRepository extends LocalRepository {
                 .equals(params.householdClientReferenceId ?? '')
           ]));
       } else {
+        if (params.householdType == HouseholdType.community) {
+          await searchByBuildingName(selectQuery, params, sql);
+        } else {
+          await searchByName(selectQuery, params, sql);
+        }
+
         selectQuery = selectQuery.join([
           leftOuterJoin(
               sql.householdMember,
@@ -283,10 +291,15 @@ class IndividualGlobalSearchRepository extends LocalRepository {
     } else if (params.nameSearch != null &&
         params.nameSearch!.isNotEmpty &&
         selectQuery != null) {
-      selectQuery = selectQuery.join([
-        joinName(sql),
-      ]);
-      selectQuery = searchByName(selectQuery, params, sql);
+      if (params.householdType == HouseholdType.community &&
+          params.householdClientReferenceId == null) {
+        selectQuery = searchByBuildingName(selectQuery, params, sql);
+      } else {
+        selectQuery = selectQuery.join([
+          joinName(sql),
+        ]);
+        selectQuery = searchByName(selectQuery, params, sql);
+      }
     }
     return selectQuery;
   }
@@ -303,6 +316,16 @@ class IndividualGlobalSearchRepository extends LocalRepository {
     ]));
   }
 
+  searchByBuildingName(
+      selectQuery, GlobalSearchParameters params, LocalSqlDataStore sql) {
+    return selectQuery.where(buildAnd([
+      if (params.nameSearch != null)
+        buildOr([
+          sql.address.buildingName.contains(params.nameSearch!),
+        ]),
+    ]));
+  }
+
   filterSearch(selectQuery, GlobalSearchParameters params, String filter,
       LocalSqlDataStore sql) async {
     var sql = super.sql;

diff --git a/packages/registration_delivery/lib/pages/beneficiary/household_overview.dart b/packages/registration_delivery/lib/pages/beneficiary/household_overview.dart
@@ -441,9 +441,9 @@ class _HouseholdOverviewPageState
                                                 .householdOverView
                                                 .instituteNameLabel): state
                                                     .householdMemberWrapper
-                                                    .headOfHousehold
-                                                    ?.name
-                                                    ?.givenName ??
+                                                    .household
+                                                    ?.address
+                                                    ?.buildingName ??
                                                 localizations.translate(
                                                     i18.common.coreCommonNA),
                                             localizations.translate(

diff --git a/packages/registration_delivery/lib/pages/search_beneficiary.dart b/packages/registration_delivery/lib/pages/search_beneficiary.dart
@@ -204,7 +204,10 @@ class _SearchBeneficiaryPageState
                                           null &&
                                       RegistrationDeliverySingleton()
                                           .searchHouseHoldFilter!
-                                          .isNotEmpty
+                                          .isNotEmpty &&
+                                      RegistrationDeliverySingleton()
+                                              .householdType !=
+                                          HouseholdType.community
                                   ? Align(
                                       alignment: Alignment.topLeft,
                                       child: Padding(