@kth/om-kursen-ladok-client 2.3.2 → 2.4.0

package/dist/mapSearchResult.js

@@ -6,29 +6,29 @@ const languageUtil_1 = require("./utils/languageUtil");
 const utils_1 = require("./utils");
 const creditsUtil_1 = require("./utils/creditsUtil");
 const schoolUtil_1 = require("./utils/schoolUtil");
-// TODO Benni this should be refactored together with mapCourseRound
-const mapKursTillfalleResult = (courseRound, language) => {
+// TODO Benni this should be refactored together with mapCourseInstance
+const mapKursTillfalleResult = (courseInstance, language) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const benamning = {
-        sv: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.svensk.benamning'),
-        en: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
+        sv: (0, ladok_attributvarde_utils_1.extractString)(courseInstance.instans.Attributvarden, 'utbildning.attribut.svensk.benamning'),
+        en: (0, ladok_attributvarde_utils_1.extractString)(courseInstance.instans.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
     };
-    const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(courseRound.Attributvarden);
-    const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(((_a = courseRound.instans) === null || _a === void 0 ? void 0 : _a.Attributvarden) || courseRound.Attributvarden);
-    const studieort = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseRound.Attributvarden, 'utbildning.attribut.studieort');
-    const undervisningssprak = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseRound.Attributvarden, 'utbildning.attribut.undervisningssprak');
+    const organisation = (0, ladok_attributvarde_utils_1.extractOrganisation)(courseInstance.Attributvarden);
+    const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(((_a = courseInstance.instans) === null || _a === void 0 ? void 0 : _a.Attributvarden) || courseInstance.Attributvarden);
+    const studieort = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseInstance.Attributvarden, 'utbildning.attribut.studieort');
+    const undervisningssprak = (0, ladok_attributvarde_utils_1.extractGrunddata)(courseInstance.Attributvarden, 'utbildning.attribut.undervisningssprak');
     const malgrupp = {
-        sv: (0, ladok_attributvarde_utils_1.extractString)(courseRound.Attributvarden, 'utbildning.lokalt.attribut.29.malgrupp.sv', 'html'),
-        en: (0, ladok_attributvarde_utils_1.extractString)(courseRound.Attributvarden, 'utbildning.lokalt.attribut.29.malgrupp.en', 'html'),
+        sv: (0, ladok_attributvarde_utils_1.extractString)(courseInstance.Attributvarden, 'utbildning.lokalt.attribut.29.malgrupp.sv', 'html'),
+        en: (0, ladok_attributvarde_utils_1.extractString)(courseInstance.Attributvarden, 'utbildning.lokalt.attribut.29.malgrupp.en', 'html'),
     };
-    const startperiod = (0, ladok_attributvarde_utils_1.extractStartPeriod)(courseRound.Attributvarden);
-    const studietakt = (0, ladok_attributvarde_utils_1.extractStudietakt)(courseRound.Attributvarden);
+    const startperiod = (0, ladok_attributvarde_utils_1.extractStartPeriod)(courseInstance.Attributvarden);
+    const studietakt = (0, ladok_attributvarde_utils_1.extractStudietakt)(courseInstance.Attributvarden);
     const schoolCode = (0, schoolUtil_1.extractSchoolCodeFromOrganisation)(organisation, language);
-    const omfattning = (_b = (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _b !== void 0 ? _b : '';
-    const isMiljo = (0, ladok_attributvarde_utils_1.extractIsMiljo)(courseRound.instans.Attributvarden);
+    const omfattning = (_b = (0, ladok_attributvarde_utils_1.extractString)(courseInstance.instans.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _b !== void 0 ? _b : '';
+    const isMiljo = (0, ladok_attributvarde_utils_1.extractIsMiljo)(courseInstance.instans.Attributvarden);
     return {
-        versionsnummer: (0, ladok_attributvarde_utils_1.extractVersionNumber)(courseRound.instans.Attributvarden),
-        kod: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.kod'),
+        versionsnummer: (0, ladok_attributvarde_utils_1.extractVersionNumber)(courseInstance.instans.Attributvarden),
+        kod: (0, ladok_attributvarde_utils_1.extractString)(courseInstance.instans.Attributvarden, 'utbildning.attribut.kod'),
         benamning: (_c = benamning[language]) !== null && _c !== void 0 ? _c : '',
         omfattning: {
             number: omfattning,
@@ -46,17 +46,17 @@ const mapKursTillfalleResult = (courseRound, language) => {
         },
         period: {
             startperiod: (startperiod === null || startperiod === void 0 ? void 0 : startperiod.code) || '',
-            forstaUndervisningsdatum: Object.assign({ date: (_d = courseRound.Tillfallesperioder.at(0)) === null || _d === void 0 ? void 0 : _d.ForstaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_e = courseRound.Tillfallesperioder.at(0)) === null || _e === void 0 ? void 0 : _e.ForstaUndervisningsdatum), {
+            forstaUndervisningsdatum: Object.assign({ date: (_d = courseInstance.Tillfallesperioder.at(0)) === null || _d === void 0 ? void 0 : _d.ForstaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_e = courseInstance.Tillfallesperioder.at(0)) === null || _e === void 0 ? void 0 : _e.ForstaUndervisningsdatum), {
                     code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
                     startDate: startperiod && new Date(startperiod.startDay),
                     endDate: startperiod && new Date(startperiod.lastDay),
-                }, 'start') }, (0, utils_1.getYearAndWeek)((_f = courseRound.Tillfallesperioder.at(0)) === null || _f === void 0 ? void 0 : _f.ForstaUndervisningsdatum)),
-            sistaUndervisningsdatum: Object.assign({ date: (_g = courseRound.Tillfallesperioder.at(-1)) === null || _g === void 0 ? void 0 : _g.SistaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_h = courseRound.Tillfallesperioder.at(-1)) === null || _h === void 0 ? void 0 : _h.SistaUndervisningsdatum), {
+                }, 'start') }, (0, utils_1.getYearAndWeek)((_f = courseInstance.Tillfallesperioder.at(0)) === null || _f === void 0 ? void 0 : _f.ForstaUndervisningsdatum)),
+            sistaUndervisningsdatum: Object.assign({ date: (_g = courseInstance.Tillfallesperioder.at(-1)) === null || _g === void 0 ? void 0 : _g.SistaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_h = courseInstance.Tillfallesperioder.at(-1)) === null || _h === void 0 ? void 0 : _h.SistaUndervisningsdatum), {
                     code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
                     startDate: startperiod && new Date(startperiod.startDay),
                     endDate: startperiod && new Date(startperiod.lastDay),
-                }, 'end') }, (0, utils_1.getYearAndWeek)((_j = courseRound.Tillfallesperioder.at(-1)) === null || _j === void 0 ? void 0 : _j.SistaUndervisningsdatum)),
-            tillfallesperioderNummer: courseRound.Tillfallesperioder.length,
+                }, 'end') }, (0, utils_1.getYearAndWeek)((_j = courseInstance.Tillfallesperioder.at(-1)) === null || _j === void 0 ? void 0 : _j.SistaUndervisningsdatum)),
+            tillfallesperioderNummer: courseInstance.Tillfallesperioder.length,
         },
         schoolCode,
         isMiljo,

