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

package/dist/search/searchService.js

@@ -21,11 +21,17 @@ const organisationService_1 = require("../supportApis/organisationService");
 const supportService_1 = require("../supportApis/supportService");
 const SearchError_1 = require("../utils/SearchError");
 const continuationConfig_1 = require("./continuationConfig");
+const statusUtils_1 = require("../utils/statusUtils");
+const PeriodService_1 = require("../supportApis/PeriodService");
+const mapCourseInstanceResult_1 = require("../mapCourseInstanceResult");
+const groupSearchResults_1 = require("../groupSearchResults");
+const mapCourseInstanceSearchDTO_1 = require("./utils/mapCourseInstanceSearchDTO");
 class SearchService {
     constructor(ladokClient) {
         this.ladokClient = ladokClient;
         this.organisationService = new organisationService_1.OrganisationService(ladokClient);
         this.supportService = new supportService_1.SupportService(ladokClient);
+        this.periodService = new PeriodService_1.PeriodService(ladokClient);
     }
     searchCourseVersions(searchParams, language) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51,6 +57,39 @@ class SearchService {
             }
         });
     }
+    searchCourseInstances(searchParams, language) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const cleanSearchParams = (0, searchUtils_1.validateAndCleanSearchParams)(searchParams);
+                const [departmentList, periodItems] = yield Promise.all([
+                    this.supportService.getSchoolsWithDepartmentsForSearch(language),
+                    this.periodService.getPeriodItems(),
+                ]);
+                const requestQuery = (0, searchUtils_1.prepareSearchRequestQueryForKursTillfallen)(cleanSearchParams, departmentList);
+                const groupByPeriod = Boolean(requestQuery.startPeriod);
+                const { allEntities: allCourses } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(this.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, mapCourseInstanceResult_1.mapCourseInstanceResult)(course, periodItems, language));
+                const noDraftCourses = (0, statusUtils_1.removeDrafts)(mappedCourses);
+                const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(noDraftCourses, groupByPeriod);
+                // TODO Remove this once we have a query parameter to filter for miljö courses
+                const courseInstancesFilteredByMiljo = (0, searchUtils_1.possiblyFilterByMiljo)(groupedCourses, cleanSearchParams.onlyMHU);
+                // TODO Remove this once we have a query parameter to filter by period
+                const courseInstancesToShow = (0, searchUtils_1.possiblyFilterByKTHPeriod)(courseInstancesFilteredByMiljo, cleanSearchParams.kthPeriods);
+                const courseInstanceSearchDTOs = courseInstancesToShow.map(mapCourseInstanceSearchDTO_1.mapCourseInstanceSearchDTO);
+                return { searchHits: courseInstanceSearchDTOs };
+            }
+            catch (error) {
+                const searchError = (0, errorUtils_1.toSearchError)(error);
+                return {
+                    searchHits: [],
+                    errorCode: searchError.errorCode,
+                };
+            }
+        });
+    }
     searchLatestApprovedCourseVersions(requestQueryForKursInstans, language, continuationOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             const { allEntities: allCourseVersions } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(this.ladokClient.sokUtbildningsInstans, requestQueryForKursInstans, continuationOptions);

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,5 +1,6 @@
 import { EducationalLevelCode } from '@kth/ladok-attributvarde-utils';
 import { Language } from '../utils';
+import { KTHPeriodLabel, KTHPeriodSemester } from '../kth/KTHPeriod/KTHPeriod';
 export type SearchApi = {
     searchCourseInstances: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseInstanceSearchDTO>>;
     searchCourseVersions: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseVersionDTO>>;
@@ -18,12 +19,14 @@ export type SearchParams = {
     organisation?: string;
     sprak?: string;
     avvecklad?: string;
-    startPeriod?: string[];
+    semesterKthPeriods?: string[];
     utbildningsniva?: string[];
     onlyMHU?: boolean;
 };
-export type CleanSearchParams = Omit<SearchParams, 'utbildningsniva'> & {
+export type CleanSearchParams = Omit<SearchParams, 'utbildningsniva' | 'kthPeriods'> & {
     utbildningsniva?: EducationalLevelCode[];
+    ladokStartPeriods?: string[];
+    kthPeriods?: KTHPeriodSemester[];
 };
 export type CourseVersionDTO = {
     kod: string;
@@ -36,17 +39,18 @@ export type CourseInstanceSearchDTO = {
     benamning: string;
     omfattning: string;
     startTerm?: string;
-    perioder: {
-        startPeriod?: number;
-        startPeriodYear: string;
-        endPeriod?: number;
-        endPeriodYear: string;
-        tillfallesperioderNummer?: number;
-    }[];
     utbildningstyper: string[];
     studietakter: number[];
     undervisningssprak: string[];
     studieorter: string[];
+    kthPeriodRange?: {
+        start: KTHPeriodSemesterDTO;
+        end?: KTHPeriodSemesterDTO;
+    };
+    courseHasNoInstances: boolean;
+};
+export type KTHPeriodSemesterDTO = Pick<KTHPeriodSemester, 'semester'> & {
+    period: KTHPeriodLabel;
 };
 export type RequestQuery = {
     attributVarden?: string;

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

@@ -0,0 +1,16 @@
+import { KTHPeriodSemester } from '../../kth/KTHPeriod/KTHPeriod';
+/**
+ * Takes an array of SemesterKTHPeriod strings in the format YYYY:P0, e.g. 2024:P3
+ * Returns parsed kthPeriodSemesters (KTHPeriodSemester) and matching ladokStartPeriods, e.g. VT2024
+ * The ladokStartPeriods are used to query Ladok for course instances.
+ * The kthPeriodSemesters are used to filter the courseInstanceResults by matching KTHPeriods.
+ * @param rawSemesterKthPeriods
+ * @returns
+ */
+export declare const createKTHPeriodSemestersAndLadokStartPeriods: (rawSemesterKthPeriods?: string[]) => {
+    kthPeriodSemesters: undefined;
+    ladokStartPeriods: undefined;
+} | {
+    kthPeriodSemesters: KTHPeriodSemester[];
+    ladokStartPeriods: string[];
+};

package/dist/search/utils/createLadokPeriodsAndKthPeriods.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createKTHPeriodSemestersAndLadokStartPeriods = void 0;
+const createKTHPeriodSemester_1 = require("../../kth/KTHPeriod/createKTHPeriodSemester");
+const utils_1 = require("../../utils");
+const collectionUtils_1 = require("../../utils/collectionUtils");
+const typeChecking_1 = require("../../utils/typeChecking");
+/**
+ * Takes an array of SemesterKTHPeriod strings in the format YYYY:P0, e.g. 2024:P3
+ * Returns parsed kthPeriodSemesters (KTHPeriodSemester) and matching ladokStartPeriods, e.g. VT2024
+ * The ladokStartPeriods are used to query Ladok for course instances.
+ * The kthPeriodSemesters are used to filter the courseInstanceResults by matching KTHPeriods.
+ * @param rawSemesterKthPeriods
+ * @returns
+ */
+const createKTHPeriodSemestersAndLadokStartPeriods = (rawSemesterKthPeriods) => {
+    if (!(0, typeChecking_1.isArrayWithValues)(rawSemesterKthPeriods)) {
+        return {
+            kthPeriodSemesters: undefined,
+            ladokStartPeriods: undefined,
+        };
+    }
+    const unfilteredKthPeriods = rawSemesterKthPeriods.map(rawKthPeriod => {
+        if (!isValidKthPeriodString(rawKthPeriod))
+            return undefined;
+        const { year, periodString } = extractYearAndPeriod(rawKthPeriod);
+        return (0, createKTHPeriodSemester_1.createKTHPeriodSemester)(year, periodString);
+    });
+    const kthPeriodSemesters = unfilteredKthPeriods.filter(typeChecking_1.isDefined);
+    const distinctLadokPeriods = createDistinctLadokPeriods(kthPeriodSemesters);
+    return { kthPeriodSemesters, ladokStartPeriods: distinctLadokPeriods };
+};
+exports.createKTHPeriodSemestersAndLadokStartPeriods = createKTHPeriodSemestersAndLadokStartPeriods;
+const isValidKthPeriodString = (rawKthPeriod) => semesterKTHPeriodRegex.test(rawKthPeriod);
+const semesterKTHPeriodRegex = /^\d{4}:P[0-5]$/;
+const extractYearAndPeriod = (rawKthPeriod) => {
+    const [yearString, periodString] = rawKthPeriod.split(':');
+    return {
+        year: parseInt(yearString, 10),
+        periodString,
+    };
+};
+/**
+ * Takes an array of KTHPeriodSemesters and returns an array of distinct LadokPeriods which match the AcademicSemesters
+ * of the KTHPeriodSemesters.
+ * Example (simplified):
+ * - 2024 P3 (maps to spring 2024)
+ * - 2024 P1 (maps to autumn 2024)
+ * - 2024 P2 (maps to autumn 2024)
+ *
+ * Would result in ['VT2024', 'HT2024'], because 2024 P1 and P2 are autumn periods (HT2024) and P3 is a spring period (VT2024).
+ * @param kthPeriodSemesters
+ * @returns
+ */
+const createDistinctLadokPeriods = (kthPeriodSemesters) => {
+    const academicSemesters = kthPeriodSemesters.map(({ semester }) => semester);
+    academicSemesters.sort(utils_1.AcademicSemester.compare);
+    const distinctSemesters = (0, collectionUtils_1.filterDefinedAndDistinctValues)(academicSemesters, item => item.toKTHSemesterString());
+    const distinctLadokPeriods = distinctSemesters.map(semester => semester.toLadokPeriodString());
+    return distinctLadokPeriods;
+};
+//# sourceMappingURL=createLadokPeriodsAndKthPeriods.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"createLadokPeriodsAndKthPeriods.js","sourceRoot":"","sources":["../../../src/search/utils/createLadokPeriodsAndKthPeriods.ts"],"names":[],"mappings":";;;AAAA,yFAAqF;AAErF,uCAA8C;AAC9C,iEAA4E;AAC5E,2DAAuE;AAEvE;;;;;;;GAOG;AACI,MAAM,4CAA4C,GAAG,CAAC,qBAAgC,EAAE,EAAE;IAC/F,IAAI,CAAC,IAAA,gCAAiB,EAAC,qBAAqB,CAAC,EAAE,CAAC;QAC9C,OAAO;YACL,kBAAkB,EAAE,SAAS;YAC7B,iBAAiB,EAAE,SAAS;SAC7B,CAAA;IACH,CAAC;IAED,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;QACpE,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC;YAAE,OAAO,SAAS,CAAA;QAE3D,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAEjE,OAAO,IAAA,iDAAuB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAA;IACpD,CAAC,CAAC,CAAA;IAEF,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IAEjE,MAAM,oBAAoB,GAAG,0BAA0B,CAAC,kBAAkB,CAAC,CAAA;IAE3E,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAA;AACxE,CAAC,CAAA;AArBY,QAAA,4CAA4C,gDAqBxD;AAED,MAAM,sBAAsB,GAAG,CAAC,YAAoB,EAAE,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;AAClG,MAAM,sBAAsB,GAAG,gBAAgB,CAAA;AAE/C,MAAM,oBAAoB,GAAG,CAAC,YAAoB,EAA0C,EAAE;IAC5F,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE1D,OAAO;QACL,IAAI,EAAE,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;QAC9B,YAAY;KACb,CAAA;AACH,CAAC,CAAA;AAED;;;;;;;;;;;GAWG;AACH,MAAM,0BAA0B,GAAG,CAAC,kBAAuC,EAAE,EAAE;IAC7E,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAA;IAE5E,iBAAiB,CAAC,IAAI,CAAC,wBAAgB,CAAC,OAAO,CAAC,CAAA;IAEhD,MAAM,iBAAiB,GAAG,IAAA,gDAA8B,EAAC,iBAAiB,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAA;IAE/G,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC,CAAA;IAE9F,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA"}

package/dist/search/utils/mapCourseInstanceSearchDTO.js

@@ -2,15 +2,7 @@
 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 KTHPeriod_1 = require("../../kth/KTHPeriod/KTHPeriod");
 const mapCourseInstanceSearchDTO = (courseInstance) => {
     var _a;
     const utbildningstyper = courseInstance.utbildningstyp.map(({ level: { name: educationalLevel = '' } = {} }) => educationalLevel);
@@ -19,13 +11,8 @@ const mapCourseInstanceSearchDTO = (courseInstance) => {
     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,
-    }));
+    const kthPeriodRange = getKTHPeriodRange(courseInstance.kthPeriods);
+    const courseHasNoInstances = !(0, typeChecking_1.isDefined)(kthPeriodRange);
     return {
         kod: courseInstance.kod,
         benamning: courseInstance.benamning,
@@ -35,8 +22,34 @@ const mapCourseInstanceSearchDTO = (courseInstance) => {
         undervisningssprak,
         studieorter,
         startTerm,
-        perioder,
+        kthPeriodRange,
+        courseHasNoInstances,
     };
 };
 exports.mapCourseInstanceSearchDTO = mapCourseInstanceSearchDTO;
+/**
+ * Returns the KTH period range (start and end) from an array of KTHPeriodSemester.
+ * If the array is empty or undefined, returns undefined.
+ * If the array has only one element, the end will be undefined.
+ * @param kthPeriods Array of KTHPeriodSemester
+ * @returns KTHPeriodRangeDTO or undefined
+ */
+const getKTHPeriodRange = (kthPeriods) => {
+    if (!(0, typeChecking_1.isArrayWithValues)(kthPeriods))
+        return undefined;
+    const kthPeriodRangeStart = kthPeriods.at(0);
+    const kthPeriodRangeEnd = kthPeriods.length <= 1 ? undefined : kthPeriods.at(-1);
+    return {
+        start: mapKTHPeriodSemesterDTO(kthPeriodRangeStart), // We know that kthPeriodRangeStart is defined here
+        end: mapKTHPeriodSemesterDTO(kthPeriodRangeEnd),
+    };
+};
+const mapKTHPeriodSemesterDTO = (kthPeriodSemester) => {
+    if (!(0, typeChecking_1.isDefined)(kthPeriodSemester))
+        return undefined;
+    return {
+        semester: kthPeriodSemester.semester,
+        period: (0, KTHPeriod_1.formatKTHPeriod)(kthPeriodSemester.period),
+    };
+};
 //# sourceMappingURL=mapCourseInstanceSearchDTO.js.map

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

@@ -1 +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"}
+{"version":3,"file":"mapCourseInstanceSearchDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseInstanceSearchDTO.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AAGvE,6DAAkF;AAE3E,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,cAAc,GAAG,iBAAiB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAA;IACnE,MAAM,oBAAoB,GAAG,CAAC,IAAA,wBAAS,EAAC,cAAc,CAAC,CAAA;IAEvD,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,cAAc;QACd,oBAAoB;KACrB,CAAA;AACH,CAAC,CAAA;AA/BY,QAAA,0BAA0B,8BA+BtC;AAED;;;;;;GAMG;AACH,MAAM,iBAAiB,GAAG,CAAC,UAA+B,EAAE,EAAE;IAC5D,IAAI,CAAC,IAAA,gCAAiB,EAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAA;IAEpD,MAAM,mBAAmB,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5C,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IAEhF,OAAO;QACL,KAAK,EAAE,uBAAuB,CAAC,mBAAmB,CAAE,EAAE,mDAAmD;QACzG,GAAG,EAAE,uBAAuB,CAAC,iBAAiB,CAAC;KAChD,CAAA;AACH,CAAC,CAAA;AAED,MAAM,uBAAuB,GAAG,CAC9B,iBAAgD,EACd,EAAE;IACpC,IAAI,CAAC,IAAA,wBAAS,EAAC,iBAAiB,CAAC;QAAE,OAAO,SAAS,CAAA;IAEnD,OAAO;QACL,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;QACpC,MAAM,EAAE,IAAA,2BAAe,EAAC,iBAAiB,CAAC,MAAM,CAAC;KAClD,CAAA;AACH,CAAC,CAAA"}

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

@@ -1,7 +1,8 @@
-import { SokUtbildningsInstansQuery, SokUtbildningsTillfalleQuery } from '@kth/ladok-mellanlager-client';
+import { SokUtbildningsInstansQuery, SokUtbildningsTillfalleSlimQuery } from '@kth/ladok-mellanlager-client';
 import { CleanSearchParams, SearchParams } from '../types';
 import { SchoolWithDepartments } from '../../supportApis/types';
 import { CourseVersion } from '../../mapCourseVersion';
+import { KTHPeriodSemester } from '../../kth/KTHPeriod/KTHPeriod';
 /**
  * Validates and cleans the search parameters for the search API.
  * Throws an error if the searchParams are invalid.
@@ -12,10 +13,7 @@ import { CourseVersion } from '../../mapCourseVersion';
  * - kodEllerBenamning: if kodEllerBenamning is provided but less than 3 characters
  */
 export declare const validateAndCleanSearchParams: (searchParams: SearchParams) => CleanSearchParams;
-export declare const prepareSearchRequestQueryForKursTillfallen: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => {
-    requestQuery: NonNullable<SokUtbildningsTillfalleQuery>;
-    filterPeriod: boolean;
-};
+export declare const prepareSearchRequestQueryForKursTillfallen: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => NonNullable<SokUtbildningsTillfalleSlimQuery>;
 export declare const prepareSearchRequestQueryForCourseVersion: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => NonNullable<SokUtbildningsInstansQuery>;
 export declare const prepareSearchRequestQueryForDepartmentList: (schoolsWithDepartments: SchoolWithDepartments[], { rawUtbildningsniva, organisation, }: {
     organisation?: string;
@@ -38,3 +36,13 @@ export declare const findLatestCourseVersions: (courseVersions: CourseVersion[])
 export declare const possiblyFilterByMiljo: <T extends {
     isMiljo?: boolean;
 }>(courses: T[], onlyMHU?: boolean) => T[];
+/**
+ * If requestedKthPeriods is given, will only return courses that have a startingPeriod that matches
+ * one of the requestedKthPeriods
+ * @param courses
+ * @param requestedKthPeriods startingKTHPeriods to filter by
+ * @returns
+ */
+export declare const possiblyFilterByKTHPeriod: <T extends {
+    startingKTHPeriod?: KTHPeriodSemester;
+}>(courses: T[], requestedKthPeriods: KTHPeriodSemester[] | undefined) => T[];

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.prepareSearchRequestQueryForCourseVersion = exports.prepareSearchRequestQueryForKursTillfallen = exports.validateAndCleanSearchParams = void 0;
+exports.possiblyFilterByKTHPeriod = 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");
@@ -8,6 +8,8 @@ const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
 const typeChecking_1 = require("../../utils/typeChecking");
 const queryConstants_1 = require("../../queryConstants");
 const educationalTypeUtils_1 = require("./educationalTypeUtils");
+const createLadokPeriodsAndKthPeriods_1 = require("./createLadokPeriodsAndKthPeriods");
+const KTHPeriod_1 = require("../../kth/KTHPeriod/KTHPeriod");
 /**
  * Validates and cleans the search parameters for the search API.
  * Throws an error if the searchParams are invalid.
@@ -18,20 +20,23 @@ const educationalTypeUtils_1 = require("./educationalTypeUtils");
  * - kodEllerBenamning: if kodEllerBenamning is provided but less than 3 characters
  */
 const validateAndCleanSearchParams = (searchParams) => {
-    const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva: rawUtbildningsniva, avvecklad, onlyMHU, } = searchParams;
+    const { kodEllerBenamning, organisation, sprak, utbildningsniva: rawUtbildningsniva, avvecklad, onlyMHU, semesterKthPeriods, // 2025:P1
+     } = searchParams;
     // TODO add onlyMHU here as well once we have a query parameter to filter for miljö courses
-    if (!avvecklad && !kodEllerBenamning && !organisation && !sprak && !startPeriod && !rawUtbildningsniva) {
+    if (!avvecklad && !kodEllerBenamning && !organisation && !sprak && !semesterKthPeriods && !rawUtbildningsniva) {
         throw SearchError_1.SearchError.noRestrictions();
     }
     if (kodEllerBenamning && kodEllerBenamning.length < 3) {
         throw SearchError_1.SearchError.kodEllerBenamning();
     }
+    const { kthPeriodSemesters: kthPeriods, ladokStartPeriods } = (0, createLadokPeriodsAndKthPeriods_1.createKTHPeriodSemestersAndLadokStartPeriods)(semesterKthPeriods);
     const utbildningsniva = rawUtbildningsniva ? cleanUtbildningsnivaParam(rawUtbildningsniva) : undefined;
     return {
         kodEllerBenamning,
         organisation,
         sprak,
-        startPeriod,
+        ladokStartPeriods,
+        kthPeriods,
         utbildningsniva,
         avvecklad,
         onlyMHU,
@@ -57,12 +62,11 @@ const mapUtbildningsniva = (utbildningsniva) => {
     }
 };
 const prepareSearchRequestQueryForKursTillfallen = (searchParams, schoolsWithDepartments) => {
-    const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
+    const { kodEllerBenamning, organisation, sprak, ladokStartPeriods, utbildningsniva, avvecklad } = searchParams;
     const educationalTypes = (0, educationalTypeUtils_1.getUtbildningsnivaParameterForKursTillfalle)(utbildningsniva);
     const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
-    const filterPeriod = !Boolean(startPeriod);
-    const requestQuery = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }, getStartPeriodOrTerminkodStart(startPeriod)), (educationalTypes && { utbildningsniva: educationalTypes })), (organisationsFilter && { organisation: organisationsFilter })), (sprak && { sprak })), (avvecklad && { avvecklad })), { utbildningstypid: utbildningsTypIdConstants_1.INSTANCE_UTBILDNINGSTYP_IDS, antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR });
-    return { requestQuery, filterPeriod }; // TODO Benni this does two things, filterPeriod should probably be split out
+    const requestQuery = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }, getStartPeriodOrTerminkodStart(ladokStartPeriods)), (educationalTypes && { utbildningsniva: educationalTypes })), (organisationsFilter && { organisation: organisationsFilter })), (sprak && { sprak })), (avvecklad && { avvecklad })), { utbildningstypid: utbildningsTypIdConstants_1.INSTANCE_UTBILDNINGSTYP_IDS, antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR });
+    return requestQuery;
 };
 exports.prepareSearchRequestQueryForKursTillfallen = prepareSearchRequestQueryForKursTillfallen;
 const getOrganisationsFilter = (organisationer, organisation) => {
@@ -94,25 +98,25 @@ exports.prepareSearchRequestQueryForDepartmentList = prepareSearchRequestQueryFo
 /**
  * If startPeriod is defined, returns it as an object with startPeriod property and comma-separated values.
  * If not, returns an object with terminkodStart property and the default period.
- * @param startPeriod array of start periods
+ * @param ladokStartPeriods array of start periods
  * @returns
  */
-const getStartPeriodOrTerminkodStart = (startPeriod) => {
-    if (startPeriod && startPeriod.length > 0) {
-        return { startPeriod: startPeriod.join(',') };
+const getStartPeriodOrTerminkodStart = (ladokStartPeriods) => {
+    if ((0, typeChecking_1.isArrayWithValues)(ladokStartPeriods)) {
+        return { startPeriod: ladokStartPeriods.join(',') };
     }
-    return { terminkodStart: getDefaultPeriod() };
+    return { terminkodStart: getDefaultLadokPeriod() };
 };
 /**
  *
- * @returns the default period code based on the current date.
+ * @returns the default LadokPeriod based on the current date.
  */
-const getDefaultPeriod = () => {
+const getDefaultLadokPeriod = () => {
     const now = new Date();
-    const defaultPeriod = (0, utils_1.getPeriodCodeForDate)(now);
-    return defaultPeriod;
+    const defaultLadokPeriod = (0, utils_1.getLadokPeriodCodeForDate)(now);
+    return defaultLadokPeriod;
 };
-// TODO Benni: refactor or remove this function if it is not needed anymore (basically a failsafe)
+// TODO refactor or remove this function if it is not needed anymore (basically a failsafe)
 /**
  * This function takes an array of courseVersions, groups them by their kod, and finds the latest version of each course.
  * It returns an array of distinct courses (based on kod).
@@ -135,7 +139,6 @@ const findLatestCourseVersions = (courseVersions) => {
     return latestDefinedCourses;
 };
 exports.findLatestCourseVersions = findLatestCourseVersions;
-// TODO Remove this once we have a query parameter to filter for miljö courses
 /**
  * If onlyMHU is true, this function filters the courses to only include those that have the flag isMiljo set to true.
  * @param courses
@@ -148,4 +151,18 @@ const possiblyFilterByMiljo = (courses, onlyMHU = false) => {
     return courses.filter(course => course.isMiljo);
 };
 exports.possiblyFilterByMiljo = possiblyFilterByMiljo;
+/**
+ * If requestedKthPeriods is given, will only return courses that have a startingPeriod that matches
+ * one of the requestedKthPeriods
+ * @param courses
+ * @param requestedKthPeriods startingKTHPeriods to filter by
+ * @returns
+ */
+const possiblyFilterByKTHPeriod = (courses, requestedKthPeriods) => {
+    if (!(0, typeChecking_1.isArrayWithValues)(requestedKthPeriods))
+        return courses;
+    const wanted = new Set(requestedKthPeriods.map(KTHPeriod_1.formatKTHPeriodSemester));
+    return courses.filter(({ startingKTHPeriod }) => (0, typeChecking_1.isDefined)(startingKTHPeriod) && wanted.has((0, KTHPeriod_1.formatKTHPeriodSemester)(startingKTHPeriod)));
+};
+exports.possiblyFilterByKTHPeriod = possiblyFilterByKTHPeriod;
 //# sourceMappingURL=searchUtils.js.map

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/utils/SearchError.d.ts

@@ -31,9 +31,9 @@ export declare class SearchError extends Error {
     static missingParameter(message: string): SearchError;
 }
 export declare enum SearchErrorCode {
-    UNKNOWN_ERROR = "unknownError",
-    OVERFLOW = "search-error-overflow",
-    KOD_OR_BENAMNING_MISSING = "errorKodEllerBenamning",
-    NO_RESTRICTIONS = "errorNoRestrictions",
-    MISSING_PARAMETER = "errorMissingParameter"
+    UNKNOWN_ERROR = "unknown",
+    OVERFLOW = "overflow",
+    KOD_OR_BENAMNING_MISSING = "kod-or-benamning-missing",
+    NO_RESTRICTIONS = "no-restrictions",
+    MISSING_PARAMETER = "missing-parameter"
 }

package/dist/utils/SearchError.js

@@ -48,13 +48,12 @@ class SearchError extends Error {
     }
 }
 exports.SearchError = SearchError;
-// TODO Benni refactor naming convention to be more consistent, make sure it is in sync with KP
 var SearchErrorCode;
 (function (SearchErrorCode) {
-    SearchErrorCode["UNKNOWN_ERROR"] = "unknownError";
-    SearchErrorCode["OVERFLOW"] = "search-error-overflow";
-    SearchErrorCode["KOD_OR_BENAMNING_MISSING"] = "errorKodEllerBenamning";
-    SearchErrorCode["NO_RESTRICTIONS"] = "errorNoRestrictions";
-    SearchErrorCode["MISSING_PARAMETER"] = "errorMissingParameter";
+    SearchErrorCode["UNKNOWN_ERROR"] = "unknown";
+    SearchErrorCode["OVERFLOW"] = "overflow";
+    SearchErrorCode["KOD_OR_BENAMNING_MISSING"] = "kod-or-benamning-missing";
+    SearchErrorCode["NO_RESTRICTIONS"] = "no-restrictions";
+    SearchErrorCode["MISSING_PARAMETER"] = "missing-parameter";
 })(SearchErrorCode || (exports.SearchErrorCode = SearchErrorCode = {}));
 //# sourceMappingURL=SearchError.js.map

package/dist/utils/SearchError.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchError.js","sourceRoot":"","sources":["../../src/utils/SearchError.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAY,SAAQ,KAAK;IAEpC,YAAoB,SAA0B,EAAE,OAAgB;QAC9D,KAAK,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,SAAS,CAAC,CAAA;QAC3B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACpD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,OAAe;QAC5B,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IAChE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,OAAe;QAC7B,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,iBAAiB;QACtB,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAA;IAClE,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,cAAc;QACnB,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;IACzD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAe;QACrC,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IACpE,CAAC;CACF;AAnDD,kCAmDC;AAED,+FAA+F;AAC/F,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,iDAA8B,CAAA;IAC9B,qDAAkC,CAAA;IAClC,sEAAmD,CAAA;IACnD,0DAAuC,CAAA;IACvC,8DAA2C,CAAA;AAC7C,CAAC,EANW,eAAe,+BAAf,eAAe,QAM1B"}
+{"version":3,"file":"SearchError.js","sourceRoot":"","sources":["../../src/utils/SearchError.ts"],"names":[],"mappings":";;;AAAA,MAAa,WAAY,SAAQ,KAAK;IAEpC,YAAoB,SAA0B,EAAE,OAAgB;QAC9D,KAAK,CAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,SAAS,CAAC,CAAA;QAC3B,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;QACzB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAA;IACpD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,OAAO,CAAC,OAAe;QAC5B,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IAChE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,OAAe;QAC7B,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,iBAAiB;QACtB,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAA;IAClE,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,cAAc;QACnB,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;IACzD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAe;QACrC,OAAO,IAAI,WAAW,CAAC,eAAe,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IACpE,CAAC;CACF;AAnDD,kCAmDC;AAED,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,4CAAyB,CAAA;IACzB,wCAAqB,CAAA;IACrB,wEAAqD,CAAA;IACrD,sDAAmC,CAAA;IACnC,0DAAuC,CAAA;AACzC,CAAC,EANW,eAAe,+BAAf,eAAe,QAM1B"}

package/dist/utils/collectionUtils.d.ts

@@ -2,3 +2,12 @@
  * Groups an array of items by a given key selector.
  */
 export declare const groupBy: <T, K>(items: T[], keySelector: (item: T) => K) => Map<K, T[]>;
+/**
+ * Takes an array of items and will return an array of defined and distinct items.
+ * Distinction is measured based on the supplied keySelector function
+ *
+ * @param items the items to filter
+ * @param keySelector function that returns a key based on an item
+ * @returns array of defined and distinct (based on the key) items
+ */
+export declare const filterDefinedAndDistinctValues: <T, K>(items: (T | undefined)[], keySelector: (item: T) => K) => T[];

package/dist/utils/collectionUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.groupBy = void 0;
+exports.filterDefinedAndDistinctValues = exports.groupBy = void 0;
+const typeChecking_1 = require("./typeChecking");
 /**
  * Groups an array of items by a given key selector.
  */
@@ -16,4 +17,26 @@ const groupBy = (items, keySelector) => {
     return grouped;
 };
 exports.groupBy = groupBy;
+/**
+ * Takes an array of items and will return an array of defined and distinct items.
+ * Distinction is measured based on the supplied keySelector function
+ *
+ * @param items the items to filter
+ * @param keySelector function that returns a key based on an item
+ * @returns array of defined and distinct (based on the key) items
+ */
+const filterDefinedAndDistinctValues = (items, keySelector) => {
+    const definedItems = items.filter(typeChecking_1.isDefined);
+    const seenItems = new Set();
+    // We loop over the defined items
+    const distinctFirst = definedItems.filter(item => {
+        const key = keySelector(item);
+        if (seenItems.has(key))
+            return false; // If we've seen an item before, we do not want to have it once more, return false to filter out
+        seenItems.add(key); // Otherwise, we mark it as seen
+        return true; // and return true to keep it
+    });
+    return distinctFirst;
+};
+exports.filterDefinedAndDistinctValues = filterDefinedAndDistinctValues;
 //# sourceMappingURL=collectionUtils.js.map

package/dist/utils/collectionUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectionUtils.js","sourceRoot":"","sources":["../../src/utils/collectionUtils.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACI,MAAM,OAAO,GAAG,CAAO,KAAU,EAAE,WAA2B,EAAe,EAAE;IACpF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QACtB,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAZY,QAAA,OAAO,WAYnB"}
+{"version":3,"file":"collectionUtils.js","sourceRoot":"","sources":["../../src/utils/collectionUtils.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAE1C;;GAEG;AACI,MAAM,OAAO,GAAG,CAAO,KAAU,EAAE,WAA2B,EAAe,EAAE;IACpF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QACtB,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAZY,QAAA,OAAO,WAYnB;AAED;;;;;;;GAOG;AACI,MAAM,8BAA8B,GAAG,CAAO,KAAwB,EAAE,WAA2B,EAAO,EAAE;IACjH,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,wBAAS,CAAC,CAAA;IAE5C,MAAM,SAAS,GAAG,IAAI,GAAG,EAAK,CAAA;IAE9B,iCAAiC;IACjC,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/C,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAE7B,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAA,CAAC,gGAAgG;QAErI,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA,CAAC,gCAAgC;QACnD,OAAO,IAAI,CAAA,CAAC,6BAA6B;IAC3C,CAAC,CAAC,CAAA;IAEF,OAAO,aAAa,CAAA;AACtB,CAAC,CAAA;AAhBY,QAAA,8BAA8B,kCAgB1C"}

package/dist/utils/getAllEntitiesByUseOfContinuation.js

@@ -26,16 +26,16 @@ const getAllEntitiesByUseOfContinuation = (apiCall_1, requestQuery_1, ...args_1)
         const requestHeader = Object.assign({}, (continuationToken !== null && continuationToken !== undefined && { continuationToken }));
         const result = yield apiCall(requestQuery, requestHeader);
         responseInfo = result.responseInfo;
-        // TODO Benni If we get this error after a few continuations, what should happen? At least error log
+        // TODO If we get this error after a few continuations, what should happen? At least error log
         if (typeof result === 'string') {
             throw SearchError_1.SearchError.unknown(result);
         }
-        // TODO Benni If we get this error after a few continuations, what should happen? At least error log
+        // TODO If we get this error after a few continuations, what should happen? At least error log
         if (result.type === 'error') {
             throw SearchError_1.SearchError.unknown(result.responseInfo.message);
         }
         if (result.searchMeta.pageResultSize === 0) {
-            // TODO Benni: can we occur this on the last continuationToken? Check here whether we have allCourses at all or not
+            // TODO If we get this on the last continuationToken? Check here whether we have allCourses at all or not
             return { responseInfo, allEntities: [] };
         }
         allEntities = allEntities.concat(result.items);

package/dist/utils/getAllEntitiesByUseOfContinuation.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../src/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,sDAAkD;AAGlD,MAAM,4BAA4B,GAAG,IAAI,CAAA;AACzC,MAAM,2BAA2B,GAAG,EAAE,CAAA;AAE/B,MAAM,iCAAiC,GAAG,uCAeH,EAAE,8EAX9C,OAK4C,EAC5C,YAAe,EACf,EACE,wBAAwB,GAAG,4BAA4B,EACvD,yBAAyB,GAAG,2BAA2B,MAChC,EAAE;;IAE3B,IAAI,iBAAiB,GAAuB,SAAS,CAAA;IACrD,IAAI,cAAc,GAAG,CAAC,CAAA;IACtB,IAAI,WAAW,GAAQ,EAAE,CAAA;IACzB,IAAI,YAAgD,CAAA;IAEpD,GAAG,CAAC;QACF,IAAI,cAAc,IAAI,yBAAyB,EAAE,CAAC;YAChD,MAAM,yBAAW,CAAC,QAAQ,CAAC,sDAAsD,yBAAyB,EAAE,CAAC,CAAA;QAC/G,CAAC;QACD,MAAM,aAAa,qBACd,CAAC,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,SAAS,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAC5F,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QAEzD,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;QAElC,oGAAoG;QACpG,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;QAED,oGAAoG;QACpG,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;QAED,IAAI,MAAM,CAAC,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;YAC3C,mHAAmH;YACnH,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,CAAA;QAC1C,CAAC;QAED,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9C,IAAI,WAAW,CAAC,MAAM,GAAG,wBAAwB,EAAE,CAAC;YAClD,MAAM,yBAAW,CAAC,QAAQ,CAAC,wCAAwC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1F,CAAC;QAED,iBAAiB,GAAG,MAAA,MAAM,CAAC,UAAU,CAAC,iBAAiB,mCAAI,SAAS,CAAA;QACpE,cAAc,EAAE,CAAA;IAClB,CAAC,QAAQ,iBAAiB,EAAC;IAE3B,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAA;AACtC,CAAC,CAAA,CAAA;AA1DY,QAAA,iCAAiC,qCA0D7C"}
+{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../src/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,sDAAkD;AAGlD,MAAM,4BAA4B,GAAG,IAAI,CAAA;AACzC,MAAM,2BAA2B,GAAG,EAAE,CAAA;AAE/B,MAAM,iCAAiC,GAAG,uCAeH,EAAE,8EAX9C,OAK4C,EAC5C,YAAe,EACf,EACE,wBAAwB,GAAG,4BAA4B,EACvD,yBAAyB,GAAG,2BAA2B,MAChC,EAAE;;IAE3B,IAAI,iBAAiB,GAAuB,SAAS,CAAA;IACrD,IAAI,cAAc,GAAG,CAAC,CAAA;IACtB,IAAI,WAAW,GAAQ,EAAE,CAAA;IACzB,IAAI,YAAgD,CAAA;IAEpD,GAAG,CAAC;QACF,IAAI,cAAc,IAAI,yBAAyB,EAAE,CAAC;YAChD,MAAM,yBAAW,CAAC,QAAQ,CAAC,sDAAsD,yBAAyB,EAAE,CAAC,CAAA;QAC/G,CAAC;QACD,MAAM,aAAa,qBACd,CAAC,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,SAAS,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAC5F,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,aAAa,CAAC,CAAA;QAEzD,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;QAElC,8FAA8F;QAC9F,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnC,CAAC;QAED,8FAA8F;QAC9F,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,yBAAW,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;QAED,IAAI,MAAM,CAAC,UAAU,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;YAC3C,yGAAyG;YACzG,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,CAAA;QAC1C,CAAC;QAED,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9C,IAAI,WAAW,CAAC,MAAM,GAAG,wBAAwB,EAAE,CAAC;YAClD,MAAM,yBAAW,CAAC,QAAQ,CAAC,wCAAwC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;QAC1F,CAAC;QAED,iBAAiB,GAAG,MAAA,MAAM,CAAC,UAAU,CAAC,iBAAiB,mCAAI,SAAS,CAAA;QACpE,cAAc,EAAE,CAAA;IAClB,CAAC,QAAQ,iBAAiB,EAAC;IAE3B,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAA;AACtC,CAAC,CAAA,CAAA;AA1DY,QAAA,iCAAiC,qCA0D7C"}