Merge pull request #82 from souravbhowmik1999/oblfLastest

Show all schools in alphabetical order
tekdi · Oct 28, 2024 · 0caf86a · 0caf86a
2 parents 6ba9621 + 865d0e6
commit 0caf86a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/adapters/postgres/fields-adapter.ts b/src/adapters/postgres/fields-adapter.ts
@@ -182,7 +182,9 @@ export class PostgresFieldsService implements IServicelocatorfields {
         }
         for (let data of result) {
             if ((data?.dependsOn == '' || data?.dependsOn == undefined || data?.dependsOn == null || data?.dependsOn == 'NULL') && data?.sourceDetails?.source === 'table' || data?.sourceDetails?.source === 'jsonfile') {
-                let options = await this.findDynamicOptions(data.sourceDetails.table);
+                let order = `ORDER BY name ASC`;
+                // let options = await this.findDynamicOptions(data.sourceDetails.table);
+                let options = await this.findDynamicOptions(data.sourceDetails.table, null, null, null, order);
                 data.fieldParams = data.fieldParams || {};
                 data.fieldParams.options = options;
             }
@@ -949,7 +951,6 @@ export class PostgresFieldsService implements IServicelocatorfields {
 
         query = `SELECT *,COUNT(*) OVER() AS total_count FROM public."${tableName}" ${whereCond} ${orderCond} ${offsetCond} ${limitCond}`
 
-
         result = await this.fieldsRepository.query(query);
         if (!result) {
             return null;

diff --git a/src/adapters/postgres/user-adapter.ts b/src/adapters/postgres/user-adapter.ts
@@ -487,11 +487,11 @@ export class PostgresUserService implements IServicelocator {
 
       let errKeycloak = "";
       let resKeycloak = "";
-
       const keycloakResponse = await getKeycloakAdminToken();
       const token = keycloakResponse.data.access_token;
       let checkUserinKeyCloakandDb = await this.checkUserinKeyCloakandDb(userCreateDto)
       // let checkUserinDb = await this.checkUserinKeyCloakandDb(userCreateDto.username);
+
       if (checkUserinKeyCloakandDb) {
         return APIResponse.error(response, apiId, "Forbidden", `User Already Exist`, HttpStatus.FORBIDDEN);
       }