package/dist/mapSearchResult.js.map

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

package/dist/programme/createProgrammeApi.js

@@ -19,15 +19,15 @@ const mergeResponses_1 = require("../utils/mergeResponses");
 const programmeVersionUtil_1 = require("./utils/programmeVersionUtil");
 const createProgrammeApi = (ladokClient) => {
     return {
-        getAllProgrammeVersions: (language_1, ...args_1) => __awaiter(void 0, [language_1, ...args_1], void 0, function* (language, getAvvecklad = true) {
+        getAllProgrammeVersions: (language_1, ...args_1) => __awaiter(void 0, [language_1, ...args_1], void 0, function* (language, getDiscontinued = true) {
             try {
                 const activeProgrammesRequestQuery = {
                     typ: 'program',
-                    instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION,
+                    instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAMME_VERSION,
                     antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
                     utbildningstypid: utbildningsTypIdConstants_1.PROGRAMME_VERSION_UTBILDNINGSTYP_IDS,
                 };
-                const cancelledProgrammesRequestQuery = Object.assign(Object.assign({}, activeProgrammesRequestQuery), { avvecklad: 'true' });
+                const discontinuedProgrammesRequestQuery = Object.assign(Object.assign({}, activeProgrammesRequestQuery), { avvecklad: 'true' });
                 const fetchProgrammes = (query) => {
                     return (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstansSlim, query, {
                         maxSearchResultsToReturn: 600,
@@ -36,11 +36,11 @@ const createProgrammeApi = (ladokClient) => {
                 };
                 const [{ allEntities: activeProgrammes }, { allEntities: cancelledProgrammes }] = yield Promise.all([
                     fetchProgrammes(activeProgrammesRequestQuery),
-                    getAvvecklad ? fetchProgrammes(cancelledProgrammesRequestQuery) : Promise.resolve({ allEntities: [] }),
+                    getDiscontinued ? fetchProgrammes(discontinuedProgrammesRequestQuery) : Promise.resolve({ allEntities: [] }),
                 ]);
                 const mergedProgrammes = (0, mergeResponses_1.mergePlainArrays)(activeProgrammes, cancelledProgrammes, item => item.instans_uid);
                 const mappedProgrammes = mergedProgrammes.map(programme => (0, mapProgrammeVersion_1.mapProgrammeVersion)(programme, language));
-                const finalListOfProgrammes = (0, programmeVersionUtil_1.addFirstAdmissionTerm)(mappedProgrammes);
+                const finalListOfProgrammes = (0, programmeVersionUtil_1.addFirstAdmissionSemester)(mappedProgrammes);
                 return finalListOfProgrammes;
             }
             catch (error) {

package/dist/programme/createProgrammeApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"createProgrammeApi.js","sourceRoot":"","sources":["../../src/programme/createProgrammeApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sDAAqD;AACrD,kGAGmD;AACnD,gEAA4D;AAC5D,wEAAwF;AACxF,2EAAkF;AAClF,4DAA0D;AAC1D,uEAAoE;AAE7D,MAAM,kBAAkB,GAAG,CAAC,WAAsC,EAAgB,EAAE;IACzF,OAAO;QACL,uBAAuB,EAAE,wBAAsC,EAAE,+DAAjC,QAAQ,EAAE,YAAY,GAAG,IAAI;YAC3D,IAAI,CAAC;gBACH,MAAM,4BAA4B,GAAG;oBACnC,GAAG,EAAE,SAAS;oBACd,qBAAqB,EAAE,qEAA2C;oBAClE,YAAY,EAAE,kCAAiB;oBAC/B,gBAAgB,EAAE,gEAAoC;iBACvD,CAAA;gBAED,MAAM,+BAA+B,mCAChC,4BAA4B,KAC/B,SAAS,EAAE,MAAM,GAClB,CAAA;gBAED,MAAM,eAAe,GAAG,CACtB,KAAqC,EACmC,EAAE;oBAC1E,OAAO,IAAA,qEAAiC,EAAC,WAAW,CAAC,yBAAyB,EAAE,KAAK,EAAE;wBACrF,wBAAwB,EAAE,GAAG;wBAC7B,yBAAyB,EAAE,CAAC;qBAC7B,CAAC,CAAA;gBACJ,CAAC,CAAA;gBAED,MAAM,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBAClG,eAAe,CAAC,4BAA4B,CAAC;oBAC7C,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBACvG,CAAC,CAAA;gBAEF,MAAM,gBAAgB,GAAG,IAAA,iCAAgB,EAAC,gBAAgB,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAY,CAAC,CAAA;gBAC3G,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,yCAAmB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAA;gBACpG,MAAM,qBAAqB,GAAG,IAAA,4CAAqB,EAAC,gBAAgB,CAAC,CAAA;gBAErE,OAAO,qBAAqB,CAAA;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAA;YAC/D,CAAC;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AAxCY,QAAA,kBAAkB,sBAwC9B"}
+{"version":3,"file":"createProgrammeApi.js","sourceRoot":"","sources":["../../src/programme/createProgrammeApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sDAAqD;AACrD,kGAGmD;AACnD,gEAA4D;AAC5D,wEAA0F;AAC1F,2EAAkF;AAClF,4DAA0D;AAC1D,uEAAwE;AAEjE,MAAM,kBAAkB,GAAG,CAAC,WAAsC,EAAgB,EAAE;IACzF,OAAO;QACL,uBAAuB,EAAE,wBAAyC,EAAE,+DAApC,QAAQ,EAAE,eAAe,GAAG,IAAI;YAC9D,IAAI,CAAC;gBACH,MAAM,4BAA4B,GAAG;oBACnC,GAAG,EAAE,SAAS;oBACd,qBAAqB,EAAE,uEAA6C;oBACpE,YAAY,EAAE,kCAAiB;oBAC/B,gBAAgB,EAAE,gEAAoC;iBACvD,CAAA;gBAED,MAAM,kCAAkC,mCACnC,4BAA4B,KAC/B,SAAS,EAAE,MAAM,GAClB,CAAA;gBAED,MAAM,eAAe,GAAG,CACtB,KAAqC,EACmC,EAAE;oBAC1E,OAAO,IAAA,qEAAiC,EAAC,WAAW,CAAC,yBAAyB,EAAE,KAAK,EAAE;wBACrF,wBAAwB,EAAE,GAAG;wBAC7B,yBAAyB,EAAE,CAAC;qBAC7B,CAAC,CAAA;gBACJ,CAAC,CAAA;gBAED,MAAM,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBAClG,eAAe,CAAC,4BAA4B,CAAC;oBAC7C,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,kCAAkC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBAC7G,CAAC,CAAA;gBAEF,MAAM,gBAAgB,GAAG,IAAA,iCAAgB,EAAC,gBAAgB,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAY,CAAC,CAAA;gBAC3G,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,yCAAmB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAA;gBACpG,MAAM,qBAAqB,GAAG,IAAA,gDAAyB,EAAC,gBAAgB,CAAC,CAAA;gBAEzE,OAAO,qBAAqB,CAAA;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAA;YAC/D,CAAC;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AAxCY,QAAA,kBAAkB,sBAwC9B"}

package/dist/programme/types.d.ts

@@ -2,16 +2,16 @@ import { ProgrammeVersion } from '../mapProgrammeVersion';
 import { Language } from '../utils';
 import { AcademicSemester } from '../utils/AcademicSemester';
 export type CompleteProgrammeVersion = ProgrammeVersion & {
-    /** The first term the programme admitted students */
-    firstAdmissionTerm?: AcademicSemester;
+    /** The first semester the programme admitted students */
+    firstAdmissionSemester?: AcademicSemester;
     /**
-     * List of terms in which the programme has active structures. This is only
+     * List of semesters in which the programme has active structures. This is only
      * populated in some contexts and therefore kept optional.
      */
-    approvedStudyProgrammeTerms?: string[];
+    approvedStudyProgrammeSemesters?: string[];
 };
 export type ProgrammeApi = {
-    getAllProgrammeVersions: (language: Language, getAvvecklad?: boolean) => Promise<CompleteProgrammeVersion[]>;
+    getAllProgrammeVersions: (language: Language, getDiscontinued?: boolean) => Promise<CompleteProgrammeVersion[]>;
 };
 export type ProgrammeResponse<T> = {
     results: T[];

package/dist/programme/utbildningsTypIdConstants.d.ts

@@ -1,4 +1,4 @@
 /**
- * The utbildningstyp Ids that we are interested in when getting all program versions.
+ * The utbildningstyp Ids that we are interested in when getting all programme versions.
  */
 export declare const PROGRAMME_VERSION_UTBILDNINGSTYP_IDS: string;

package/dist/programme/utbildningsTypIdConstants.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROGRAMME_VERSION_UTBILDNINGSTYP_IDS = void 0;
 /**
- * The utbildningstyp Ids that we are interested in when getting all program versions.
+ * The utbildningstyp Ids that we are interested in when getting all programme versions.
  */
 exports.PROGRAMME_VERSION_UTBILDNINGSTYP_IDS = [
     78, // 2007PRG

package/dist/programme/utils/programmeVersionUtil.d.ts

@@ -1,9 +1,9 @@
 import { ProgrammeVersion } from '../../mapProgrammeVersion';
 import { CompleteProgrammeVersion } from '../types';
 /**
- * Adds a `firstAdmissionTerm` property to each programme version in the list.
+ * Adds a `firstAdmissionSemester` property to each programme version in the list.
  *
- * The term is derived from the oldest version within the same programme code
+ * The semester is derived from the oldest version within the same programme code
  * and uses the Ladok semester format (e.g. `HT2020`).
  */
-export declare const addFirstAdmissionTerm: (programmes: ProgrammeVersion[]) => CompleteProgrammeVersion[];
+export declare const addFirstAdmissionSemester: (programmes: ProgrammeVersion[]) => CompleteProgrammeVersion[];

package/dist/programme/utils/programmeVersionUtil.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addFirstAdmissionTerm = void 0;
+exports.addFirstAdmissionSemester = void 0;
 const utils_1 = require("../../utils");
 const AcademicSemester_1 = require("../../utils/AcademicSemester");
 const collectionUtils_1 = require("../../utils/collectionUtils");
 /**
- * Adds a `firstAdmissionTerm` property to each programme version in the list.
+ * Adds a `firstAdmissionSemester` property to each programme version in the list.
  *
- * The term is derived from the oldest version within the same programme code
+ * The semester is derived from the oldest version within the same programme code
  * and uses the Ladok semester format (e.g. `HT2020`).
  */
-const addFirstAdmissionTerm = (programmes) => {
+const addFirstAdmissionSemester = (programmes) => {
     var _a, _b;
     const grouped = (0, collectionUtils_1.groupBy)(programmes, p => p.kod);
     const result = [];
@@ -18,10 +18,10 @@ const addFirstAdmissionTerm = (programmes) => {
         const giltigFromCode = (_b = (_a = (0, utils_1.findOldestVersion)(list)) === null || _a === void 0 ? void 0 : _a.giltigFrom) === null || _b === void 0 ? void 0 : _b.code;
         const latestVersion = (0, utils_1.findLatestVersion)(list);
         if (latestVersion && giltigFromCode) {
-            result.push(Object.assign(Object.assign({}, latestVersion), { firstAdmissionTerm: AcademicSemester_1.AcademicSemester.fromLadokPeriodString(giltigFromCode) }));
+            result.push(Object.assign(Object.assign({}, latestVersion), { firstAdmissionSemester: AcademicSemester_1.AcademicSemester.fromLadokPeriodString(giltigFromCode) }));
         }
     }
     return result;
 };
-exports.addFirstAdmissionTerm = addFirstAdmissionTerm;
+exports.addFirstAdmissionSemester = addFirstAdmissionSemester;
 //# sourceMappingURL=programmeVersionUtil.js.map

package/dist/programme/utils/programmeVersionUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"programmeVersionUtil.js","sourceRoot":"","sources":["../../../src/programme/utils/programmeVersionUtil.ts"],"names":[],"mappings":";;;AAEA,uCAAkE;AAClE,mEAA+D;AAC/D,iEAAqD;AAErD;;;;;GAKG;AACI,MAAM,qBAAqB,GAAG,CAAC,UAA8B,EAA8B,EAAE;;IAClG,MAAM,OAAO,GAAG,IAAA,yBAAO,EAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAE/C,MAAM,MAAM,GAA+B,EAAE,CAAA;IAE7C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,MAAM,cAAc,GAAG,MAAA,MAAA,IAAA,yBAAiB,EAAC,IAAI,CAAC,0CAAE,UAAU,0CAAE,IAAI,CAAA;QAChE,MAAM,aAAa,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,aAAa,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,iCACN,aAAa,KAChB,kBAAkB,EAAE,mCAAgB,CAAC,qBAAqB,CAAC,cAAc,CAAC,IAC1E,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAjBY,QAAA,qBAAqB,yBAiBjC"}
+{"version":3,"file":"programmeVersionUtil.js","sourceRoot":"","sources":["../../../src/programme/utils/programmeVersionUtil.ts"],"names":[],"mappings":";;;AAEA,uCAAkE;AAClE,mEAA+D;AAC/D,iEAAqD;AAErD;;;;;GAKG;AACI,MAAM,yBAAyB,GAAG,CAAC,UAA8B,EAA8B,EAAE;;IACtG,MAAM,OAAO,GAAG,IAAA,yBAAO,EAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;IAE/C,MAAM,MAAM,GAA+B,EAAE,CAAA;IAE7C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACpC,MAAM,cAAc,GAAG,MAAA,MAAA,IAAA,yBAAiB,EAAC,IAAI,CAAC,0CAAE,UAAU,0CAAE,IAAI,CAAA;QAChE,MAAM,aAAa,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,CAAA;QAC7C,IAAI,aAAa,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,iCACN,aAAa,KAChB,sBAAsB,EAAE,mCAAgB,CAAC,qBAAqB,CAAC,cAAc,CAAC,IAC9E,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAjBY,QAAA,yBAAyB,6BAiBrC"}

package/dist/search/createSearchApi.js

@@ -15,7 +15,7 @@ const getAllEntitiesByUseOfContinuation_1 = require("../utils/getAllEntitiesByUs
 const mapSearchResult_1 = require("../mapSearchResult");
 const groupSearchResults_1 = require("../groupSearchResults");
 const errorUtils_1 = require("../utils/errorUtils");
-const mapCourseRoundSearchDTO_1 = require("./utils/mapCourseRoundSearchDTO");
+const mapCourseInstanceSearchDTO_1 = require("./utils/mapCourseInstanceSearchDTO");
 const searchService_1 = require("./searchService");
 const supportService_1 = require("../supportApis/supportService");
 const SearchError_1 = require("../utils/SearchError");
@@ -23,7 +23,7 @@ const createSearchApi = (ladokClient) => {
     const searchService = new searchService_1.SearchService(ladokClient);
     const supportService = new supportService_1.SupportService(ladokClient);
     return {
-        searchCourses: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
+        searchCourseInstances: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 const cleanSearchParams = (0, searchUtils_1.validateAndCleanSearchParams)(searchParams);
                 const departmentList = yield supportService.getSchoolsWithDepartmentsForSearch(language);
@@ -33,8 +33,8 @@ const createSearchApi = (ladokClient) => {
                 const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(mappedCourses, filterPeriod);
                 // TODO Remove this once we have a query parameter to filter for miljö courses
                 const courseVersionsToShow = (0, searchUtils_1.possiblyFilterByMiljo)(groupedCourses, cleanSearchParams.onlyMHU);
-                const courseRoundSearchDTOs = courseVersionsToShow.map(mapCourseRoundSearchDTO_1.mapCourseRoundSearchDTO);
-                return { searchHits: courseRoundSearchDTOs };
+                const courseInstanceSearchDTOs = courseVersionsToShow.map(mapCourseInstanceSearchDTO_1.mapCourseInstanceSearchDTO);
+                return { searchHits: courseInstanceSearchDTOs };
             }
             catch (error) {
                 const searchError = (0, errorUtils_1.toSearchError)(error);

package/dist/search/createSearchApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qDAI4B;AAC5B,kGAA8F;AAC9F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,6EAAyE;AACzE,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AAE/C,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO;QACL,aAAa,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YAC9C,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAExF,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qEAAiC,EAGzE,WAAW,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAA;gBAE7C,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,wCAAsB,EAAC,MAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAEzF,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC,aAAa,EAAE,YAAY,CAAC,CAAA;gBAEtE,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,IAAA,mCAAqB,EAAC,cAAc,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBAE7F,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,GAAG,CAAC,iDAAuB,CAAC,CAAA;gBAE/E,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,CAAA;YAC9C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,WAAW,GAAG,IAAA,0BAAa,EAAC,KAAK,CAAC,CAAA;gBACxC,OAAO;oBACL,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,WAAW,CAAC,SAAS;iBACjC,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QACD,oBAAoB,EAAE,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC5E,2BAA2B,EAAE,CAAO,gBAAgB,EAAE,QAAQ,EAAE,EAAE;YAChE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;YAE3G,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;oBACL,wBAAwB,EAAE;wBACxB,cAAc,EAAE,EAAE;wBAClB,UAAU,EAAE,EAAE;wBACd,OAAO,EAAE,EAAE;qBACZ;oBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;iBACzC,CAAA;YACH,CAAC;YAED,OAAO;gBACL,wBAAwB,EAAE;oBACxB,cAAc,EAAE,UAAU,CAAC,IAAI;oBAC/B,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,OAAO;iBACR;gBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;aACzC,CAAA;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AA/DY,QAAA,eAAe,mBA+D3B"}
+{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qDAI4B;AAC5B,kGAA8F;AAC9F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,mFAA+E;AAC/E,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AAE/C,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO;QACL,qBAAqB,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YACtD,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAExF,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qEAAiC,EAGzE,WAAW,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAA;gBAE7C,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,wCAAsB,EAAC,MAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAEzF,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC,aAAa,EAAE,YAAY,CAAC,CAAA;gBAEtE,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,IAAA,mCAAqB,EAAC,cAAc,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBAE7F,MAAM,wBAAwB,GAAG,oBAAoB,CAAC,GAAG,CAAC,uDAA0B,CAAC,CAAA;gBAErF,OAAO,EAAE,UAAU,EAAE,wBAAwB,EAAE,CAAA;YACjD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,WAAW,GAAG,IAAA,0BAAa,EAAC,KAAK,CAAC,CAAA;gBACxC,OAAO;oBACL,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,WAAW,CAAC,SAAS;iBACjC,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QACD,oBAAoB,EAAE,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC5E,2BAA2B,EAAE,CAAO,gBAAgB,EAAE,QAAQ,EAAE,EAAE;YAChE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;YAE3G,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;oBACL,wBAAwB,EAAE;wBACxB,cAAc,EAAE,EAAE;wBAClB,UAAU,EAAE,EAAE;wBACd,OAAO,EAAE,EAAE;qBACZ;oBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;iBACzC,CAAA;YACH,CAAC;YAED,OAAO;gBACL,wBAAwB,EAAE;oBACxB,cAAc,EAAE,UAAU,CAAC,IAAI;oBAC/B,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,OAAO;iBACR;gBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;aACzC,CAAA;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AA/DY,QAAA,eAAe,mBA+D3B"}

package/dist/search/searchService.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchService = void 0;
-const mapCourse_1 = require("../mapCourse");
+const mapCourseVersion_1 = require("../mapCourseVersion");
 const errorUtils_1 = require("../utils/errorUtils");
 const gradingScalesUtils_1 = require("../utils/gradingScalesUtils");
 const getAllEntitiesByUseOfContinuation_1 = require("../utils/getAllEntitiesByUseOfContinuation");
@@ -31,8 +31,8 @@ class SearchService {
             try {
                 const cleanSearchParams = (0, searchUtils_1.validateAndCleanSearchParams)(searchParams);
                 const departmentList = yield this.supportService.getSchoolsWithDepartmentsForSearch(language);
-                const requestQueryForKursInstans = (0, searchUtils_1.prepareSearchRequestQueryForKursInstans)(cleanSearchParams, departmentList);
-                const latestApprovedCourses = yield this.searchLatestApprovedCourseVersions(requestQueryForKursInstans, language);
+                const requestQueryForCourseVersion = (0, searchUtils_1.prepareSearchRequestQueryForCourseVersion)(cleanSearchParams, departmentList);
+                const latestApprovedCourses = yield this.searchLatestApprovedCourseVersions(requestQueryForCourseVersion, language);
                 // TODO Remove this once we have a query parameter to filter for miljö courses
                 const courseVersionsToShow = (0, searchUtils_1.possiblyFilterByMiljo)(latestApprovedCourses, cleanSearchParams.onlyMHU);
                 const courseVersionDTOs = courseVersionsToShow.map(mapCourseVersionDTO_1.mapCourseVersionDTO);
@@ -51,7 +51,7 @@ class SearchService {
         return __awaiter(this, void 0, void 0, function* () {
             const { allEntities: allCourseVersions } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(this.ladokClient.sokUtbildningsInstans, requestQueryForKursInstans, continuationOptions);
             const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(this.ladokClient); // TODO: Use cached values
-            const allMappedCourseVersions = allCourseVersions.map(courseVersion => (0, mapCourse_1.mapCourse)(courseVersion, language, gradingScalesCodes));
+            const allMappedCourseVersions = allCourseVersions.map(courseVersion => (0, mapCourseVersion_1.mapCourseVersion)(courseVersion, language, gradingScalesCodes));
             const latestCourseVersions = (0, searchUtils_1.findLatestCourseVersions)(allMappedCourseVersions);
             return (0, getLatestCompletedCourseVersions_1.getLatestCompletedCourseVersions)(latestCourseVersions);
         });
@@ -65,11 +65,11 @@ class SearchService {
             const schoolsWithDepartments = yield this.supportService.getSchoolsWithDepartmentsForSearch(language);
             // This endpoint is not supposed to accept user input for department code or educational level,
             // so we prepare the request query based on the departmentParams instead of cleaning them.
-            const requestQueryForKursInstans = (0, searchUtils_1.prepareSearchRequestQueryForDepartmentList)(schoolsWithDepartments, {
+            const requestQueryForCourseVersion = (0, searchUtils_1.prepareSearchRequestQueryForDepartmentList)(schoolsWithDepartments, {
                 organisation,
                 rawUtbildningsniva,
             });
-            const latestApprovedCourseVersions = yield this.searchLatestApprovedCourseVersions(requestQueryForKursInstans, language, { maxContinuationIterations: 10, maxSearchResultsToReturn: 1000 });
+            const latestApprovedCourseVersions = yield this.searchLatestApprovedCourseVersions(requestQueryForCourseVersion, language, { maxContinuationIterations: 10, maxSearchResultsToReturn: 1000 });
             const courseVersionDTOs = latestApprovedCourseVersions.map(mapCourseVersionDTO_1.mapCourseVersionDTO);
             const department = yield this.supportService.getDepartmentByCode(organisation, language);
             return { department, courses: courseVersionDTOs };

package/dist/search/searchService.js.map

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

package/dist/search/types.d.ts

@@ -1,7 +1,7 @@
 import { EducationalLevelCode } from '@kth/ladok-attributvarde-utils';
 import { Language } from '../utils';
 export type SearchApi = {
-    searchCourses: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseRoundSearchDTO>>;
+    searchCourseInstances: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseInstanceSearchDTO>>;
     searchCourseVersions: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseVersionDTO>>;
     getDepartmentWithCourseList: (searchParams: DepartmentParams, language: Language) => Promise<DepartmentWithCourseListResponse>;
 };
@@ -31,7 +31,7 @@ export type CourseVersionDTO = {
     omfattning: string;
     utbildningstyp: string;
 };
-export type CourseRoundSearchDTO = {
+export type CourseInstanceSearchDTO = {
     kod: string;
     benamning: string;
     omfattning: string;

package/dist/search/utils/educationalTypeUtils.d.ts

@@ -20,4 +20,4 @@ export declare const getUtbildningsnivaParameterForKursTillfalle: (educationalLe
  * @param educationalLevels
  * @returns
  */
-export declare const getUtbildningsnivaParameterForKursInstans: (educationalLevels: EducationalLevelCode[] | undefined) => string;
+export declare const getUtbildningsnivaParameterForCourseVersion: (educationalLevels: EducationalLevelCode[] | undefined) => string;

package/dist/search/utils/educationalTypeUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUtbildningsnivaParameterForKursInstans = exports.getUtbildningsnivaParameterForKursTillfalle = exports.getVersionUtbildningstyperForEducationalLevels = exports.getAllVersionUtbildningstyperIDs = void 0;
+exports.getUtbildningsnivaParameterForCourseVersion = exports.getUtbildningsnivaParameterForKursTillfalle = exports.getVersionUtbildningstyperForEducationalLevels = exports.getAllVersionUtbildningstyperIDs = void 0;
 const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
 const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
 const getAllVersionUtbildningstyperIDs = () => {
@@ -49,12 +49,12 @@ exports.getUtbildningsnivaParameterForKursTillfalle = getUtbildningsnivaParamete
  * @param educationalLevels
  * @returns
  */
-const getUtbildningsnivaParameterForKursInstans = (educationalLevels) => {
+const getUtbildningsnivaParameterForCourseVersion = (educationalLevels) => {
     if (!educationalLevels)
         return (0, exports.getAllVersionUtbildningstyperIDs)().join(',');
     return getCommaSeparatedEducationalTypesInFormat('ID', educationalLevels);
 };
-exports.getUtbildningsnivaParameterForKursInstans = getUtbildningsnivaParameterForKursInstans;
+exports.getUtbildningsnivaParameterForCourseVersion = getUtbildningsnivaParameterForCourseVersion;
 const getCommaSeparatedEducationalTypesInFormat = (format, educationalLevels) => {
     const selectedEducationalTypes = (0, exports.getVersionUtbildningstyperForEducationalLevels)(educationalLevels);
     const selectedEducationalTypeIdentifiers = selectedEducationalTypes.map(item => item[format]);

package/dist/search/utils/educationalTypeUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"educationalTypeUtils.js","sourceRoot":"","sources":["../../../src/search/utils/educationalTypeUtils.ts"],"names":[],"mappings":";;;AAAA,8EAAqE;AACrE,4EAMqC;AAE9B,MAAM,gCAAgC,GAAG,GAAa,EAAE;IAC7D,OAAO;QACL,GAAG,kEAAsC;QACzC,GAAG,4DAAgC;QACnC,GAAG,+DAAmC;QACtC,GAAG,gEAAoC;QACvC,GAAG,8DAAkC;KACtC,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;AAC5C,CAAC,CAAA;AARY,QAAA,gCAAgC,oCAQ5C;AAED;;;;GAIG;AACI,MAAM,8CAA8C,GAAG,CAAC,iBAAyC,EAAE,EAAE;IAC1G,OAAO,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACvC,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,gDAAoB,CAAC,WAAW;gBACnC,OAAO,kEAAsC,CAAA;YAC/C,KAAK,gDAAoB,CAAC,KAAK;gBAC7B,OAAO,4DAAgC,CAAA;YACzC,KAAK,gDAAoB,CAAC,QAAQ;gBAChC,OAAO,+DAAmC,CAAA;YAC5C,KAAK,gDAAoB,CAAC,QAAQ;gBAChC,OAAO,gEAAoC,CAAA;QAC/C,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAbY,QAAA,8CAA8C,kDAa1D;AAED;;;;GAIG;AACI,MAAM,2CAA2C,GAAG,CACzD,iBAAqD,EACjC,EAAE;IACtB,IAAI,CAAC,iBAAiB;QAAE,OAAO,SAAS,CAAA;IAExC,OAAO,yCAAyC,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;AAC5E,CAAC,CAAA;AANY,QAAA,2CAA2C,+CAMvD;AAED;;;;GAIG;AACI,MAAM,yCAAyC,GAAG,CACvD,iBAAqD,EAC7C,EAAE;IACV,IAAI,CAAC,iBAAiB;QAAE,OAAO,IAAA,wCAAgC,GAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3E,OAAO,yCAAyC,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AAC3E,CAAC,CAAA;AANY,QAAA,yCAAyC,6CAMrD;AAED,MAAM,yCAAyC,GAAG,CAChD,MAAoB,EACpB,iBAAyC,EACjC,EAAE;IACV,MAAM,wBAAwB,GAAG,IAAA,sDAA8C,EAAC,iBAAiB,CAAC,CAAA;IAElG,MAAM,kCAAkC,GAAG,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;IAE7F,OAAO,kCAAkC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACrD,CAAC,CAAA"}
+{"version":3,"file":"educationalTypeUtils.js","sourceRoot":"","sources":["../../../src/search/utils/educationalTypeUtils.ts"],"names":[],"mappings":";;;AAAA,8EAAqE;AACrE,4EAMqC;AAE9B,MAAM,gCAAgC,GAAG,GAAa,EAAE;IAC7D,OAAO;QACL,GAAG,kEAAsC;QACzC,GAAG,4DAAgC;QACnC,GAAG,+DAAmC;QACtC,GAAG,gEAAoC;QACvC,GAAG,8DAAkC;KACtC,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;AAC5C,CAAC,CAAA;AARY,QAAA,gCAAgC,oCAQ5C;AAED;;;;GAIG;AACI,MAAM,8CAA8C,GAAG,CAAC,iBAAyC,EAAE,EAAE;IAC1G,OAAO,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACvC,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,gDAAoB,CAAC,WAAW;gBACnC,OAAO,kEAAsC,CAAA;YAC/C,KAAK,gDAAoB,CAAC,KAAK;gBAC7B,OAAO,4DAAgC,CAAA;YACzC,KAAK,gDAAoB,CAAC,QAAQ;gBAChC,OAAO,+DAAmC,CAAA;YAC5C,KAAK,gDAAoB,CAAC,QAAQ;gBAChC,OAAO,gEAAoC,CAAA;QAC/C,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAbY,QAAA,8CAA8C,kDAa1D;AAED;;;;GAIG;AACI,MAAM,2CAA2C,GAAG,CACzD,iBAAqD,EACjC,EAAE;IACtB,IAAI,CAAC,iBAAiB;QAAE,OAAO,SAAS,CAAA;IAExC,OAAO,yCAAyC,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAA;AAC5E,CAAC,CAAA;AANY,QAAA,2CAA2C,+CAMvD;AAED;;;;GAIG;AACI,MAAM,2CAA2C,GAAG,CACzD,iBAAqD,EAC7C,EAAE;IACV,IAAI,CAAC,iBAAiB;QAAE,OAAO,IAAA,wCAAgC,GAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE3E,OAAO,yCAAyC,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AAC3E,CAAC,CAAA;AANY,QAAA,2CAA2C,+CAMvD;AAED,MAAM,yCAAyC,GAAG,CAChD,MAAoB,EACpB,iBAAyC,EACjC,EAAE;IACV,MAAM,wBAAwB,GAAG,IAAA,sDAA8C,EAAC,iBAAiB,CAAC,CAAA;IAElG,MAAM,kCAAkC,GAAG,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;IAE7F,OAAO,kCAAkC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACrD,CAAC,CAAA"}

package/dist/search/utils/getLatestCompletedCourseVersions.d.ts

@@ -1,8 +1,8 @@
-import { Course } from '../../mapCourse';
+import { CourseVersion } from '../../mapCourseVersion';
 /**
  * Returns only course versions that have been completed at least once.
  * This means that the versionsnummer is greater than 1 or if it is 1, the ladokStatusCode is Complete.
  * @param courseVersions
  * @returns
  */
-export declare const getLatestCompletedCourseVersions: <T extends Pick<Course, "versionsnummer" | "ladokStatusCode">>(courseVersions: T[]) => T[];
+export declare const getLatestCompletedCourseVersions: <T extends Pick<CourseVersion, "versionsnummer" | "ladokStatusCode">>(courseVersions: T[]) => T[];

package/dist/search/utils/mapCourseInstanceSearchDTO.d.ts

@@ -0,0 +1,3 @@
+import { CourseInstanceSearchDTO } from '../types';
+import { GroupedCourseSearchResult } from '../../groupSearchResults';
+export declare const mapCourseInstanceSearchDTO: (courseInstance: GroupedCourseSearchResult) => CourseInstanceSearchDTO;

package/dist/search/utils/mapCourseInstanceSearchDTO.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mapCourseInstanceSearchDTO = void 0;
+const typeChecking_1 = require("../../utils/typeChecking");
+const castToString = (value) => {
+    if (typeof value === 'string') {
+        return value;
+    }
+    if (typeof value === 'number') {
+        return value.toString();
+    }
+    return '';
+};
+const mapCourseInstanceSearchDTO = (courseInstance) => {
+    var _a;
+    const utbildningstyper = courseInstance.utbildningstyp.map(({ level: { name: educationalLevel = '' } = {} }) => educationalLevel);
+    const studietakter = courseInstance.studietakt.map(({ takt }) => takt).filter(typeChecking_1.isDefined);
+    const undervisningssprak = courseInstance.undervisningssprak.map(({ name: courseLanguage = '' }) => courseLanguage);
+    const studieorter = courseInstance.studieort.map(({ name: courseCampus = '' }) => courseCampus);
+    const allStartPeriods = courseInstance.startperiod.map(({ code: startTerm = '' }) => startTerm);
+    const startTerm = allStartPeriods.length === 1 ? allStartPeriods[0] : undefined;
+    const perioder = courseInstance.period.map(({ forstaUndervisningsdatum: { year: startPeriodYear, period: startPeriod } = {}, sistaUndervisningsdatum: { year: endPeriodYear, period: endPeriod } = {}, tillfallesperioderNummer = undefined, }) => ({
+        startPeriodYear: castToString(startPeriodYear),
+        startPeriod,
+        endPeriodYear: castToString(endPeriodYear),
+        endPeriod,
+        tillfallesperioderNummer,
+    }));
+    return {
+        kod: courseInstance.kod,
+        benamning: courseInstance.benamning,
+        omfattning: (_a = courseInstance.omfattning.formattedWithUnit) !== null && _a !== void 0 ? _a : '',
+        utbildningstyper,
+        studietakter,
+        undervisningssprak,
+        studieorter,
+        startTerm,
+        perioder,
+    };
+};
+exports.mapCourseInstanceSearchDTO = mapCourseInstanceSearchDTO;
+//# sourceMappingURL=mapCourseInstanceSearchDTO.js.map

package/dist/search/utils/mapCourseInstanceSearchDTO.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mapCourseInstanceSearchDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseInstanceSearchDTO.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAIpD,MAAM,YAAY,GAAG,CAAC,KAAkC,EAAU,EAAE;IAClE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAA;IACzB,CAAC;IACD,OAAO,EAAE,CAAA;AACX,CAAC,CAAA;AAEM,MAAM,0BAA0B,GAAG,CAAC,cAAyC,EAA2B,EAAE;;IAC/G,MAAM,gBAAgB,GAAa,cAAc,CAAC,cAAc,CAAC,GAAG,CAClE,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,gBAAgB,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,gBAAgB,CACtE,CAAA;IAED,MAAM,YAAY,GAAa,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IAElG,MAAM,kBAAkB,GAAa,cAAc,CAAC,kBAAkB,CAAC,GAAG,CACxE,CAAC,EAAE,IAAI,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,cAAc,CAClD,CAAA;IAED,MAAM,WAAW,GAAa,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;IAEzG,MAAM,eAAe,GAAa,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAA;IACzG,MAAM,SAAS,GAAuB,eAAe,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAEnG,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CACxC,CAAC,EACC,wBAAwB,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,EAC7E,uBAAuB,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,EACxE,wBAAwB,GAAG,SAAS,GACrC,EAAE,EAAE,CAAC,CAAC;QACL,eAAe,EAAE,YAAY,CAAC,eAAe,CAAC;QAC9C,WAAW;QACX,aAAa,EAAE,YAAY,CAAC,aAAa,CAAC;QAC1C,SAAS;QACT,wBAAwB;KACzB,CAAC,CACH,CAAA;IAED,OAAO;QACL,GAAG,EAAE,cAAc,CAAC,GAAG;QACvB,SAAS,EAAE,cAAc,CAAC,SAAS;QACnC,UAAU,EAAE,MAAA,cAAc,CAAC,UAAU,CAAC,iBAAiB,mCAAI,EAAE;QAC7D,gBAAgB;QAChB,YAAY;QACZ,kBAAkB;QAClB,WAAW;QACX,SAAS;QACT,QAAQ;KACT,CAAA;AACH,CAAC,CAAA;AAzCY,QAAA,0BAA0B,8BAyCtC"}

package/dist/search/utils/mapCourseVersionDTO.d.ts

@@ -1,3 +1,3 @@
-import { Course } from '../../mapCourse';
+import { CourseVersion } from '../../mapCourseVersion';
 import { CourseVersionDTO } from '../types';
-export declare const mapCourseVersionDTO: (courseVersion: Course) => CourseVersionDTO;
+export declare const mapCourseVersionDTO: (courseVersion: CourseVersion) => CourseVersionDTO;

package/dist/search/utils/mapCourseVersionDTO.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapCourseVersionDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseVersionDTO.ts"],"names":[],"mappings":";;;AAGO,MAAM,mBAAmB,GAAG,CAAC,aAAqB,EAAoB,EAAE;;IAC7E,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,SAAS,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC,IAAI,mCAAI,EAAE;QAC9C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,iBAAiB;QACtD,cAAc,EAAE,MAAA,MAAA,aAAa,CAAC,cAAc,0CAAE,KAAK,CAAC,IAAI,mCAAI,EAAE;KAC/D,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,mBAAmB,uBAO/B"}
+{"version":3,"file":"mapCourseVersionDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseVersionDTO.ts"],"names":[],"mappings":";;;AAGO,MAAM,mBAAmB,GAAG,CAAC,aAA4B,EAAoB,EAAE;;IACpF,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,SAAS,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC,IAAI,mCAAI,EAAE;QAC9C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,iBAAiB;QACtD,cAAc,EAAE,MAAA,MAAA,aAAa,CAAC,cAAc,0CAAE,KAAK,CAAC,IAAI,mCAAI,EAAE;KAC/D,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,mBAAmB,uBAO/B"}

package/dist/search/utils/searchUtils.d.ts

@@ -1,7 +1,7 @@
 import { SokUtbildningsInstansQuery, SokUtbildningsTillfalleQuery } from '@kth/ladok-mellanlager-client';
 import { CleanSearchParams, SearchParams } from '../types';
 import { SchoolWithDepartments } from '../../supportApis/types';
-import { Course } from '../../mapCourse';
+import { CourseVersion } from '../../mapCourseVersion';
 /**
  * Validates and cleans the search parameters for the search API.
  * Throws an error if the searchParams are invalid.
@@ -16,7 +16,7 @@ export declare const prepareSearchRequestQueryForKursTillfallen: (searchParams:
     requestQuery: NonNullable<SokUtbildningsTillfalleQuery>;
     filterPeriod: boolean;
 };
-export declare const prepareSearchRequestQueryForKursInstans: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => NonNullable<SokUtbildningsInstansQuery>;
+export declare const prepareSearchRequestQueryForCourseVersion: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => NonNullable<SokUtbildningsInstansQuery>;
 export declare const prepareSearchRequestQueryForDepartmentList: (schoolsWithDepartments: SchoolWithDepartments[], { rawUtbildningsniva, organisation, }: {
     organisation?: string;
     rawUtbildningsniva: string[] | undefined;
@@ -28,7 +28,7 @@ export declare const prepareSearchRequestQueryForDepartmentList: (schoolsWithDep
  * @param courseVersions
  * @returns
  */
-export declare const findLatestCourseVersions: (courseVersions: Course[]) => Course[];
+export declare const findLatestCourseVersions: (courseVersions: CourseVersion[]) => CourseVersion[];
 /**
  * If onlyMHU is true, this function filters the courses to only include those that have the flag isMiljo set to true.
  * @param courses

package/dist/search/utils/searchUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.possiblyFilterByMiljo = exports.findLatestCourseVersions = exports.prepareSearchRequestQueryForDepartmentList = exports.prepareSearchRequestQueryForKursInstans = exports.prepareSearchRequestQueryForKursTillfallen = exports.validateAndCleanSearchParams = void 0;
+exports.possiblyFilterByMiljo = exports.findLatestCourseVersions = exports.prepareSearchRequestQueryForDepartmentList = exports.prepareSearchRequestQueryForCourseVersion = exports.prepareSearchRequestQueryForKursTillfallen = exports.validateAndCleanSearchParams = void 0;
 const SearchError_1 = require("../../utils/SearchError");
 const utils_1 = require("../../utils");
 const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
@@ -73,22 +73,22 @@ const getOrganisationsFilter = (organisationer, organisation) => {
     }
     return organisation;
 };
-const prepareSearchRequestQueryForKursInstans = (searchParams, schoolsWithDepartments) => {
+const prepareSearchRequestQueryForCourseVersion = (searchParams, schoolsWithDepartments) => {
     const { kodEllerBenamning, avvecklad, organisation, utbildningsniva } = searchParams;
     const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
-    return Object.assign(Object.assign(Object.assign(Object.assign({}, minimalSearchRequestQueryForKursInstans(queryConstants_1.MAX_ANTAL_TRAFFAR, utbildningsniva)), { kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }), (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter }));
+    return Object.assign(Object.assign(Object.assign(Object.assign({}, minimalSearchRequestQueryForCourseVersion(queryConstants_1.MAX_ANTAL_TRAFFAR, utbildningsniva)), { kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }), (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter }));
 };
-exports.prepareSearchRequestQueryForKursInstans = prepareSearchRequestQueryForKursInstans;
-const minimalSearchRequestQueryForKursInstans = (antalTraffar, utbildningsniva) => ({
+exports.prepareSearchRequestQueryForCourseVersion = prepareSearchRequestQueryForCourseVersion;
+const minimalSearchRequestQueryForCourseVersion = (antalTraffar, utbildningsniva) => ({
     antalTraffar,
     utbildningstypgrundtyp: 'KURS',
-    utbildningstypid: (0, educationalTypeUtils_1.getUtbildningsnivaParameterForKursInstans)(utbildningsniva),
+    utbildningstypid: (0, educationalTypeUtils_1.getUtbildningsnivaParameterForCourseVersion)(utbildningsniva),
     senasteversion: 'true',
 });
 const prepareSearchRequestQueryForDepartmentList = (schoolsWithDepartments, { rawUtbildningsniva, organisation, }) => {
     const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
     const utbildningsniva = rawUtbildningsniva ? cleanUtbildningsnivaParam(rawUtbildningsniva) : undefined;
-    return Object.assign(Object.assign({}, minimalSearchRequestQueryForKursInstans(queryConstants_1.MAX_ANTAL_TRAFFAR, utbildningsniva)), (organisationsFilter && { organisation: organisationsFilter }));
+    return Object.assign(Object.assign({}, minimalSearchRequestQueryForCourseVersion(queryConstants_1.MAX_ANTAL_TRAFFAR, utbildningsniva)), (organisationsFilter && { organisation: organisationsFilter }));
 };
 exports.prepareSearchRequestQueryForDepartmentList = prepareSearchRequestQueryForDepartmentList;
 /**

package/dist/search/utils/searchUtils.js.map

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

package/dist/supportApis/supportService.js

@@ -74,7 +74,7 @@ class SupportService {
             kodEllerBenamning: '*',
             organisation: departmentCode,
             senasteversion: 'true',
-            utbildningstypid: (0, educationalTypeUtils_1.getUtbildningsnivaParameterForKursInstans)(utbildningsniva),
+            utbildningstypid: (0, educationalTypeUtils_1.getUtbildningsnivaParameterForCourseVersion)(utbildningsniva),
             avvecklad: avvecklad ? 'true' : 'false',
             antalTraffar: '1',
         };