@kth/om-kursen-ladok-client 1.1.0 → 1.1.2

package/dist/utils/programStrukturUtil.js

@@ -0,0 +1,191 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchProgramStructure = exports.fetchAndCategorizeStructure = exports.fetchCourseInstanses = exports.fetchCourseBoxes = exports.fetchStructureByInstansUid = exports.fetchStructureByTillfalleUid = exports.handleError = void 0;
+const mapStructureCourses_1 = require("../mapStructureCourses");
+const mapCourseInstans_1 = require("../mapCourseInstans");
+const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
+const studyYearUtil_1 = require("./studyYearUtil");
+const handleError = (message, error) => {
+    console.error(message, error);
+    return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) || 'Unknown error' };
+};
+exports.handleError = handleError;
+const fetchStructureByTillfalleUid = (uid, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    try {
+        const struktur = yield ladokClient.utbildningstillfalleStruktur(uid);
+        return ((_a = struktur === null || struktur === void 0 ? void 0 : struktur.data) === null || _a === void 0 ? void 0 : _a.Strukturdelar) || [];
+    }
+    catch (error) {
+        throw (0, exports.handleError)('Failed to fetch structure', error);
+    }
+});
+exports.fetchStructureByTillfalleUid = fetchStructureByTillfalleUid;
+const fetchStructureByInstansUid = (uid, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    try {
+        const struktur = yield ladokClient.utbildningsinstansStruktur(uid);
+        return ((_a = struktur === null || struktur === void 0 ? void 0 : struktur.data) === null || _a === void 0 ? void 0 : _a.Strukturdelar) || [];
+    }
+    catch (error) {
+        throw (0, exports.handleError)('Failed to fetch structure', error);
+    }
+});
+exports.fetchStructureByInstansUid = fetchStructureByInstansUid;
+const fetchCourseBoxes = (utbildningsbasUIDn, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const moduler = yield Promise.all(utbildningsbasUIDn.map((utbildningsbasUID) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                const utbildningsinstans = yield ladokClient.utbildningstillfalle(utbildningsbasUID);
+                return utbildningsinstans.data;
+            }
+            catch (error) {
+                throw (0, exports.handleError)(`Error fetching module for utbildningsbasUID ${utbildningsbasUID}:`, error);
+            }
+        })));
+        return moduler.filter(module => module !== null);
+    }
+    catch (error) {
+        throw (0, exports.handleError)('Failed to fetch modules', error);
+    }
+});
+exports.fetchCourseBoxes = fetchCourseBoxes;
+const fetchCourseInstanses = (utbildningsinstansUIDn, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const moduler = yield Promise.all(utbildningsinstansUIDn.map((utbildningsinstansUID) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                const utbildningsinstans = yield ladokClient.utbildningsinstans(utbildningsinstansUID);
+                return utbildningsinstans.data;
+            }
+            catch (error) {
+                throw (0, exports.handleError)(`Error fetching module for utbildningsinstansUID ${utbildningsinstansUID}:`, error);
+            }
+        })));
+        return moduler.filter(module => module !== null);
+    }
+    catch (error) {
+        throw (0, exports.handleError)('Failed to fetch utbildningsinstanses', error);
+    }
+});
+exports.fetchCourseInstanses = fetchCourseInstanses;
+const fetchAndCategorizeStructure = (utbildningstillfalleUID, language, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
+    const strukturDelar = yield (0, exports.fetchStructureByTillfalleUid)(utbildningstillfalleUID, ladokClient);
+    const categoryMap = {
+        'Villkorligt valfria': 'VV',
+        'RECOMMENDED COURSES': 'R',
+        'RECOMMENDED COURSE': 'R',
+        'REKOMMENDERADE KURSER': 'R',
+        'REKOMMENDERADE KURSE': 'R',
+        'REKOMMENDERAD KURS': 'R',
+        'ELECTIVE COURSES': 'V',
+        'ELECTIVE COURSE': 'V',
+        'VALFRIA KURSER': 'V',
+        'VALFRI KURS': 'V',
+    }; // TODO - this has been created based on the test data that we have, it needs to be verified and updated after having the actual user stories
+    const categorizedStrukturDelar = strukturDelar.map(strukturdel => {
+        if (!strukturdel.Valinformation) {
+            return Object.assign(Object.assign({}, strukturdel), { Valvillkor: 'O' }); // Default to Obligatory
+        }
+        const engDescription = strukturdel.Valinformation.EngelskBeskrivning || '';
+        const sweDescription = strukturdel.Valinformation.SvenskBeskrivning || '';
+        const category = categoryMap[engDescription.toUpperCase()] || categoryMap[sweDescription.toUpperCase()] || 'O';
+        return Object.assign(Object.assign({}, strukturdel), { Valvillkor: category });
+    });
+    const utbildningsbasUIDn = categorizedStrukturDelar.map(strukturdel => strukturdel.UtbildningsbasUID);
+    const courseEntities = yield (0, exports.fetchCourseBoxes)(utbildningsbasUIDn, ladokClient);
+    const mappedCourseEntities = courseEntities.map(entity => (0, mapStructureCourses_1.mapStructureCourses)(entity, language));
+    const utbildningsinstansUIDn = mappedCourseEntities.map(entity => entity.utbildningsinstansUid);
+    const courseInstanses = yield (0, exports.fetchCourseInstanses)(utbildningsinstansUIDn, ladokClient);
+    const mappedCourseInstanses = courseInstanses.map(instans => (0, mapCourseInstans_1.mapCourseInstans)(instans, language));
+    const categorizedCourseEntities = mappedCourseInstanses.map((entity, index) => {
+        var _a;
+        const kategori = (_a = categorizedStrukturDelar[index]) === null || _a === void 0 ? void 0 : _a.Valvillkor;
+        return Object.assign(Object.assign(Object.assign({}, mappedCourseEntities[index]), mappedCourseInstanses[index]), { Valvillkor: kategori });
+    });
+    return categorizedCourseEntities;
+});
+exports.fetchAndCategorizeStructure = fetchAndCategorizeStructure;
+const fetchProgramStructure = (utbildningstillfalleUID, language, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const programDetails = yield ladokClient.utbildningstillfalle(utbildningstillfalleUID);
+        if (programDetails.type === 'error') {
+            throw new Error(`API error: ${programDetails.responseInfo.message}`);
+        }
+        const instansUid = (0, ladok_attributvarde_utils_1.extractString)(programDetails.data.Attributvarden, 'utbildningsinstans.uid');
+        console.log('this is:', instansUid);
+        const omfattning = programDetails.data.Tillfallesperioder.reduce((sum, period) => sum + period.Omfattningsvarde, 0);
+        const startperiod = (0, ladok_attributvarde_utils_1.extractGrunddata)(programDetails.data.Attributvarden, 'utbildning.attribut.startperiod');
+        const lengthInStudyYears = Math.ceil(Number(omfattning) / 60);
+        const categorizedCourseEntities = yield (0, exports.fetchAndCategorizeStructure)(utbildningstillfalleUID, language, ladokClient);
+        const periodData = yield ladokClient.period();
+        if (periodData.type === 'error') {
+            throw new Error(`API error: ${periodData.responseInfo.message}`);
+        }
+        const mainStudyYears = (0, studyYearUtil_1.generateStudyYearData)(categorizedCourseEntities, periodData.data.Period, startperiod === null || startperiod === void 0 ? void 0 : startperiod.code, lengthInStudyYears);
+        const specializationStrukturDelar = yield (0, exports.fetchStructureByInstansUid)(instansUid, ladokClient);
+        const utbildningsbasUIDn = specializationStrukturDelar.map(strukturdel => strukturdel.UtbildningsbasUID);
+        let specializatons = yield Promise.all(utbildningsbasUIDn.map((utbildningsbasUID) => __awaiter(void 0, void 0, void 0, function* () {
+            const utbildningsinstans = yield ladokClient.utbildningsinstans(utbildningsbasUID);
+            return utbildningsinstans.data;
+        })));
+        specializatons = specializatons.filter(specializaton => specializaton !== null);
+        const mappedSpecializatons = specializatons.map(entity => (0, mapCourseInstans_1.mapCourseInstans)(entity, language));
+        function getStudyYearForSpecializationFilter(startPeriod) {
+            const year = parseInt(startPeriod.substring(2));
+            if (startPeriod.startsWith('VT')) {
+                return `VT${year}`;
+            }
+            else if (startPeriod.startsWith('HT')) {
+                return `HT${year},VT${year + 1}`;
+            }
+            return '';
+        }
+        const tillfalleUids = yield Promise.all(mappedSpecializatons.map((specialization) => __awaiter(void 0, void 0, void 0, function* () {
+            var _a, _b;
+            const requestObject = {
+                kodEllerBenamning: specialization.kod,
+                startPeriod: getStudyYearForSpecializationFilter(startperiod === null || startperiod === void 0 ? void 0 : startperiod.code),
+                striktKod: 'true',
+            };
+            const tillfalle = yield ladokClient.sokUtbildningsTillfalle(requestObject);
+            return (_b = (_a = tillfalle === null || tillfalle === void 0 ? void 0 : tillfalle.items) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.tillfalle_uid;
+        })));
+        const curriculums = [];
+        curriculums.push({
+            studyYears: mainStudyYears,
+        });
+        let specializatonsCategorizedCourseEntities = yield Promise.all(tillfalleUids.map((tillfalleUid) => __awaiter(void 0, void 0, void 0, function* () {
+            if (tillfalleUid) {
+                const studyYear = yield (0, exports.fetchAndCategorizeStructure)(tillfalleUid, language, ladokClient);
+                return studyYear;
+            }
+            else {
+                return [];
+            }
+        })));
+        mappedSpecializatons.forEach((specialization, index) => {
+            curriculums.push({
+                studyYears: (0, studyYearUtil_1.generateStudyYearData)(specializatonsCategorizedCourseEntities[index], periodData.data.Period, startperiod === null || startperiod === void 0 ? void 0 : startperiod.code, lengthInStudyYears),
+                programmeSpecialization: {
+                    programmeSpecializationCode: specialization.kod,
+                    title: specialization.benamning,
+                },
+            });
+        });
+        return curriculums;
+    }
+    catch (error) {
+        throw (0, exports.handleError)('Unexpected error during processing', error);
+    }
+});
+exports.fetchProgramStructure = fetchProgramStructure;
+//# sourceMappingURL=programStrukturUtil.js.map

