@kth/om-kursen-ladok-client 2.5.5 → 3.0.0

package/dist/groupSearchResults.d.ts

@@ -1,6 +1,7 @@
-import { CourseSearchResult, SearchResultPeriod } from './mapSearchResult';
+import { KTHPeriodSemester } from './kth/KTHPeriod/KTHPeriod';
+import { CourseInstanceResult } from './mapCourseInstanceResult';
 import { TranslatedGrunddata, TranslatedStudietakt, TranslatedUtbildningstyp } from './utils';
-export type GroupedCourseSearchResult = Omit<CourseSearchResult, 'studieort' | 'undervisningssprak' | 'utbildningstyp' | 'studietakt' | 'startperiod' | 'period'> & {
+export type GroupedCourseSearchResult = Omit<CourseInstanceResult, 'studieort' | 'undervisningssprak' | 'utbildningstyp' | 'studietakt' | 'startperiod' | 'period'> & {
     studieort: TranslatedGrunddata[];
     undervisningssprak: TranslatedGrunddata[];
     utbildningstyp: TranslatedUtbildningstyp[];
@@ -9,13 +10,23 @@ export type GroupedCourseSearchResult = Omit<CourseSearchResult, 'studieort' | '
         code: string;
         inDigits: string | null;
     }[];
-    period: SearchResultPeriod[];
+    startingKTHPeriods: KTHPeriodSemester[];
+    startingKTHPeriod: KTHPeriodSemester | undefined;
 };
 /**
- * Groups course search results by course code and optionally by period.
+ * Groups CourseSearchResults (Course instances) by course code and optionally by startingKTHPeriod.
+ * In the Course Search result page, we want to display one row per Course, regardless of location,
+ * study pace, language, study level or ladokStartPeriod.
+ *
+ * The exception from that rule is, if the user has filtered by KTHPeriod, in that case, we want to show
+ * one course per startingKTHPeriod.
+ *
+ * We expect the data in all fields but studieort, studietakt, undervisningssprak and utbildningstyp to
+ * be the same. The resulting array of results will for those properties have the data of the first occurrence
+ * that was in the original array.
  *
  * @param courseSearchResults array of CourseSearchResult objects
  * @param groupByPeriod true if the results should be grouped by period, false if they should only be grouped by course code
  * @returns
  */
-export declare const groupSearchResults: (courseSearchResults: CourseSearchResult[], groupByPeriod?: boolean) => GroupedCourseSearchResult[];
+export declare const groupSearchResults: (courseSearchResults: CourseInstanceResult[], groupByPeriod: boolean) => GroupedCourseSearchResult[];

package/dist/groupSearchResults.js

@@ -1,48 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.groupSearchResults = void 0;
+const KTHPeriod_1 = require("./kth/KTHPeriod/KTHPeriod");
+const typeChecking_1 = require("./utils/typeChecking");
 /**
- * Adds {@link obj} to {@link arr} if an equal object isn't already added.
- * Uses a callback {@link getCompareValue} to define uniqueness.
- *
- * @param arr array to add object to
- * @param obj object to possibly add to array
- * @param getCompareValue function that returns the comparison value for uniqueness
- */
-const addUniqueObjectWithCallback = (arr, obj, getCompareValue) => {
-    if (arr.every(x => getCompareValue(x) !== getCompareValue(obj))) {
-        arr.push(obj);
-    }
-};
-/**
- * Adds a period object to the array if it is unique based on
- * sistaUndervisningsdatum.date and forstaUndervisningsdatum.date.
+ * Groups CourseSearchResults (Course instances) by course code and optionally by startingKTHPeriod.
+ * In the Course Search result page, we want to display one row per Course, regardless of location,
+ * study pace, language, study level or ladokStartPeriod.
  *
- * @param arr array of SearchResultPeriod objects
- * @param obj SearchResultPeriod object to possibly add
- */
-const addUniquePeriod = (arr, obj) => addUniqueObjectWithCallback(arr, obj, item => { var _a, _b, _c, _d; return `${(_b = (_a = item.sistaUndervisningsdatum) === null || _a === void 0 ? void 0 : _a.date) !== null && _b !== void 0 ? _b : ''}-${(_d = (_c = item.forstaUndervisningsdatum) === null || _c === void 0 ? void 0 : _c.date) !== null && _d !== void 0 ? _d : ''}`; });
-/**
- * Adds an object to the array if it is unique based on its 'code' property.
+ * The exception from that rule is, if the user has filtered by KTHPeriod, in that case, we want to show
+ * one course per startingKTHPeriod.
  *
- * @param arr array of objects with a 'code' property
- * @param obj object to possibly add
- */
-const addUniqueObjectByCode = (arr, obj) => addUniqueObjectWithCallback(arr, obj, item => item.code);
-/**
- * Groups course search results by course code and optionally by period.
+ * We expect the data in all fields but studieort, studietakt, undervisningssprak and utbildningstyp to
+ * be the same. The resulting array of results will for those properties have the data of the first occurrence
+ * that was in the original array.
  *
  * @param courseSearchResults array of CourseSearchResult objects
  * @param groupByPeriod true if the results should be grouped by period, false if they should only be grouped by course code
  * @returns
  */
