Merge pull request #8 from Xitija/student-user-apis

Task #204445: User API refactoring
transform1234 · Sep 14, 2023 · 5e39f0b · 5e39f0b
2 parents 5877da8 + a445b7b
commit 5e39f0b
Show file tree

Hide file tree

Showing 15 changed files with 1,031 additions and 39 deletions.
diff --git a/src/adapters/hasura/adapter.utils.ts b/src/adapters/hasura/adapter.utils.ts
@@ -19,6 +19,13 @@ function getUserGroup(role: string) {
   }
 }
 
+function getUsername(obj: any) {
+  return (
+    obj.name.toLowerCase().replace(/ /g, "") +
+    obj.dateOfBirth.replace(/\-/g, "")
+  );
+}
+
 async function getToken() {
   const axios = require("axios");
   const qs = require("qs");
@@ -92,7 +99,8 @@ async function createUserInKeyCloak(query, token) {
   try {
     userResponse = await axios(config);
   } catch (e) {
-    console.log(e);
+    console.log(e, "Keycloak Creation error");
+    return e;
   }
 
   const userString = userResponse.headers.location;
@@ -102,4 +110,10 @@ async function createUserInKeyCloak(query, token) {
   return result;
 }
 
-export { getUserGroup, getUserRole, getToken, createUserInKeyCloak };
+export {
+  getUserGroup,
+  getUserRole,
+  getToken,
+  createUserInKeyCloak,
+  getUsername,
+};
diff --git a/src/adapters/hasura/altStudent.adapter.ts b/src/adapters/hasura/altStudent.adapter.ts
@@ -4,19 +4,14 @@ import jwt_decode from "jwt-decode";
 import { SuccessResponse } from "src/success-response";
 import { StudentDto } from "src/altStudent/dto/alt-student.dto";
 import { ErrorResponse } from "src/error-response";
-import { HasuraUserService } from "./user.adapter";
-import {
-  getUserGroup,
-  getUserRole,
-  getToken,
-  createUserInKeyCloak,
-} from "./adapter.utils";
+import { getUserRole } from "./adapter.utils";
+import { ALTHasuraUserService } from "./altUser.adapter";
 
 @Injectable()
 export class ALTStudentService {
   constructor(
     private httpService: HttpService,
-    private userService: HasuraUserService
+    private userService: ALTHasuraUserService
   ) {}
 
   baseURL = process.env.ALTHASURA;
@@ -103,6 +98,10 @@ export class ALTStudentService {
     const creatorUserId =
       decoded["https://hasura.io/jwt/claims"]["x-hasura-user-id"];
 
+    studentDto.createdBy = creatorUserId;
+    studentDto.updatedBy = creatorUserId;
+    studentDto.role = "student";
+
     if (altUserRoles.includes("systemAdmin")) {
       const createdUser: any = await this.userService.createUser(
         request,
@@ -111,9 +110,7 @@ export class ALTStudentService {
 
       if (createdUser.statusCode === 200) {
         studentDto.userId = createdUser.data.userId;
-        studentDto.createdBy = creatorUserId;
-        studentDto.updatedBy = creatorUserId;
-        const studentSchema = new StudentDto(studentDto,false);
+        const studentSchema = new StudentDto(studentDto, false);
         let query = "";
 
         Object.keys(studentDto).forEach((e) => {
@@ -139,6 +136,9 @@ export class ALTStudentService {
             insert_Students_one(object: {${query}}) {
              studentId
              userId
+             user {
+              username
+            }
             }
           }
           `,
@@ -161,6 +161,7 @@ export class ALTStudentService {
         const response = await this.axios(config);
 
         if (response?.data?.errors) {
+          console.log(response.data.errors);
           return new ErrorResponse({
             errorCode: response.data.errors[0].extensions,
             errorMessage: response.data.errors[0].message,
@@ -174,6 +175,11 @@ export class ALTStudentService {
             data: result,
           });
         }
+      } else {
+        return new ErrorResponse({
+          errorCode: "500",
+          errorMessage: createdUser?.errorMessage,
+        });
       }
     } else {
       return new ErrorResponse({
@@ -215,7 +221,7 @@ export class ALTStudentService {
         // createdAt: item?.created ? `${item.created}` : "",
         // updatedAt: item?.updated ? `${item.updated}` : "",
       };
-      return new StudentDto(studentMapping,true);
+      return new StudentDto(studentMapping, true);
     });
 
     return studentResponse;