Merge pull request #6872 from msupply-foundation/add-filter-for-is-active-for-clinicians

6635 Add clinicians is_active filter

Author: fergie-nz

client/packages/common/src/types/schema.ts

@@ -1005,6 +1005,7 @@ export type ClinicianFilterInput = {
   firstName?: InputMaybe<StringFilterInput>;
   id?: InputMaybe<EqualFilterStringInput>;
   initials?: InputMaybe<StringFilterInput>;
+  isActive?: InputMaybe<Scalars['Boolean']['input']>;
   lastName?: InputMaybe<StringFilterInput>;
   mobile?: InputMaybe<StringFilterInput>;
   phone?: InputMaybe<StringFilterInput>;

client/packages/programs/src/api/api.ts

@@ -357,7 +357,10 @@ export const getClinicianQueries = (sdk: Sdk, storeId: string) => ({
         (sortBy?.key as ClinicianSortFieldInput) ??
         ClinicianSortFieldInput.LastName,
       desc: sortBy?.isDesc,
-      filter: filterBy,
+      filter: {
+        ...filterBy,
+        isActive: true,
+      }
     });
 
     if (result.clinicians.__typename === 'ClinicianConnector') {

server/graphql/clinician/src/query.rs

@@ -41,7 +41,6 @@ pub struct ClinicianSortInput {
 #[derive(InputObject, Clone)]
 pub struct ClinicianFilterInput {
     pub id: Option<EqualFilterStringInput>,
-
     pub code: Option<StringFilterInput>,
     pub first_name: Option<StringFilterInput>,
     pub last_name: Option<StringFilterInput>,
@@ -51,6 +50,7 @@ pub struct ClinicianFilterInput {
     pub phone: Option<StringFilterInput>,
     pub mobile: Option<StringFilterInput>,
     pub email: Option<StringFilterInput>,
+    pub is_active: Option<bool>,
 }
 
 #[derive(SimpleObject)]
@@ -113,6 +113,7 @@ impl ClinicianFilterInput {
             phone,
             mobile,
             email,
+            is_active,
         } = self;
 
         ClinicianFilter {
@@ -126,6 +127,7 @@ impl ClinicianFilterInput {
             phone: phone.map(StringFilter::from),
             mobile: mobile.map(StringFilter::from),
             email: email.map(StringFilter::from),
+            is_active,
         }
     }
 }

server/repository/src/db_diesel/clinician.rs

@@ -23,6 +23,7 @@ pub struct ClinicianFilter {
     pub phone: Option<StringFilter>,
     pub mobile: Option<StringFilter>,
     pub email: Option<StringFilter>,
+    pub is_active: Option<bool>,
 }
 
 #[derive(PartialEq, Debug)]
@@ -149,6 +150,7 @@ fn create_filtered_query(store_id: String, filter: Option<ClinicianFilter>) -> B
             phone,
             mobile,
             email,
+            is_active,
         } = f;
 
         apply_equal_filter!(query, id, clinician::id);
@@ -161,6 +163,10 @@ fn create_filtered_query(store_id: String, filter: Option<ClinicianFilter>) -> B
         apply_string_filter!(query, phone, clinician::phone);
         apply_string_filter!(query, mobile, clinician::mobile);
         apply_string_filter!(query, email, clinician::email);
+
+        if let Some(is_active) = is_active {
+            query = query.filter(clinician::is_active.eq(is_active))
+        }
     };
 
     // Restrict results to clinicians belonging to the store as specified in the
@@ -228,6 +234,11 @@ impl ClinicianFilter {
         self.email = Some(filter);
         self
     }
+
+    pub fn is_active(mut self, filter: bool) -> Self {
+        self.is_active = Some(filter);
+        self
+    }
 }
 
 #[cfg(test)]