-const groupSearchResults = (courseSearchResults, groupByPeriod = false) => {
+const groupSearchResults = (courseSearchResults, groupByPeriod) => {
     const groupedResults = {};
     courseSearchResults.forEach(searchResult => {
-        var _a;
-        const key = `${searchResult.kod}-${groupByPeriod ? '' : (_a = searchResult.startperiod) === null || _a === void 0 ? void 0 : _a.code}`;
+        const key = createKey(searchResult, groupByPeriod);
         if (!groupedResults[key]) {
-            groupedResults[key] = Object.assign(Object.assign({}, searchResult), { studieort: [], studietakt: [], undervisningssprak: [], utbildningstyp: [], startperiod: [], period: [] });
+            groupedResults[key] = Object.assign(Object.assign({}, searchResult), { studieort: [], studietakt: [], undervisningssprak: [], utbildningstyp: [], startingKTHPeriods: [], startperiod: [] });
         }
         // Add unique objects by code to their respective arrays
         if (searchResult.studieort) {
@@ -60,11 +42,41 @@ const groupSearchResults = (courseSearchResults, groupByPeriod = false) => {
         if (searchResult.startperiod) {
             addUniqueObjectByCode(groupedResults[key].startperiod, searchResult.startperiod);
         }
-        if (searchResult.period) {
-            addUniquePeriod(groupedResults[key].period, searchResult.period);
+        if ((0, typeChecking_1.isDefined)(searchResult.startingKTHPeriod)) {
+            addUniqueObjectWithCallback(groupedResults[key].startingKTHPeriods, searchResult.startingKTHPeriod, x => (0, KTHPeriod_1.formatKTHPeriodSemester)(x));
         }
     });
-    return Object.values(groupedResults);
+    const result = Object.values(groupedResults);
+    return result;
 };
 exports.groupSearchResults = groupSearchResults;
+const createKey = (searchResult, groupByPeriod) => {
+    const periodSuffix = groupByPeriod ? createPeriodSuffix(searchResult.startingKTHPeriod) : '';
+    return `${searchResult.kod}${periodSuffix}`;
+};
+const createPeriodSuffix = (startingKTHPeriod) => {
+    if ((0, typeChecking_1.isDefined)(startingKTHPeriod))
+        return `-${(0, KTHPeriod_1.formatKTHPeriodSemester)(startingKTHPeriod)}`;
+    return '';
+};
+/**
+ * Adds {@link obj} to {@link arr} if an equal object isn't already added.
+ * Uses a callback {@link getCompareValue} to define uniqueness.
+ *
+ * @param arr array to add object to
+ * @param obj object to possibly add to array
+ * @param getCompareValue function that returns the comparison value for uniqueness
+ */
+const addUniqueObjectWithCallback = (arr, obj, getCompareValue) => {
+    if (arr.every(x => getCompareValue(x) !== getCompareValue(obj))) {
+        arr.push(obj);
+    }
+};
+/**
+ * Adds an object to the array if it is unique based on its 'code' property.
+ *
+ * @param arr array of objects with a 'code' property
+ * @param obj object to possibly add
+ */
+const addUniqueObjectByCode = (arr, obj) => addUniqueObjectWithCallback(arr, obj, item => item.code);
 //# sourceMappingURL=groupSearchResults.js.map

package/dist/groupSearchResults.js.map

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

package/dist/index.d.ts

@@ -1,8 +1,11 @@
 export * from './createApiClient';
 export { EducationalLevelCode, LadokStatusCode } from '@kth/ladok-attributvarde-utils';
 export { SearchErrorCode } from './utils/SearchError';
+export type { SearchParams } from './search/types';
+export type { OmKursenLadokApiClient } from './types/OmKursenLadokApiClient';
 export type { ProgrammeCurriculum } from './utils/programmeUtil';
 export type { ProgrammeCurriculumStudyYear } from './utils/programmeUtil';
 export type { ProgrammeCourse } from './utils/programmeStructureUtil';
 export type { Tillfallesperiod } from './mapCourseInstance';
 export * from './utils/AcademicSemester';
+export * from './kth';

package/dist/index.js

@@ -22,4 +22,5 @@ Object.defineProperty(exports, "LadokStatusCode", { enumerable: true, get: funct
 var SearchError_1 = require("./utils/SearchError");
 Object.defineProperty(exports, "SearchErrorCode", { enumerable: true, get: function () { return SearchError_1.SearchErrorCode; } });
 __exportStar(require("./utils/AcademicSemester"), exports);
+__exportStar(require("./kth"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,4EAAsF;AAA7E,iIAAA,oBAAoB,OAAA;AAAE,4HAAA,eAAe,OAAA;AAC9C,mDAAqD;AAA5C,8GAAA,eAAe,OAAA;AAQxB,2DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,4EAAsF;AAA7E,iIAAA,oBAAoB,OAAA;AAAE,4HAAA,eAAe,OAAA;AAC9C,mDAAqD;AAA5C,8GAAA,eAAe,OAAA;AAUxB,2DAAwC;AACxC,wCAAqB"}

package/dist/kth/KTHPeriod/KTHPeriod.d.ts

@@ -17,3 +17,4 @@ export declare const isKTHPeriodLabel: (s: string) => s is KTHPeriodLabel;
 export declare const matchKthPeriodToSemesterNumber: (period: KTHPeriod) => SemesterNumber | undefined;
 export declare const compareKTHPeriod: (a: KTHPeriod, b: KTHPeriod) => number;
 export declare const compareKTHPeriodSemester: (a: KTHPeriodSemester, b: KTHPeriodSemester) => number;
+export declare const formatKTHPeriodSemester: (kthPeriodSemester: KTHPeriodSemester) => string;

package/dist/kth/KTHPeriod/KTHPeriod.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareKTHPeriodSemester = exports.compareKTHPeriod = exports.matchKthPeriodToSemesterNumber = exports.isKTHPeriodLabel = exports.parseKTHPeriod = exports.formatKTHPeriod = void 0;
+exports.formatKTHPeriodSemester = exports.compareKTHPeriodSemester = exports.compareKTHPeriod = exports.matchKthPeriodToSemesterNumber = exports.isKTHPeriodLabel = exports.parseKTHPeriod = exports.formatKTHPeriod = void 0;
 const utils_1 = require("../../utils");
 const formatKTHPeriod = (kthPeriod) => {
     return `P${kthPeriod}`;
@@ -57,4 +57,8 @@ const compareKTHPeriodSemester = (a, b) => {
     return (0, exports.compareKTHPeriod)(a.period, b.period);
 };
 exports.compareKTHPeriodSemester = compareKTHPeriodSemester;
+const formatKTHPeriodSemester = (kthPeriodSemester) => {
+    return `${kthPeriodSemester.semester.year}:${(0, exports.formatKTHPeriod)(kthPeriodSemester.period)}`;
+};
+exports.formatKTHPeriodSemester = formatKTHPeriodSemester;
 //# sourceMappingURL=KTHPeriod.js.map

package/dist/kth/KTHPeriod/KTHPeriod.js.map

@@ -1 +1 @@
-{"version":3,"file":"KTHPeriod.js","sourceRoot":"","sources":["../../../src/kth/KTHPeriod/KTHPeriod.ts"],"names":[],"mappings":";;;AAAA,uCAA8D;AAkBvD,MAAM,eAAe,GAAG,CAAC,SAAoB,EAAE,EAAE;IACtD,OAAO,IAAI,SAAS,EAAoB,CAAA;AAC1C,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAED,MAAM,KAAK,GAAG,YAAY,CAAA;AAEnB,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAE,EAAE;IAClD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAc,CAAA;AACtC,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAEM,MAAM,gBAAgB,GAAG,CAAC,CAAS,EAAuB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAApE,QAAA,gBAAgB,oBAAoD;AAE1E,MAAM,8BAA8B,GAAG,CAAC,MAAiB,EAA8B,EAAE;IAC9F,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,CAAC,CAAC;QACP,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,sBAAc,CAAC,MAAM,CAAA;QAC9B,KAAK,CAAC,CAAC;QACP,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,sBAAc,CAAC,MAAM,CAAA;IAChC,CAAC;AACH,CAAC,CAAA;AAXY,QAAA,8BAA8B,kCAW1C;AAEM,MAAM,gBAAgB,GAAG,CAAC,CAAY,EAAE,CAAY,EAAE,EAAE;IAC7D,OAAO,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B;AAED,MAAM,YAAY,GAAG,CAAC,SAAoB,EAAE,EAAE;IAC5C,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;IACZ,CAAC;AACH,CAAC,CAAA;AAEM,MAAM,wBAAwB,GAAG,CAAC,CAAoB,EAAE,CAAoB,EAAE,EAAE;IACrF,MAAM,kBAAkB,GAAG,wBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;IAC3E,IAAI,kBAAkB,KAAK,CAAC;QAAE,OAAO,kBAAkB,CAAA;IAEvD,OAAO,IAAA,wBAAgB,EAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAA;AAC7C,CAAC,CAAA;AALY,QAAA,wBAAwB,4BAKpC"}
+{"version":3,"file":"KTHPeriod.js","sourceRoot":"","sources":["../../../src/kth/KTHPeriod/KTHPeriod.ts"],"names":[],"mappings":";;;AAAA,uCAA8D;AAkBvD,MAAM,eAAe,GAAG,CAAC,SAAoB,EAAE,EAAE;IACtD,OAAO,IAAI,SAAS,EAAoB,CAAA;AAC1C,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAED,MAAM,KAAK,GAAG,YAAY,CAAA;AAEnB,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAE,EAAE;IAClD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAc,CAAA;AACtC,CAAC,CAAA;AAPY,QAAA,cAAc,kBAO1B;AAEM,MAAM,gBAAgB,GAAG,CAAC,CAAS,EAAuB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAApE,QAAA,gBAAgB,oBAAoD;AAE1E,MAAM,8BAA8B,GAAG,CAAC,MAAiB,EAA8B,EAAE;IAC9F,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,CAAC,CAAC;QACP,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,sBAAc,CAAC,MAAM,CAAA;QAC9B,KAAK,CAAC,CAAC;QACP,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACJ,OAAO,sBAAc,CAAC,MAAM,CAAA;IAChC,CAAC;AACH,CAAC,CAAA;AAXY,QAAA,8BAA8B,kCAW1C;AAEM,MAAM,gBAAgB,GAAG,CAAC,CAAY,EAAE,CAAY,EAAE,EAAE;IAC7D,OAAO,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA;AAFY,QAAA,gBAAgB,oBAE5B;AAED,MAAM,YAAY,GAAG,CAAC,SAAoB,EAAE,EAAE;IAC5C,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;QACV,KAAK,CAAC;YACJ,OAAO,CAAC,CAAA;IACZ,CAAC;AACH,CAAC,CAAA;AAEM,MAAM,wBAAwB,GAAG,CAAC,CAAoB,EAAE,CAAoB,EAAE,EAAE;IACrF,MAAM,kBAAkB,GAAG,wBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;IAC3E,IAAI,kBAAkB,KAAK,CAAC;QAAE,OAAO,kBAAkB,CAAA;IAEvD,OAAO,IAAA,wBAAgB,EAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAA;AAC7C,CAAC,CAAA;AALY,QAAA,wBAAwB,4BAKpC;AAEM,MAAM,uBAAuB,GAAG,CAAC,iBAAoC,EAAE,EAAE;IAC9E,OAAO,GAAG,iBAAiB,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAA,uBAAe,EAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAA;AAC1F,CAAC,CAAA;AAFY,QAAA,uBAAuB,2BAEnC"}

package/dist/kth/KTHPeriod/calculateKTHPeriodSemesterFromTillfallesperiod.d.ts

@@ -1,5 +1,5 @@
 import { Tillfallesperiod } from '../../mapCourseInstance';
-import { KTHPeriodDefinition, KTHPeriodSemester } from './KTHPeriod';
+import { KTHPeriodDefinition } from './KTHPeriod';
 /**
  * This function attempts to match the Forsta and SistaUndervisningsdatum of each tillfallesperiod to a KTHPeriod.
  * It returns an array of KTHPeriod
@@ -7,4 +7,4 @@ import { KTHPeriodDefinition, KTHPeriodSemester } from './KTHPeriod';
  * @param kthPeriods KTHPeriodDefinitions
  * @returns
  */
-export declare const calculateKTHPeriodSemesterFromTillfallesperiod: (tillfallesperioder: Pick<Tillfallesperiod, "ForstaUndervisningsdatum" | "SistaUndervisningsdatum">[] | undefined, kthPeriods: KTHPeriodDefinition[] | undefined) => KTHPeriodSemester[] | undefined;
+export declare const calculateKTHPeriodSemesterFromTillfallesperiod: (tillfallesperioder: Pick<Tillfallesperiod, "ForstaUndervisningsdatum" | "SistaUndervisningsdatum">[] | undefined, kthPeriods: KTHPeriodDefinition[] | undefined) => import("./KTHPeriod").KTHPeriodSemester[] | undefined;

package/dist/kth/KTHPeriod/calculateKTHPeriodSemesterFromTillfallesperiod.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateKTHPeriodSemesterFromTillfallesperiod = void 0;
+const collectionUtils_1 = require("../../utils/collectionUtils");
 const typeChecking_1 = require("../../utils/typeChecking");
 const KTHPeriod_1 = require("./KTHPeriod");
 const matchDateToKTHPeriodYear_1 = require("./matchDateToKTHPeriodYear");
@@ -21,21 +22,9 @@ const calculateKTHPeriodSemesterFromTillfallesperiod = (tillfallesperioder, kthP
             (0, matchDateToKTHPeriodYear_1.matchDateToKTHPeriodYear)(new Date(ForstaUndervisningsdatum), kthPeriods),
             (0, matchDateToKTHPeriodYear_1.matchDateToKTHPeriodYear)(new Date(SistaUndervisningsdatum), kthPeriods),
         ];
-        return filterDefinedAndDistinctValues(periods);
+        return (0, collectionUtils_1.filterDefinedAndDistinctValues)(periods, item => item.period);
     });
     return result.sort(KTHPeriod_1.compareKTHPeriodSemester);
 };
 exports.calculateKTHPeriodSemesterFromTillfallesperiod = calculateKTHPeriodSemesterFromTillfallesperiod;
-const filterDefinedAndDistinctValues = (kthPeriods) => {
-    const definedPeriods = kthPeriods.filter(typeChecking_1.isDefined);
-    const seenPeriods = new Set();
-    // We loop over the defined periods
-    const distinctFirst = definedPeriods.filter(period => {
-        if (seenPeriods.has(period.period))
-            return false; // If we've seen a period before, we do not want to have it once more, return false to filter out
-        seenPeriods.add(period.period); // Otherwise, we mark it as seen
-        return true; // and return true to keep it
-    });
-    return distinctFirst;
-};
 //# sourceMappingURL=calculateKTHPeriodSemesterFromTillfallesperiod.js.map

package/dist/kth/KTHPeriod/calculateKTHPeriodSemesterFromTillfallesperiod.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculateKTHPeriodSemesterFromTillfallesperiod.js","sourceRoot":"","sources":["../../../src/kth/KTHPeriod/calculateKTHPeriodSemesterFromTillfallesperiod.ts"],"names":[],"mappings":";;;AACA,2DAAuE;AACvE,2CAAyG;AACzG,yEAAqE;AAErE;;;;;;GAMG;AACI,MAAM,8CAA8C,GAAG,CAC5D,kBAAgH,EAChH,UAA6C,EAC7C,EAAE;IACF,IAAI,CAAC,IAAA,gCAAiB,EAAC,kBAAkB,CAAC;QAAE,OAAO,SAAS,CAAA;IAC5D,IAAI,CAAC,IAAA,gCAAiB,EAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAA;IAEpD,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,EAAE,EAAE;QAClG,MAAM,OAAO,GAAG;YACd,IAAA,mDAAwB,EAAC,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE,UAAU,CAAC;YACxE,IAAA,mDAAwB,EAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,EAAE,UAAU,CAAC;SACxE,CAAA;QAED,OAAO,8BAA8B,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,IAAI,CAAC,oCAAwB,CAAC,CAAA;AAC9C,CAAC,CAAA;AAjBY,QAAA,8CAA8C,kDAiB1D;AAED,MAAM,8BAA8B,GAAG,CAAC,UAA6C,EAAuB,EAAE;IAC5G,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IAEnD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAa,CAAA;IAExC,mCAAmC;IACnC,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACnD,IAAI,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAA,CAAC,iGAAiG;QAElJ,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA,CAAC,gCAAgC;QAC/D,OAAO,IAAI,CAAA,CAAC,6BAA6B;IAC3C,CAAC,CAAC,CAAA;IAEF,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA"}
+{"version":3,"file":"calculateKTHPeriodSemesterFromTillfallesperiod.js","sourceRoot":"","sources":["../../../src/kth/KTHPeriod/calculateKTHPeriodSemesterFromTillfallesperiod.ts"],"names":[],"mappings":";;;AACA,iEAA4E;AAC5E,2DAA4D;AAC5D,2CAA2E;AAC3E,yEAAqE;AAErE;;;;;;GAMG;AACI,MAAM,8CAA8C,GAAG,CAC5D,kBAAgH,EAChH,UAA6C,EAC7C,EAAE;IACF,IAAI,CAAC,IAAA,gCAAiB,EAAC,kBAAkB,CAAC;QAAE,OAAO,SAAS,CAAA;IAC5D,IAAI,CAAC,IAAA,gCAAiB,EAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAA;IAEpD,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,wBAAwB,EAAE,uBAAuB,EAAE,EAAE,EAAE;QAClG,MAAM,OAAO,GAAG;YACd,IAAA,mDAAwB,EAAC,IAAI,IAAI,CAAC,wBAAwB,CAAC,EAAE,UAAU,CAAC;YACxE,IAAA,mDAAwB,EAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,EAAE,UAAU,CAAC;SACxE,CAAA;QAED,OAAO,IAAA,gDAA8B,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrE,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,IAAI,CAAC,oCAAwB,CAAC,CAAA;AAC9C,CAAC,CAAA;AAjBY,QAAA,8CAA8C,kDAiB1D"}

package/dist/kth/KTHPeriod/createKTHPeriodSemester.d.ts

@@ -0,0 +1,9 @@
+import { KTHPeriodSemester } from './KTHPeriod';
+/**
+ * Takes a year and kthPeriodString.
+ * Will return a KTHPeriodSemester or undefined if the kthPeriodString could not be parsed
+ * @param year year for the KTHPeriod
+ * @param kthPeriodString kthPeriodString to match to a KTHPeriod, e.g. P1, P2
+ * @returns
+ */
+export declare const createKTHPeriodSemester: (year: number, kthPeriodString: string) => KTHPeriodSemester | undefined;

package/dist/kth/KTHPeriod/createKTHPeriodSemester.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createKTHPeriodSemester = void 0;
+const utils_1 = require("../../utils");
+const typeChecking_1 = require("../../utils/typeChecking");
+const KTHPeriod_1 = require("./KTHPeriod");
+/**
+ * Takes a year and kthPeriodString.
+ * Will return a KTHPeriodSemester or undefined if the kthPeriodString could not be parsed
+ * @param year year for the KTHPeriod
+ * @param kthPeriodString kthPeriodString to match to a KTHPeriod, e.g. P1, P2
+ * @returns
+ */
+const createKTHPeriodSemester = (year, kthPeriodString) => {
+    const kthPeriod = (0, KTHPeriod_1.parseKTHPeriod)(kthPeriodString);
+    if (!(0, typeChecking_1.isDefined)(kthPeriod))
+        return undefined;
+    // We know that the response from matchKthPeriodToSemesterNumber will not be undefined, because the passed kthPeriod is of correct format.
+    const semesterNumber = (0, KTHPeriod_1.matchKthPeriodToSemesterNumber)(kthPeriod);
+    return {
+        period: kthPeriod,
+        semester: new utils_1.AcademicSemester(year, semesterNumber),
+    };
+};
+exports.createKTHPeriodSemester = createKTHPeriodSemester;
+//# sourceMappingURL=createKTHPeriodSemester.js.map

package/dist/kth/KTHPeriod/createKTHPeriodSemester.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createKTHPeriodSemester.js","sourceRoot":"","sources":["../../../src/kth/KTHPeriod/createKTHPeriodSemester.ts"],"names":[],"mappings":";;;AAAA,uCAA8C;AAC9C,2DAAoD;AACpD,2CAA+F;AAE/F;;;;;;GAMG;AACI,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAE,eAAuB,EAAiC,EAAE;IAC9G,MAAM,SAAS,GAAG,IAAA,0BAAc,EAAC,eAAe,CAAC,CAAA;IAEjD,IAAI,CAAC,IAAA,wBAAS,EAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE3C,0IAA0I;IAC1I,MAAM,cAAc,GAAG,IAAA,0CAA8B,EAAC,SAAS,CAAE,CAAA;IAEjE,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,IAAI,wBAAgB,CAAC,IAAI,EAAE,cAAc,CAAC;KACrD,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,uBAAuB,2BAYnC"}

package/dist/kth/KTHPeriod/extractKTHPeriodSemesterFromLasperiodsfordelning.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractKTHPeriodSemesterFromLasperiodsfordelning = void 0;
-const utils_1 = require("../../utils");
 const typeChecking_1 = require("../../utils/typeChecking");
+const createKTHPeriodSemester_1 = require("./createKTHPeriodSemester");
 const KTHPeriod_1 = require("./KTHPeriod");
 const extractKTHPeriodSemesterFromLasperiodsfordelning = (tillfallesperioder) => {
     if (!(0, typeChecking_1.isArrayWithValues)(tillfallesperioder))
@@ -23,14 +23,6 @@ exports.extractKTHPeriodSemesterFromLasperiodsfordelning = extractKTHPeriodSemes
 const strictIsoDate = /^(?:[0-9]{4})-(?:0[1-9]|1[0-2])-(?:0[1-9]|[12]\d|3[01])$/;
 const isStrictIsoDate = (s) => strictIsoDate.test(s);
 const extractKHTPeriodFromLasperiodsfordelning = (yearOfFirstTuitionDate) => ({ Lasperiodskod }) => {
-    const kthPeriod = (0, KTHPeriod_1.parseKTHPeriod)(Lasperiodskod);
-    if (!(0, typeChecking_1.isDefined)(kthPeriod))
-        return undefined;
-    // We know that the response from matchKthPeriodToSemesterNumber will not be undefined, because the passed kthPeriod is of correct format.
-    const semesterNumber = (0, KTHPeriod_1.matchKthPeriodToSemesterNumber)(kthPeriod);
-    return {
-        period: kthPeriod,
-        semester: new utils_1.AcademicSemester(yearOfFirstTuitionDate, semesterNumber),
-    };
+    return (0, createKTHPeriodSemester_1.createKTHPeriodSemester)(yearOfFirstTuitionDate, Lasperiodskod);
 };
 //# sourceMappingURL=extractKTHPeriodSemesterFromLasperiodsfordelning.js.map

package/dist/kth/KTHPeriod/extractKTHPeriodSemesterFromLasperiodsfordelning.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractKTHPeriodSemesterFromLasperiodsfordelning.js","sourceRoot":"","sources":["../../../src/kth/KTHPeriod/extractKTHPeriodSemesterFromLasperiodsfordelning.ts"],"names":[],"mappings":";;;AACA,uCAA8C;AAC9C,2DAAuE;AACvE,2CAKoB;AAMb,MAAM,gDAAgD,GAAG,CAC9D,kBAA0D,EACzB,EAAE;IACnC,IAAI,CAAC,IAAA,gCAAiB,EAAC,kBAAkB,CAAC;QAAE,OAAO,SAAS,CAAA;IAE5D,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,EAAE,EAAE;QACnG,IAAI,CAAC,IAAA,gCAAiB,EAAC,oBAAoB,CAAC;YAAE,OAAO,SAAS,CAAA;QAE9D,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC;YAAE,OAAO,SAAS,CAAA;QAEhE,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,wBAAwB,CAAC,CAAA;QAE3D,OAAO,oBAAoB,CAAC,GAAG,CAAC,wCAAwC,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;IAC3G,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IAEtD,iBAAiB,CAAC,IAAI,CAAC,oCAAwB,CAAC,CAAA;IAEhD,OAAO,iBAAiB,CAAA;AAC1B,CAAC,CAAA;AApBY,QAAA,gDAAgD,oDAoB5D;AAED,MAAM,aAAa,GAAG,0DAA0D,CAAA;AAEhF,MAAM,eAAe,GAAG,CAAC,CAAS,EAAW,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,wCAAwC,GAC5C,CAAC,sBAA8B,EAAE,EAAE,CACnC,CAAC,EAAE,aAAa,EAA+C,EAAE,EAAE;IACjE,MAAM,SAAS,GAAG,IAAA,0BAAc,EAAC,aAAa,CAAC,CAAA;IAE/C,IAAI,CAAC,IAAA,wBAAS,EAAC,SAAS,CAAC;QAAE,OAAO,SAAS,CAAA;IAE3C,0IAA0I;IAC1I,MAAM,cAAc,GAAG,IAAA,0CAA8B,EAAC,SAAS,CAAE,CAAA;IAEjE,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,IAAI,wBAAgB,CAAC,sBAAsB,EAAE,cAAc,CAAC;KACvE,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"extractKTHPeriodSemesterFromLasperiodsfordelning.js","sourceRoot":"","sources":["../../../src/kth/KTHPeriod/extractKTHPeriodSemesterFromLasperiodsfordelning.ts"],"names":[],"mappings":";;;AACA,2DAAuE;AACvE,uEAAmE;AACnE,2CAAyE;AAMlE,MAAM,gDAAgD,GAAG,CAC9D,kBAA0D,EACzB,EAAE;IACnC,IAAI,CAAC,IAAA,gCAAiB,EAAC,kBAAkB,CAAC;QAAE,OAAO,SAAS,CAAA;IAE5D,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,EAAE,EAAE;QACnG,IAAI,CAAC,IAAA,gCAAiB,EAAC,oBAAoB,CAAC;YAAE,OAAO,SAAS,CAAA;QAE9D,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC;YAAE,OAAO,SAAS,CAAA;QAEhE,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,wBAAwB,CAAC,CAAA;QAE3D,OAAO,oBAAoB,CAAC,GAAG,CAAC,wCAAwC,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;IAC3G,CAAC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IAEtD,iBAAiB,CAAC,IAAI,CAAC,oCAAwB,CAAC,CAAA;IAEhD,OAAO,iBAAiB,CAAA;AAC1B,CAAC,CAAA;AApBY,QAAA,gDAAgD,oDAoB5D;AAED,MAAM,aAAa,GAAG,0DAA0D,CAAA;AAEhF,MAAM,eAAe,GAAG,CAAC,CAAS,EAAW,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AAErE,MAAM,wCAAwC,GAC5C,CAAC,sBAA8B,EAAE,EAAE,CACnC,CAAC,EAAE,aAAa,EAA+C,EAAiC,EAAE;IAChG,OAAO,IAAA,iDAAuB,EAAC,sBAAsB,EAAE,aAAa,CAAC,CAAA;AACvE,CAAC,CAAA"}

package/dist/kth/index.d.ts

@@ -0,0 +1 @@
+export * from './KTHPeriod/createKTHPeriodSemester';

package/dist/kth/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./KTHPeriod/createKTHPeriodSemester"), exports);
+//# sourceMappingURL=index.js.map

package/dist/kth/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/kth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sEAAmD"}

package/dist/mapCourseInstance.js

@@ -28,7 +28,7 @@ const mapCourseInstance = (item, language, partOfProgramme) => {
     const startperiod = (0, ladok_attributvarde_utils_1.extractStartPeriod)(attributeValues);
     return {
         uid: item.tillfalle_uid,
-        utbildningstyp: (0, creditsUtil_1.getCreditsUnit)((0, ladok_attributvarde_utils_1.extractUtbildningstyp)(item.instans.Attributvarden), language), // TODO Benni why is this creditUnit and not utbildningstyp?
+        utbildningstyp: (0, creditsUtil_1.getCreditsUnit)((0, ladok_attributvarde_utils_1.extractUtbildningstyp)(item.instans.Attributvarden), language), // TODO why is this creditUnit and not utbildningstyp?
         status: (0, ladok_attributvarde_utils_1.extractLadokStatus)(item.Attributvarden),
         installt: (_a = (0, ladok_attributvarde_utils_1.extractBoolean)(item.Attributvarden, 'installt')) !== null && _a !== void 0 ? _a : false,
         tillfalleskod: (0, ladok_attributvarde_utils_1.extractString)(attributeValues, 'utbildning.attribut.utbildningstillfalleskod'),

package/dist/mapCourseInstance.js.map

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

package/dist/{mapSearchResult.d.ts → mapCourseInstanceResult.d.ts}

@@ -1,6 +1,7 @@
 import { LadokStatus } from '@kth/ladok-attributvarde-utils';
-import { SokUtbildningsTillfalleItem, SokUtbildningsTillfalleSlimItem } from '@kth/ladok-mellanlager-client';
+import { PeriodItem, SokUtbildningsTillfalleItem, SokUtbildningsTillfalleSlimItem } from '@kth/ladok-mellanlager-client';
 import { Language, TranslatedGrunddata, TranslatedOrganisation, TranslatedUtbildningstyp } from './utils/languageUtil';
+import { KTHPeriodSemester } from './kth/KTHPeriod/KTHPeriod';
 export type SearchResultPeriod = {
     startperiod: string;
     forstaUndervisningsdatum?: {
@@ -17,7 +18,7 @@ export type SearchResultPeriod = {
     };
     tillfallesperioderNummer: number;
 };
-export type CourseSearchResult = {
+export type CourseInstanceResult = {
     versionsnummer: number;
     kod: string;
     benamning: string;
@@ -36,8 +37,9 @@ export type CourseSearchResult = {
         code: string;
         inDigits: string | null;
     };
-    period?: SearchResultPeriod;
-    isMiljo?: boolean;
     status?: LadokStatus;
+    isMiljo?: boolean;
+    kthPeriods: KTHPeriodSemester[];
+    startingKTHPeriod: KTHPeriodSemester | undefined;
 };
-export declare const mapKursTillfalleResult: (courseInstance: SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem, language: Language) => CourseSearchResult;
+export declare const mapCourseInstanceResult: (courseInstance: SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem, periodItems: PeriodItem[], language: Language) => CourseInstanceResult;

package/dist/{mapSearchResult.js → mapCourseInstanceResult.js}

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapKursTillfalleResult = void 0;
+exports.mapCourseInstanceResult = void 0;
 const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
 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 mapCourseInstance
-const mapKursTillfalleResult = (courseInstance, language) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+const getKTHPeriodSemesters_1 = require("./kth/KTHPeriod/getKTHPeriodSemesters");
+// TODO this should be refactored together with mapCourseInstance
+const mapCourseInstanceResult = (courseInstance, periodItems, language) => {
+    var _a, _b, _c;
     const 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'),
@@ -26,6 +27,8 @@ const mapKursTillfalleResult = (courseInstance, language) => {
     const schoolCode = (0, schoolUtil_1.extractSchoolCodeFromOrganisation)(organisation, language);
     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);
+    const kthPeriods = (0, getKTHPeriodSemesters_1.getKTHPeriodSemesters)(courseInstance.Tillfallesperioder, periodItems);
+    const startingKTHPeriod = kthPeriods.at(0);
     return {
         versionsnummer: (0, ladok_attributvarde_utils_1.extractVersionNumber)(courseInstance.instans.Attributvarden),
         kod: (0, ladok_attributvarde_utils_1.extractString)(courseInstance.instans.Attributvarden, 'utbildning.attribut.kod'),
@@ -44,24 +47,12 @@ const mapKursTillfalleResult = (courseInstance, language) => {
             code: startperiod.code,
             inDigits: (0, utils_1.transformPeriodInDigits)(startperiod.code),
         },
-        period: {
-            startperiod: (startperiod === null || startperiod === void 0 ? void 0 : startperiod.code) || '',
-            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 = 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 = courseInstance.Tillfallesperioder.at(-1)) === null || _j === void 0 ? void 0 : _j.SistaUndervisningsdatum)),
-            tillfallesperioderNummer: courseInstance.Tillfallesperioder.length,
-        },
+        kthPeriods,
+        startingKTHPeriod,
         schoolCode,
         isMiljo,
         status: (0, ladok_attributvarde_utils_1.extractLadokStatus)(courseInstance.Attributvarden),
     };
 };
-exports.mapKursTillfalleResult = mapKursTillfalleResult;
-//# sourceMappingURL=mapSearchResult.js.map
+exports.mapCourseInstanceResult = mapCourseInstanceResult;
+//# sourceMappingURL=mapCourseInstanceResult.js.map

package/dist/mapCourseInstanceResult.js.map

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

package/dist/search/createSearchApi.js

@@ -10,46 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSearchApi = void 0;
-const searchUtils_1 = require("./utils/searchUtils");
-const getAllEntitiesByUseOfContinuation_1 = require("../utils/getAllEntitiesByUseOfContinuation");
-const mapSearchResult_1 = require("../mapSearchResult");
-const groupSearchResults_1 = require("../groupSearchResults");
-const errorUtils_1 = require("../utils/errorUtils");
-const mapCourseInstanceSearchDTO_1 = require("./utils/mapCourseInstanceSearchDTO");
 const searchService_1 = require("./searchService");
-const supportService_1 = require("../supportApis/supportService");
 const SearchError_1 = require("../utils/SearchError");
-const continuationConfig_1 = require("./continuationConfig");
-const statusUtils_1 = require("../utils/statusUtils");
 const createSearchApi = (ladokClient) => {
     const searchService = new searchService_1.SearchService(ladokClient);
-    const supportService = new supportService_1.SupportService(ladokClient);
     return {
-        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);
-                const { requestQuery, filterPeriod } = (0, searchUtils_1.prepareSearchRequestQueryForKursTillfallen)(cleanSearchParams, departmentList);
-                const { allEntities: allCourses } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalle, requestQuery, {
-                    maxSearchResultsToReturn: continuationConfig_1.SEARCH_MAX_SEARCH_RESULTS_TO_RETURN,
-                    maxContinuationIterations: continuationConfig_1.SEARCH_MAX_CONTINUATION_ITERATIONS,
-                });
-                const mappedCourses = allCourses.map(course => (0, mapSearchResult_1.mapKursTillfalleResult)(course, language));
-                const noDraftCourses = (0, statusUtils_1.removeDrafts)(mappedCourses);
-                const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(noDraftCourses, 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 courseInstanceSearchDTOs = courseVersionsToShow.map(mapCourseInstanceSearchDTO_1.mapCourseInstanceSearchDTO);
-                return { searchHits: courseInstanceSearchDTOs };
-            }
-            catch (error) {
-                const searchError = (0, errorUtils_1.toSearchError)(error);
-                return {
-                    searchHits: [],
-                    errorCode: searchError.errorCode,
-                };
-            }
-        }),
+        searchCourseInstances: searchService.searchCourseInstances.bind(searchService),
         searchCourseVersions: searchService.searchCourseVersions.bind(searchService),
         getDepartmentWithCourseList: (departmentParams, language) => __awaiter(void 0, void 0, void 0, function* () {
             const { department, courses } = yield searchService.getDepartmentWithCourseList(departmentParams, language);

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,mFAA+E;AAC/E,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AACtD,6DAA8G;AAC9G,sDAAmD;AAE5C,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,EAAE;oBAC5C,wBAAwB,EAAE,wDAAmC;oBAC7D,yBAAyB,EAAE,uDAAkC;iBAC9D,CAAC,CAAA;gBAEF,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,0BAAY,EAAC,aAAa,CAAC,CAAA;gBAElD,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC,cAAc,EAAE,YAAY,CAAC,CAAA;gBAEvE,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;AApEY,QAAA,eAAe,mBAoE3B"}
+{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,mDAA+C;AAC/C,sDAAsD;AAE/C,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,OAAO;QACL,qBAAqB,EAAE,aAAa,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC9E,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;AA7BY,QAAA,eAAe,mBA6B3B"}

package/dist/search/searchService.d.ts

@@ -4,10 +4,12 @@ import { Language } from '../utils';
 import { OrganisationService } from '../supportApis/organisationService';
 import { SupportService } from '../supportApis/supportService';
 import { DepartmentFlat } from '../supportApis/types';
+import { PeriodService } from '../supportApis/PeriodService';
 export declare class SearchService {
     private ladokClient;
     organisationService: OrganisationService;
     supportService: SupportService;
+    periodService: PeriodService;
     constructor(ladokClient: LadokMellanlagerApiClient);
     searchCourseVersions(searchParams: SearchParams, language: Language): Promise<{
         searchHits: CourseVersionDTO[];
@@ -16,6 +18,13 @@ export declare class SearchService {
         searchHits: never[];
         errorCode: import("../utils/SearchError").SearchErrorCode;
     }>;
+    searchCourseInstances(searchParams: SearchParams, language: Language): Promise<{
+        searchHits: import("./types").CourseInstanceSearchDTO[];
+        errorCode?: undefined;
+    } | {
+        searchHits: never[];
+        errorCode: import("../utils/SearchError").SearchErrorCode;
+    }>;
     private searchLatestApprovedCourseVersions;
     getDepartmentWithCourseList({ organisation, utbildningsniva: rawUtbildningsniva }: DepartmentParams, language: Language): Promise<{
         department: DepartmentFlat | undefined;