Fixes for challenge report UI.

Author: arcshiftsolutions

backend/src/components/assessments/assessments.js

@@ -153,7 +153,6 @@ async function postAssessmentStudent(req, res) {
     };
     payload.studentStatusCode = 'ACTIVE';
     const token = getAccessToken(req);
-    console.log(JSON.stringify(payload));
     const result = await postData(token, payload, `${config.get('assessments:assessmentStudentsURL')}`, req.session?.correlationID);
     return res.status(HttpStatus.OK).json(result);
   } catch (e) {

backend/src/components/challengeReports.js

@@ -4,6 +4,7 @@ const HttpStatus = require('http-status-codes');
 const log = require('./logger');
 const config = require('../config');
 const {getSchoolBySchoolID, getDistrictByDistrictID} = require('./cache-service');
+const cacheService = require('./cache-service');
 
 async function getActiveChallengeReportsPeriod(req, res) {
   try {
@@ -31,10 +32,19 @@ async function getActiveChallengeReportsPeriod(req, res) {
 async function downloadDistrictChallengeReport(req, res) {
   try {
     const token = getAccessToken(req);
+
+    let district = cacheService.getDistrictByDistrictID(req.params.districtID);
+    if(!district || district.districtID !== req.session.activeInstituteIdentifier){
+      return res.status(HttpStatus.BAD_REQUEST).json({ message: 'Invalid district provided' });
+    }
+    
     const url = `${config.get('challengeReports:rootURL')}/district/${req.params.districtID}/download`;
     const data = await getData(token, url);
 
-    const fileDetails = { contentType: 'text/csv' };
+    console.log('District: ' + JSON.stringify(district));
+    let reportType = req.query.isPrelim === true ? 'PRELIM_DISTRICT_REPORT' : 'FINAL_DISTRICT_REPORT';
+    
+    const fileDetails = getFileDetails(reportType, district.districtNumber, req.query.period);
     setResponseHeaders(res, fileDetails);
     const buffer = Buffer.from(data.documentData, 'base64');
 
@@ -83,7 +93,8 @@ async function createSchoolCountList(schoolsWithCounts){
   }));
 }
 
-function setResponseHeaders(res, {contentType }) {
+function setResponseHeaders(res, { filename, contentType }) {
+  res.setHeader('Content-Disposition', `attachment; filename=${filename}`);
   res.setHeader('Content-Type', contentType);
 }
 
@@ -97,6 +108,15 @@ function formatCompletionDate(rawDate) {
   return `${year}/${month}/${day}`;
 }
 
+function getFileDetails(reportType, district, session) {
+  const mappings = {
+    'PRELIM_DISTRICT_REPORT': { filename: `SD ${district} Preliminary District Level Funding Report For Course Challenges ${session}.csv`, contentType: 'text/csv' },
+    'FINAL_DISTRICT_REPORT': { filename: `SD ${district} District Level Funding Report For Course Challenges ${session}.csv`, contentType: 'text/csv' },
+    'DEFAULT': { filename: 'download.pdf', contentType: 'application/pdf' }
+  };
+  return mappings[reportType] || mappings['DEFAULT'];
+}
+
 module.exports = {
   getActiveChallengeReportsPeriod,
   downloadDistrictChallengeReport,

backend/src/routes/challengeReports.js

@@ -15,7 +15,7 @@ router.get('/active-period', passport.authenticate('jwt', {session: false}, unde
 router.get('/:districtID', passport.authenticate('jwt', {session: false}, undefined), isValidBackendToken, validateAccessToken, checkEdxUserPermission(PERMISSION.CHALLENGE_REPORTS),
   validate(getChallengeReportDownloadSchema), getDistrictChallengeReportsCounts);
 
-router.get('/:districtID/download', passport.authenticate('jwt', {session: false}, undefined), isValidBackendToken, validateAccessToken, checkEdxUserPermission(PERMISSION.CHALLENGE_REPORTS),
+router.get('/:districtID/download', isValidBackendToken, validateAccessToken, checkEdxUserPermission(PERMISSION.CHALLENGE_REPORTS),
   validate(getChallengeReportDownloadSchema), downloadDistrictChallengeReport);
 
 module.exports = router;

backend/src/validations/challengeReports.js

@@ -1,4 +1,4 @@
-const { object, string} = require('yup');
+const { object, string, boolean} = require('yup');
 
 const getChallengeReportPeriodSchema = object({
   body: object().noUnknown(),
@@ -11,7 +11,10 @@ const getChallengeReportDownloadSchema = object({
   params: object({
     districtID: string()
   }).noUnknown(),
-  query: object().noUnknown()
+  query: object({
+    isPrelim: boolean(),
+    period: string()
+  }).noUnknown()
 }).noUnknown();
 
 

frontend/src/components/challengeReports/ChallengeReports.vue

@@ -131,7 +131,6 @@ const REPORT_STATUS_FINAL = 'Final';
 
 import ApiService from '../../common/apiService';
 import { ApiRoutes } from '../../utils/constants';
-import { setSuccessAlert } from '../composable/alertComposable';
 import DownloadLink from '../common/DownloadLink.vue';
 import alertMixin from '../../mixins/alertMixin';
 import {sortBy} from 'lodash';
@@ -281,39 +280,12 @@ export default {
         });
     },
     downloadDistrictReport() {
-      ApiService.apiAxios
-        .get(`${ApiRoutes.challengeReports.BASE_URL}/${this.districtID}/download`)
-        .then((response) => {
-          if (response.data && response.data.type === 'Buffer' && Array.isArray(response.data.data)) {
-            const byteArray = new Uint8Array(response.data.data);
-            const blob = new Blob([byteArray], { type: 'text/csv' });
-            const link = document.createElement('a');
-            link.href = URL.createObjectURL(blob);
-
-            if (this.activePeriod.challengeReportsSessionStatus === REPORT_STATUS_PRELIMINARY) {
-              link.download = `Preliminary District Level Funding Report for Course Challenges ${this.startingYear}-${this.endingYear}.csv`;
-            } else {
-              link.download = `District Level Funding Report for Course Challenges ${this.startingYear}-${this.endingYear}.csv`;
-            }
-
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-            URL.revokeObjectURL(link.href);
-            setSuccessAlert('Challenge Report downloaded successfully.');
-          } else {
-            console.error('Unexpected response format for file download:', response.data);
-            this.setFailureAlert('Failed to process the report data. Unexpected format.');
-          }
-        })
-        .catch((error) => {
-          console.error(error);
-          this.setFailureAlert(
-            error?.response?.data?.message
-              ? error?.response?.data?.message
-              : 'An error occurred while trying to retrieve your district\'s report.'
-          );
-        });
+      let isPrelim = false;
+      if(this.activePeriod.challengeReportsSessionStatus === REPORT_STATUS_PRELIMINARY){
+        isPrelim = true;
+      }
+      let url = `${ApiRoutes.challengeReports.BASE_URL}/${this.districtID}/download?isPrelim=${isPrelim}&period=${this.startingYear}/${this.endingYear}`;
+      window.open(url);
     },
     showTooltip() {
       this.tooltipWidth = this.$refs.chipRef.$el.offsetWidth + 'px';