package/dist/utils/programStrukturUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"programStrukturUtil.js","sourceRoot":"","sources":["../../src/utils/programStrukturUtil.ts"],"names":[],"mappings":"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"}

package/dist/utils/studyYearUtil.d.ts

@@ -0,0 +1,25 @@
+import { PeriodItem } from '@kth/ladok-mellanlager-client/dist/types/endpoints/period';
+type CourseData = {
+    kod: string;
+    benamning: string;
+    Valvillkor: string;
+    omfattning: {
+        number: number;
+        formattedWithUnit: string;
+    };
+    startperiod?: {
+        code: string;
+    } | undefined;
+    Tillfallesperioder: {
+        SistaUndervisningsdatum: string;
+    }[];
+    uid: string;
+    utbildningsinstansUid: string;
+};
+type StudyYear = {
+    yearNumber: number;
+    courses: CourseData[];
+};
+export declare const getStudyYear: (periodEndDate: string, periodDetails: PeriodItem[], mainStartPeriod: string) => number;
+export declare const generateStudyYearData: (coursesData: CourseData[], periodDetails: PeriodItem[], mainStartPeriod: string, lengthStudyYear: number) => StudyYear[];
+export {};

package/dist/utils/studyYearUtil.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateStudyYearData = exports.getStudyYear = void 0;
+const date_fns_1 = require("date-fns");
+const getStudyYear = (periodEndDate, periodDetails, mainStartPeriod) => {
+    const mainStartYear = parseInt(mainStartPeriod.slice(2), 10);
+    const mainIsAutumn = mainStartPeriod.startsWith('HT');
+    const matchedPeriod = periodDetails.find(p => (0, date_fns_1.parseISO)(p.FromDatum) <= (0, date_fns_1.parseISO)(periodEndDate) &&
+        (0, date_fns_1.parseISO)(p.TomDatum) >= (0, date_fns_1.parseISO)(periodEndDate) &&
+        (p.Kod.includes('VT') || p.Kod.includes('HT')));
+    if (!matchedPeriod)
+        throw new Error('No matching period found');
+    const year = parseInt(matchedPeriod.Kod.slice(2), 10);
+    const isAutumn = matchedPeriod.Kod.startsWith('HT');
+    const startStudyYear = isAutumn ? year : year - 1;
+    const baseYear = mainIsAutumn ? mainStartYear : mainStartYear - 1;
+    return startStudyYear - baseYear + 1;
+};
+exports.getStudyYear = getStudyYear;
+const generateStudyYearData = (coursesData, periodDetails, mainStartPeriod, lengthStudyYear) => {
+    const studyYears = {};
+    coursesData.forEach(course => {
+        const studyYearToPeriods = {};
+        course.Tillfallesperioder.forEach(period => {
+            const studyYear = (0, exports.getStudyYear)(period.SistaUndervisningsdatum, periodDetails, mainStartPeriod);
+            if (studyYear >= 1 && studyYear <= lengthStudyYear) {
+                if (!studyYearToPeriods[studyYear]) {
+                    studyYearToPeriods[studyYear] = [];
+                }
+                studyYearToPeriods[studyYear].push(period);
+            }
+        });
+        // Assign each course to its respective study years with only relevant Tillfallesperioder
+        Object.entries(studyYearToPeriods).forEach(([yearStr, filteredPeriods]) => {
+            const year = Number(yearStr);
+            if (!studyYears[year])
+                studyYears[year] = [];
+            studyYears[year].push(Object.assign(Object.assign({}, course), { Tillfallesperioder: filteredPeriods }));
+        });
+    });
+    // Ensure all study years are present in the final array
+    return Array.from({ length: lengthStudyYear }, (_, i) => ({
+        yearNumber: i + 1,
+        courses: studyYears[i + 1] || [],
+    }));
+};
+exports.generateStudyYearData = generateStudyYearData;
+//# sourceMappingURL=studyYearUtil.js.map

package/dist/utils/studyYearUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"studyYearUtil.js","sourceRoot":"","sources":["../../src/utils/studyYearUtil.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kth/om-kursen-ladok-client",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Om kursen specific logic and mappings, uses both @kth/ladok-mellanlager-client and @kth/ladok-attributevarde-utils.",
   "main": "dist/index.js",
   "files": [
@@ -21,7 +21,9 @@
     "build:publish": "npm install --no-workspaces && npm run build"
   },
   "dependencies": {
-    "@kth/ladok-attributvarde-utils": "0.0.10",
-    "@kth/ladok-mellanlager-client": "0.1.0"
+    "@kth/ladok-attributvarde-utils": "0.0.11",
+    "@kth/ladok-mellanlager-client": "0.1.2",
+    "date-fns": "^4.1.0",
+    "showdown": "^2.1.0"
   }
 }