Skip to content

Develop to PROD #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ankush-maherwal merged 6 commits into from
Feb 10, 2025
Merged

Develop to PROD #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd43646
currenTRole
suraj-tekdi Feb 6, 2025
8a54df2
Merge pull request #152 from suraj-tekdi/develop
ankush-maherwal Feb 7, 2025
052e479
school_admin onbaording
suraj-tekdi Feb 7, 2025
11286db
Merge pull request #154 from suraj-tekdi/develop
ankush-maherwal Feb 7, 2025
16ec32b
deletion script updated
YoginiTayade Feb 7, 2025
6a437c8
Merge pull request #155 from YoginiTayade/deletion-updation
ankush-maherwal Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 104 additions & 31 deletions src/adapters/hasura/altBulkUploadTeacher.adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,52 +60,125 @@ export class ALTBulkUploadTeacherService {
teacher.groups = [];
let groupInfo;

for (let teacherClass of teacherClasses) {
console.log("teacherClass 64", teacherClass)
const academicYear = teacher.academicYear || new Date().getFullYear().toString();
const groupRes: any = await this.groupService.getGroupBySchoolClass(
if(teacher.currentRole === 'School_Admin') {
const academicYear = new Date().getFullYear().toString();
const academicYearList: any = [(parseInt(academicYear) - 1).toString(), academicYear]

console.log("academicYearList", academicYearList)

const getClassesbySchoolUdise = await this.groupService.getClassesbySchoolUdise(
request,
teacher.schoolUdise,
teacherClass,
academicYear
);
teacher.schoolUdise,
academicYearList
)

console.log("getClassesbySchoolUdise", getClassesbySchoolUdise)
const schoolAdminClasses: any = getClassesbySchoolUdise


console.log("groupRes", groupRes)
for (let teacherClass of schoolAdminClasses) {
console.log("teacherClass 64", teacherClass)
const className = teacherClass.name
//const academicYear = teacher.academicYear || new Date().getFullYear().toString();
// const groupRes: any = await this.groupService.getGroupBySchoolClass(
// request,
// teacher.schoolUdise,
// className,
// academicYear
// );

const groupId = teacherClass.groupId

console.log("groupId 92", groupId)

if (!groupId) {
errors.push({
name: teacher.name,
groupId,
});
} else {
groupInfo = teacherClass;
teacher.groups.push(groupId);
}
}

if (!groupRes.data[0].groupId) {
if (!teacher.groups.length) {
errors.push({
name: teacher.name,
groupRes,
msg: "No Group found",
});
} else {
groupInfo = groupRes;
teacher.groups.push(groupRes.data[0].groupId);
teacher.board = groupInfo.board;
teacher.password = getPassword(8);
teacher.status = true;
const teacherRes: any = await this.teacherService.createAndAddToGroup(
request,
teacher,
bulkToken
);
if (teacherRes?.statusCode === 200) {
responses.push(teacherRes.data);
} else {
errors.push({
name: teacher.name,
teacherRes,
});
}
}
}

if (!teacher.groups.length) {
errors.push({
name: teacher.name,
msg: "No Group found",
});
} else {
teacher.board = groupInfo.data[0].board;
teacher.password = getPassword(8);
teacher.status = true;
const teacherRes: any = await this.teacherService.createAndAddToGroup(
request,
teacher,
bulkToken
);
if (teacherRes?.statusCode === 200) {
responses.push(teacherRes.data);
} else {
for (let teacherClass of teacherClasses) {
console.log("teacherClass 64", teacherClass)
const academicYear = teacher.academicYear || new Date().getFullYear().toString();
const groupRes: any = await this.groupService.getGroupBySchoolClass(
request,
teacher.schoolUdise,
teacherClass,
academicYear
);

console.log("groupRes 73", groupRes)

if (!groupRes.data[0].groupId) {
errors.push({
name: teacher.name,
groupRes,
});
} else {
groupInfo = groupRes;
teacher.groups.push(groupRes.data[0].groupId);
}
}

if (!teacher.groups.length) {
errors.push({
name: teacher.name,
teacherRes,
msg: "No Group found",
});
} else {
teacher.board = groupInfo.data[0].board;
teacher.password = getPassword(8);
teacher.status = true;
const teacherRes: any = await this.teacherService.createAndAddToGroup(
request,
teacher,
bulkToken
);
if (teacherRes?.statusCode === 200) {
responses.push(teacherRes.data);
} else {
errors.push({
name: teacher.name,
teacherRes,
});
}
}

}




}

const result = {
Expand Down
2 changes: 2 additions & 0 deletions src/adapters/hasura/altTeacher.adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ export class ALTTeacherService {
teacherDto: TeacherDto,
bulkToken: string
) {

console.log("teacherDto 104", teacherDto)
const decoded: any = jwt_decode(request.headers.authorization);
const altUserRoles =
decoded["https://hasura.io/jwt/claims"]["x-hasura-allowed-roles"];
Expand Down
126 changes: 88 additions & 38 deletions src/adapters/hasura/altUser.adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { ALTUserUpdateDto } from "src/altUser/dto/alt-user-update.dto";
export class ALTHasuraUserService {
axios = require("axios");

constructor(private httpService: HttpService) { }
constructor(private httpService: HttpService) {}

public async getUser(userId: string, request: any) {
const decoded: any = jwt_decode(request.headers.authorization);
Expand Down Expand Up @@ -894,8 +894,9 @@ export class ALTHasuraUserService {
const [firstName, lastName] = obj.name.split(" ");

// Step 1: Extract initials
const initials = `${firstName[0].toLowerCase()}${lastName ? lastName[0].toLowerCase() : ""
}`;
const initials = `${firstName[0].toLowerCase()}${
lastName ? lastName[0].toLowerCase() : ""
}`;

const dob = obj.dateOfBirth
.trim()
Expand Down Expand Up @@ -1150,19 +1151,21 @@ export class ALTHasuraUserService {
decoded["https://hasura.io/jwt/claims"]["x-hasura-allowed-roles"];
const username = decoded.preferred_username;


// Fetch Teacher data with currentRole
if (roles[0] === 'teacher') {
console.log("fetchTeacherUserData")
if (roles[0] === "teacher") {
console.log("fetchTeacherUserData");

const userData = await this.fetchTeacherUserData(username, token, roles);
const userData = await this.fetchTeacherUserData(
username,
token,
roles
);
if (!userData) {
return this.sendErrorResponse(res, 404, "User not found or inactive");
}

// Send success response
return this.sendSuccessResponse(res, 200, "Authenticated", userData);

}

// Fetch user details from GraphQL
Expand Down Expand Up @@ -1256,9 +1259,9 @@ export class ALTHasuraUserService {

try {
const response = await this.axios(config);
console.log("response.data.data", response.data)
if(response.data.data.Users[0].role === 'teacher') {
return this.fetchTeacherRole(username, token, roles)
console.log("response.data.data", response.data);
if (response.data.data.Users[0].role === "teacher") {
return this.fetchTeacherRole(username, token, roles);
}
return response.data.data.Users || null;
} catch (error) {
Expand Down Expand Up @@ -1319,8 +1322,8 @@ export class ALTHasuraUserService {

try {
const response = await this.axios(config);
console.log("response.data.data", response.data)
console.log("response.data.data", response.data);

console.log("response.data.data", response.data);
return response.data.data.Users || null;
} catch (error) {
Expand Down Expand Up @@ -1548,17 +1551,58 @@ export class ALTHasuraUserService {
Authorization: `Bearer ${adminToken}`,
},
});
if (!userSearchResponse.data || userSearchResponse.data.length === 0) {
deletedRecords.push({
...recordStatus,
error: `User ${username} not found in Keycloak`,
});
continue;
}
// if (!userSearchResponse.data || userSearchResponse.data.length === 0) {
// deletedRecords.push({
// ...recordStatus,
// error: `User ${username} not found in Keycloak`,
// });
// continue;
// }
console.log("userSearchResponse->>", userSearchResponse.data);

const keycloakUserId = userSearchResponse.data[0].id;
let keycloakUserId = userSearchResponse?.data[0]?.id;

// If Keycloak user is not found, check in Hasura
if (!keycloakUserId) {
console.log(
`User ${username} not found in Keycloak, checking Hasura`
);
const hasuraQuery = {
query: `
query GetUser($username: String ) {
Users(where: {username: {_eq: $username}}){
userId
}
}`,
variables: { username },
};
const hasuraResponse = await this.axios({
method: "post",
url: process.env.HASURAURL,
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${userToken}`,
},
data: hasuraQuery,
});

if (
hasuraResponse.data &&
hasuraResponse.data.data &&
hasuraResponse.data.data.Users.length > 0
) {
keycloakUserId = hasuraResponse.data.data.Users[0].userId;
console.log(
`User ${username} found in Hasura with userId: ${keycloakUserId}`
);
} else {
deletedRecords.push({
...recordStatus,
error: `User ${username} not found in Keycloak or Hasura`,
});
continue;
}
}
// Delete from database
try {
for (const table of tables) {
Expand Down Expand Up @@ -1595,23 +1639,28 @@ export class ALTHasuraUserService {
continue;
}

// Delete from Keycloak
try {
await this.axios({
method: "delete",
url: `${searchUrl}/${keycloakUserId}`,
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${adminToken}`,
},
});
recordStatus.kcDeleted = true;
} catch (kcError) {
console.error(
`Keycloak deletion failed for user ${username}:`,
kcError.message
// Delete from Keycloak only if user was found there
if (userSearchResponse?.data.length > 0) {
try {
await this.axios({
method: "delete",
url: `${searchUrl}/${keycloakUserId}`,
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${adminToken}`,
},
});
recordStatus.kcDeleted = true;
} catch (kcError) {
console.error(
`Keycloak deletion failed for user ${username}:`,
kcError.message
);
}
} else {
console.log(
`Skipping Keycloak deletion for ${username} as user was not found there`
);
continue;
}

// Delete from telemetry
Expand All @@ -1621,7 +1670,8 @@ export class ALTHasuraUserService {
process.env.TELEMETRY_DB_URL ||
`postgres://${process.env.TELEMETRY_DB_USER}:${encodeURIComponent(
process.env.TELEMETRY_DB_PASSWORD
)}@${process.env.TELEMETRY_DB_HOST}:${process.env.TELEMETRY_DB_PORT
)}@${process.env.TELEMETRY_DB_HOST}:${
process.env.TELEMETRY_DB_PORT
}/${process.env.TELEMETRY_DB_NAME}?sslmode=disable`;

// Create a connection pool
Expand Down
Loading
Loading