Skip to content
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

Jump to bottom

Updates to endpoints #1970

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Updates to endpoints #1970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca1bda3
Updates to endpoints
SodhiA1 Oct 16, 2024
930505c
Update sdc.js
SodhiA1 Oct 16, 2024
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
25 changes: 8 additions & 17 deletions backend/src/components/sdc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
const { getAccessToken, handleExceptionResponse, getData, postData, putData, getDataWithParams, deleteData, formatNumberOfCourses, stripNumberFormattingNumberOfCourses,
const { getAccessToken, handleExceptionResponse, getData, postData, putData, getDataWithParams, formatNumberOfCourses, stripNumberFormattingNumberOfCourses,
getCreateOrUpdateUserValue} = require('./utils');
const { edxUserHasAccessToInstitute } = require('./permissionUtils');
const HttpStatus = require('http-status-codes');
Expand Down Expand Up @@ -363,23 +363,15 @@ async function updateAndValidateSdcSchoolCollectionStudent(req, res) {

}

async function deleteSDCSchoolCollectionStudent(req, res) {
try {
log.info('User :: ' + getCreateOrUpdateUserValue(req) + ' is removing SDC student :: ' + req.params.sdcSchoolCollectionStudentID);
const token = getAccessToken(req);
let deletedSdcSchoolCollectionStudentData = await deleteData(token, `${config.get('sdc:schoolCollectionStudentURL')}/${req.params.sdcSchoolCollectionStudentID}`, req.session?.correlationID);
return res.status(HttpStatus.OK).json(deletedSdcSchoolCollectionStudentData);
} catch (e) {
log.error('Error deleting SDC School Collection Student.', e.stack);
return handleExceptionResponse(e, res);
}
}

async function removeSDCSchoolCollectionStudents(req, res) {
try {
log.info('EDX User :: ' + getCreateOrUpdateUserValue(req) + ' is removing SDC students :: ' + JSON.stringify(req.body));
const token = getAccessToken(req);
let deletedSdcSchoolCollectionStudentData = await postData(token, req.body, `${config.get('sdc:schoolCollectionStudentURL')}/soft-delete-students`);
let payload = {
softDeleteStudentIDs: req.body,
updateUser: getCreateOrUpdateUserValue(req)
}
log.info('EDX User :: ' + getCreateOrUpdateUserValue(req) + ' is removing SDC students :: ' + JSON.stringify(payload));
let deletedSdcSchoolCollectionStudentData = await postData(token, payload, `${config.get('sdc:schoolCollectionStudentURL')}/soft-delete-students`);
return res.status(HttpStatus.OK).json(deletedSdcSchoolCollectionStudentData);
} catch (e) {
log.error('Error deleting SDC School Collection Students.', e.stack);
Expand Down Expand Up @@ -1121,7 +1113,7 @@ async function resolveDuplicates(req, res) {
student.sdcSchoolCollectionStudentEnrolledPrograms = null;
});

const data = await postData(token, payload, `${config.get('sdc:sdcDuplicateURL')}/${req.params.sdcDuplicateID}/type/${req.params.type}`, req.session?.correlationID);
const data = await postData(token, payload, `${config.get('sdc:sdcDuplicateURL')}/type/${req.params.type}`, req.session?.correlationID);
await redisUtil.unlockSdcDuplicateBeingProcessedInRedis(duplicateLock);
return res.status(HttpStatus.OK).json(data);
} catch (e) {
Expand Down Expand Up @@ -1279,7 +1271,6 @@ module.exports = {
getSDCSchoolCollectionStudentSummaryCounts,
getSDCSchoolCollectionStudentDetail,
updateAndValidateSdcSchoolCollectionStudent,
deleteSDCSchoolCollectionStudent,
markSdcSchoolCollectionStudentAsDifferent,
getStudentHeadcounts,
getSdcSchoolCollectionMonitoringBySdcDistrictCollectionId,
Expand Down
5 changes: 3 additions & 2 deletions backend/src/routes/sdc.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/src/components/common/DuplicateTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ export default defineComponent({
resolveEnrollmentDuplicateViaRemove(duplicate, sdcSchoolCollectionStudent) {
this.selectedDuplicate = duplicate;
this.selectedSdcSchoolCollectionStudent = sdcSchoolCollectionStudent;
this.$refs.resolveEnrollmentDuplicateViaRemoveStudent.removeAndResolveStudent(duplicate, sdcSchoolCollectionStudent);
this.$refs.resolveEnrollmentDuplicateViaRemoveStudent.removeAndResolveStudent(sdcSchoolCollectionStudent);
},
closeAndRefreshDuplicates() {
this.openProgramResolutionView = false;
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/components/common/EditStudent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,10 @@ export default {
}
this.loadingCount += 1;
this.hasError = false;
ApiService.apiAxios.delete(`${ApiRoutes.sdc.SDC_SCHOOL_COLLECTION_STUDENT}/${this.selectedSdcStudentID}`, this.sdcSchoolCollectionStudentDetailCopy)
let studentToRemove = [];
studentToRemove.push(this.selectedSdcStudentID);

ApiService.apiAxios.post(`${ApiRoutes.sdc.SDC_SCHOOL_COLLECTION_STUDENT}/${this.sdcSchoolCollectionStudentDetailCopy.sdcSchoolCollectionID}/students/remove`, studentToRemove)
.then(() => {
this.removeIndex = this.selectedStudents.findIndex(value => value === this.selectedSdcStudentID);
this.selectedStudents.splice(this.removeIndex, 1);
Expand Down
11 changes: 5 additions & 6 deletions ...ts/sdcCollection/sdcDistrictCollection/duplicates/EnrollmentDuplicateResolveViaRemove.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,16 @@ export default {
},
methods: {
displayName,
async removeAndResolveStudent(duplicate, sdcSchoolCollectionStudent) {
async removeAndResolveStudent(sdcSchoolCollectionStudent) {
this.sdcSchoolCollectionStudent = sdcSchoolCollectionStudent;
let studentToRemove = [];
studentToRemove.push(this.sdcSchoolCollectionStudent.sdcSchoolCollectionStudentID);

const confirmation = await this.$refs.confirmResolveEnrollmentDuplicateViaRemoveStudent.open('Remove Student', null, {color: '#fff', width: 580, closeIcon: false, subtitle: false, dark: false, resolveText: 'Remove', rejectText: 'Cancel'});
if (!confirmation) {
return;
}
let payload = {
students: [this.sdcSchoolCollectionStudent],
duplicate: duplicate
};
ApiService.apiAxios.post(ApiRoutes.sdc.SDC_DUPLICATE_RESOLVE + '/'+ duplicate?.sdcDuplicateID + '/DELETE_ENROLLMENT_DUPLICATE', payload)
ApiService.apiAxios.post(`${ApiRoutes.sdc.SDC_SCHOOL_COLLECTION_STUDENT}/${this.sdcSchoolCollectionStudent.sdcSchoolCollectionID}/students/remove`, studentToRemove)
.then(() => {
setSuccessAlert('Success! The student has been removed.');
}).catch(error => {
Expand Down
Loading