@kth/om-kursen-ladok-client 1.3.5 → 1.3.7

package/dist/search/createSearchApi.js

@@ -0,0 +1,103 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSearchApi = void 0;
+const searchUtils_1 = require("./utils/searchUtils");
+const SearchError_1 = require("./SearchError");
+const getAllEntitiesByUseOfContinuation_1 = require("./utils/getAllEntitiesByUseOfContinuation");
+const mapSearchResult_1 = require("../mapSearchResult");
+const groupSearchResults_1 = require("../groupSearchResults");
+const errorUtils_1 = require("../utils/errorUtils");
+const mapCourse_1 = require("../mapCourse");
+const gradingScalesUtils_1 = require("../utils/gradingScalesUtils");
+const utils_1 = require("../utils");
+const createSearchApi = (ladokClient) => {
+    return {
+        searchCourses: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                (0, searchUtils_1.validateSearchParams)(searchParams);
+                const utbildningstyper = yield extractUtbildningstypItems(ladokClient.utbildningstyp()); // TODO: Use cached values
+                const { requestQuery, filterPeriod } = (0, searchUtils_1.prepareSearchRequestQueryForKursTillfallen)(utbildningstyper, searchParams);
+                const allCourses = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, requestQuery);
+                const mappedCourses = allCourses.map(course => (0, mapSearchResult_1.mapKursTillfalleResult)(course, language));
+                const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(mappedCourses, filterPeriod);
+                return { searchHits: groupedCourses };
+            }
+            catch (error) {
+                const searchError = (0, errorUtils_1.toSearchError)(error);
+                return {
+                    searchHits: [],
+                    errorCode: searchError.errorCode,
+                };
+            }
+        }),
+        searchCourseVersions: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                (0, searchUtils_1.validateSearchParams)(searchParams);
+                const requestQueryForKursInstans = (0, searchUtils_1.prepareSearchRequestQueryForKursInstans)(searchParams);
+                const allCourses = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstansSlim, requestQueryForKursInstans);
+                const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient); // TODO: Use cached values
+                // TODO Benni: maybe do the mapping after the filtering?
+                const mappedCourses = allCourses.map(course => (0, mapCourse_1.mapCourse)(course, language, gradingScalesCodes));
+                const latestCourses = findLatestCourses(mappedCourses);
+                // TODO Benni: should use mapBasicCourse instead of this
+                const basicCourses = latestCourses.map(course => {
+                    return {
+                        uid: course.uid,
+                        versionsnummer: course === null || course === void 0 ? void 0 : course.versionsnummer,
+                        kod: course.kod,
+                        benamning: course.benamning,
+                        omfattning: course.omfattning,
+                    };
+                });
+                return { searchHits: basicCourses };
+            }
+            catch (error) {
+                const searchError = (0, errorUtils_1.toSearchError)(error);
+                return {
+                    searchHits: [],
+                    errorCode: searchError.errorCode,
+                };
+            }
+        }),
+    };
+};
+exports.createSearchApi = createSearchApi;
+/**
+ * This function extracts the utbildningstyp items from the API response.
+ * It throws an error if the response is invalid or if the data is not present.
+ * @param utbildningstypApiCall
+ * @returns
+ */
+const extractUtbildningstypItems = (utbildningstypApiCall) => __awaiter(void 0, void 0, void 0, function* () {
+    const utbildningstypResponse = yield utbildningstypApiCall;
+    // TODO Benni: this can be refactored more, e.g. enum for type
+    if (utbildningstypResponse.type === 'error' || !(utbildningstypResponse === null || utbildningstypResponse === void 0 ? void 0 : utbildningstypResponse.data)) {
+        throw SearchError_1.SearchError.unknown(`Failed to fetch valid utbildningstyp data: ${utbildningstypResponse.responseInfo.message}`);
+    }
+    return utbildningstypResponse.data.Utbildningstyp;
+});
+// TODO Benni: refactor and possibly move
+const findLatestCourses = (mappedCourses) => {
+    const coursesGroupedByKurskod = new Map();
+    for (const course of mappedCourses) {
+        if (!coursesGroupedByKurskod.has(course.kod)) {
+            coursesGroupedByKurskod.set(course.kod, []);
+        }
+        coursesGroupedByKurskod.get(course.kod).push(course);
+    }
+    const courseVersionsGroupedByKurskodArray = Array.from(coursesGroupedByKurskod.entries()).map(([, value]) => value);
+    const latestDefinedCourses = courseVersionsGroupedByKurskodArray
+        .map(courses => (0, utils_1.findLatestVersion)(courses))
+        .filter(course => course !== undefined);
+    return latestDefinedCourses;
+};
+//# sourceMappingURL=createSearchApi.js.map

package/dist/search/createSearchApi.js.map

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

package/dist/search/types.d.ts

@@ -0,0 +1,21 @@
+import { GroupedCourseSearchResult } from '../groupSearchResults';
+import { BasicCourse } from '../mapCourse';
+import { Language } from '../utils';
+export type SearchApi = {
+    searchCourses: (searchParams: SearchParams, language: Language) => Promise<{
+        searchHits?: GroupedCourseSearchResult[] | [];
+        errorCode?: string;
+    } | string>;
+    searchCourseVersions: (searchParams: SearchParams, language: Language) => Promise<{
+        searchHits?: BasicCourse[];
+        errorCode?: string;
+    } | string>;
+};
+export type SearchParams = {
+    kodEllerBenamning?: string;
+    organisation?: string;
+    sprak?: string;
+    avvecklad?: string;
+    startPeriod?: string[];
+    utbildningsniva?: string[];
+};

package/dist/search/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/search/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/search/types.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,18 @@
+import { MellanlagringSearchResponse } from '@kth/ladok-mellanlager-client';
+export type RequestQuery = {
+    attributVarden: string;
+    instansAttributVarden: string;
+    antalTraffar: string;
+    avvecklad?: string | undefined;
+    sprak?: string | undefined;
+    organisation?: string | undefined;
+    utbildningsniva: string;
+    kodEllerBenamning: string;
+} & ({
+    startPeriod: string;
+} | {
+    terminkodStart: string;
+});
+export declare const getAllEntitiesByUseOfContinuation: <T>(apiCall: (requestQuery: RequestQuery, requestHeader?: {
+    continuationToken?: string;
+}) => Promise<MellanlagringSearchResponse<T>>, requestQuery: any) => Promise<T[]>;

package/dist/search/utils/getAllEntitiesByUseOfContinuation.js

@@ -0,0 +1,49 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllEntitiesByUseOfContinuation = void 0;
+const SearchError_1 = require("../SearchError");
+const MAX_SEARCH_RESULTS_TO_RETURN = 250;
+const MAX_CONTINUATION_ITERATIONS = 4;
+const getAllEntitiesByUseOfContinuation = (apiCall, requestQuery) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    let continuationToken = undefined;
+    let iterationCount = 0;
+    let allEntities = [];
+    do {
+        if (iterationCount >= MAX_CONTINUATION_ITERATIONS) {
+            throw SearchError_1.SearchError.overflow(`Maximum number of continuation iterations reached: ${MAX_CONTINUATION_ITERATIONS}`);
+        }
+        const requestHeader = Object.assign({}, (continuationToken !== null && continuationToken !== undefined && { continuationToken }));
+        const result = yield apiCall(requestQuery, requestHeader);
+        // TODO Benni 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
+        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
+            return [];
+        }
+        allEntities = allEntities.concat(result.items);
+        if (allEntities.length > MAX_SEARCH_RESULTS_TO_RETURN) {
+            throw SearchError_1.SearchError.overflow(`Maximum number of entities exceeded: ${allEntities.length}`);
+        }
+        continuationToken = (_a = result.searchMeta.continuationToken) !== null && _a !== void 0 ? _a : undefined;
+        iterationCount++;
+    } while (continuationToken);
+    return allEntities;
+});
+exports.getAllEntitiesByUseOfContinuation = getAllEntitiesByUseOfContinuation;
+//# sourceMappingURL=getAllEntitiesByUseOfContinuation.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../../src/search/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gDAA4C;AAE5C,MAAM,4BAA4B,GAAG,GAAG,CAAA;AACxC,MAAM,2BAA2B,GAAG,CAAC,CAAA;AAqB9B,MAAM,iCAAiC,GAAG,CAC/C,OAK4C,EAC5C,YAAiB,EACH,EAAE;;IAChB,IAAI,iBAAiB,GAAuB,SAAS,CAAA;IACrD,IAAI,cAAc,GAAG,CAAC,CAAA;IACtB,IAAI,WAAW,GAAQ,EAAE,CAAA;IAEzB,GAAG,CAAC;QACF,IAAI,cAAc,IAAI,2BAA2B,EAAE,CAAC;YAClD,MAAM,yBAAW,CAAC,QAAQ,CAAC,sDAAsD,2BAA2B,EAAE,CAAC,CAAA;QACjH,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,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,CAAA;QACX,CAAC;QAED,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAE9C,IAAI,WAAW,CAAC,MAAM,GAAG,4BAA4B,EAAE,CAAC;YACtD,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,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AAhDY,QAAA,iCAAiC,qCAgD7C"}

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

@@ -0,0 +1,18 @@
+import { UtbildningstypItem } from '@kth/ladok-mellanlager-client';
+import { SearchParams } from '../types';
+import { RequestQuery } from './getAllEntitiesByUseOfContinuation';
+/**
+ * Throws an error if the searchParams are invalid.
+ * @param searchParams
+ */
+export declare const validateSearchParams: (searchParams: SearchParams) => void;
+export declare const prepareSearchRequestQueryForKursTillfallen: (utbildningstyper: UtbildningstypItem[], searchParams: SearchParams) => {
+    requestQuery: RequestQuery;
+    filterPeriod: boolean;
+};
+export declare const prepareSearchRequestQueryForKursInstans: (searchParams: SearchParams) => {
+    kodEllerBenamning: string | undefined;
+    antalTraffar: string;
+    avvecklad: string;
+    utbildningstypgrundtyp: string;
+};

package/dist/search/utils/searchUtils.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareSearchRequestQueryForKursInstans = exports.prepareSearchRequestQueryForKursTillfallen = exports.validateSearchParams = void 0;
+const SearchError_1 = require("../SearchError");
+const utils_1 = require("../../utils");
+const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
+/**
+ * Throws an error if the searchParams are invalid.
+ * @param searchParams
+ */
+const validateSearchParams = (searchParams) => {
+    const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
+    if (!avvecklad && !kodEllerBenamning && !organisation && !sprak && !startPeriod && !utbildningsniva) {
+        throw SearchError_1.SearchError.noRestrictions();
+    }
+    if (kodEllerBenamning && kodEllerBenamning.length < 3) {
+        throw SearchError_1.SearchError.kodEllerBenamning();
+    }
+};
+exports.validateSearchParams = validateSearchParams;
+const MAX_ANTAL_TRAFFAR = '100';
+const DEFAULT_QUERY_PARAMS = {
+    attributVarden: 'utbildningstyp,utbildning.lokalt.attribut.29.malgrupp.sv,utbildning.lokalt.attribut.29.malgrupp.en,utbildning.lokalt.attribut.29.kortnamn.sv,utbildning.lokalt.attribut.29.kortnamn.en,utbildning.lokalt.attribut.29.urvalskriterier.sv,utbildning.lokalt.attribut.29.urvalskriterier.en,utbildning.attribut.undervisningsform,utbildning.attribut.undervisningstid,utbildning.attribut.undervisningssprak,utbildning.attribut.studieort,utbildning.attribut.finansieringsform,utbildning.attribut.studietakt,status,installt,utbildning.attribut.utbildningstillfalleskod,utbildning.lokalt.attribut.29.minantalplatser,utbildning.attribut.utbildningsplatser,utbildning.attribut.organisation,utbildning.attribut.startperiod',
+    instansAttributVarden: 'utbildningstyp,',
+    antalTraffar: MAX_ANTAL_TRAFFAR,
+};
+const prepareSearchRequestQueryForKursTillfallen = (utbildningstyper, searchParams) => {
+    const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
+    const educationalTypes = filterAndMapEducationalTypes({ utbildningsniva, utbildningstyper });
+    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.join(',') })), (organisation && { organisation })), (sprak && { sprak })), (avvecklad && { avvecklad })), DEFAULT_QUERY_PARAMS);
+    return { requestQuery, filterPeriod }; // TODO Benni this does two things, filterPeriod should probably be split out
+};
+exports.prepareSearchRequestQueryForKursTillfallen = prepareSearchRequestQueryForKursTillfallen;
+const prepareSearchRequestQueryForKursInstans = (searchParams) => {
+    const requestQuery = {
+        kodEllerBenamning: searchParams.kodEllerBenamning,
+        antalTraffar: MAX_ANTAL_TRAFFAR,
+        avvecklad: 'false',
+        utbildningstypgrundtyp: 'KURS',
+    };
+    return requestQuery;
+};
+exports.prepareSearchRequestQueryForKursInstans = prepareSearchRequestQueryForKursInstans;
+const filterAndMapEducationalTypes = ({ utbildningsniva, utbildningstyper: ladokTypes, }) => {
+    if (!utbildningsniva)
+        return [];
+    const preparatoryTypes = [ladok_attributvarde_utils_1.EDUCATIONAL_TYPE_CODE_FOR_PREPARATORY_LEVEL]; // Hard coded
+    const basicTypes = ladokTypes
+        .filter(typ => String(typ.NivaInomStudieordningID) === ladok_attributvarde_utils_1.EducationalLevelCode.Basic)
+        .map(x => x.Kod);
+    const advancedTypes = ladokTypes
+        .filter(typ => String(typ.NivaInomStudieordningID) === ladok_attributvarde_utils_1.EducationalLevelCode.Advanced)
+        .map(x => x.Kod);
+    const researchTypes = ladokTypes
+        .filter(typ => String(typ.NivaInomStudieordningID) === ladok_attributvarde_utils_1.EducationalLevelCode.Research)
+        .map(x => x.Kod);
+    const levelMap = new Map([
+        [ladok_attributvarde_utils_1.EducationalLevelCode.Preparatory, preparatoryTypes],
+        [ladok_attributvarde_utils_1.EducationalLevelCode.Basic, basicTypes],
+        [ladok_attributvarde_utils_1.EducationalLevelCode.Advanced, advancedTypes],
+        [ladok_attributvarde_utils_1.EducationalLevelCode.Research, researchTypes],
+    ]);
+    return utbildningsniva === null || utbildningsniva === void 0 ? void 0 : utbildningsniva.flatMap(level => levelMap.get(level) || []);
+};
+/**
+ * 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
+ * @returns
+ */
+const getStartPeriodOrTerminkodStart = (startPeriod) => {
+    if (startPeriod && startPeriod.length > 0) {
+        return { startPeriod: startPeriod.join(',') };
+    }
+    return { terminkodStart: getDefaultPeriod() };
+};
+/**
+ *
+ * @returns the default period code based on the current date.
+ */
+const getDefaultPeriod = () => {
+    const now = new Date();
+    const defaultPeriod = (0, utils_1.getPeriodCodeForDate)(now);
+    return defaultPeriod;
+};
+//# sourceMappingURL=searchUtils.js.map

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

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

package/dist/types/OmKursenLadokApiClient.d.ts

@@ -1,5 +1,4 @@
 import { MellanlagringResponse, ResponseInfo } from '@kth/ladok-mellanlager-client';
-import { GroupedCourseSearchResult } from '../groupSearchResults';
 import { Course } from '../mapCourse';
 import { CourseRound } from '../mapCourseRound';
 import { Language } from '../utils';
@@ -8,19 +7,10 @@ import { KursPlan } from '../mapCourseSyllabus';
 import { Period } from '@kth/ladok-mellanlager-client/dist/types/endpoints/period';
 import { ProgramInstans } from '../mapProgramInstans';
 import { ProgramTillfalle } from '../mapProgramTillfalle';
+import { SearchApi } from '../search/types';
 export type OmKursenLadokApiClient = {
     getLatestCourseVersion: (courseCode: string, language: Language) => Promise<(Course & ResponseInfo) | ResponseInfo>;
-    searchCourses: (searchParams: {
-        kodEllerBenamning?: string;
-        organisation?: string;
-        sprak?: string;
-        avvecklad?: string;
-        startPeriod?: string[];
-        utbildningsniva?: string[];
-    }, language: Language) => Promise<{
-        searchHits?: GroupedCourseSearchResult[] | [];
-        errorCode?: string;
-    } | string>;
+    Search: SearchApi;
     getActiveCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
     getActiveAndFutureCourseRounds: (courseCode: string, language: Language) => Promise<CourseRound[] | undefined>;
     getCourseRoundsFromPeriod: (courseCode: string, fromPeriod: string, language: Language) => Promise<CourseRound[] | undefined>;

package/dist/utils/errorUtils.d.ts

@@ -0,0 +1,14 @@
+import { SearchError } from '../search/SearchError';
+/**
+ * This function contains a utility to convert an unknown error into a SearchError.
+ * This was inspired by this blog post: https://kentcdodds.com/blog/get-a-catch-block-error-message-with-typescript
+ *
+ * Currently, the only error type that is used is SearchError.
+ * In the future, we might want to add more error types.
+ */
+/**
+ * This function takes an unknown error and tries to convert it into a SearchError.
+ * @param maybeError
+ * @returns A SearchError
+ */
+export declare const toSearchError: (maybeError: unknown) => SearchError;

package/dist/utils/errorUtils.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toSearchError = void 0;
+const SearchError_1 = require("../search/SearchError");
+/**
+ * This function contains a utility to convert an unknown error into a SearchError.
+ * This was inspired by this blog post: https://kentcdodds.com/blog/get-a-catch-block-error-message-with-typescript
+ *
+ * Currently, the only error type that is used is SearchError.
+ * In the future, we might want to add more error types.
+ */
+/**
+ * This function takes an unknown error and tries to convert it into a SearchError.
+ * @param maybeError
+ * @returns A SearchError
+ */
+const toSearchError = (maybeError) => {
+    if (isSearchError(maybeError))
+        return maybeError;
+    if (isErrorWithMessage(maybeError)) {
+        return SearchError_1.SearchError.unknown(maybeError.message);
+    }
+    return SearchError_1.SearchError.unknown(convertErrorIntoString(maybeError));
+};
+exports.toSearchError = toSearchError;
+const isSearchError = (error) => {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'name' in error &&
+        typeof error.name === 'string' &&
+        error.name === 'SearchError' &&
+        error instanceof SearchError_1.SearchError);
+};
+function isErrorWithMessage(error) {
+    return (typeof error === 'object' &&
+        error !== null &&
+        'message' in error &&
+        typeof error.message === 'string');
+}
+const convertErrorIntoString = (maybeError) => {
+    try {
+        return JSON.stringify(maybeError);
+    }
+    catch (_a) {
+        // fallback in case there's an error stringifying the maybeError
+        // like with circular references for example.
+        return String(maybeError);
+    }
+};
+//# sourceMappingURL=errorUtils.js.map

package/dist/utils/errorUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errorUtils.js","sourceRoot":"","sources":["../../src/utils/errorUtils.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAEnD;;;;;;GAMG;AAEH;;;;GAIG;AACI,MAAM,aAAa,GAAG,CAAC,UAAmB,EAAe,EAAE;IAChE,IAAI,aAAa,CAAC,UAAU,CAAC;QAAE,OAAO,UAAU,CAAA;IAEhD,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;QACnC,OAAO,yBAAW,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,yBAAW,CAAC,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC,CAAA;AAChE,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB;AAED,MAAM,aAAa,GAAG,CAAC,KAAc,EAAwB,EAAE;IAC7D,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,OAAQ,KAAiC,CAAC,IAAI,KAAK,QAAQ;QAC3D,KAAK,CAAC,IAAI,KAAK,aAAa;QAC5B,KAAK,YAAY,yBAAW,CAC7B,CAAA;AACH,CAAC,CAAA;AAMD,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,SAAS,IAAI,KAAK;QAClB,OAAQ,KAAiC,CAAC,OAAO,KAAK,QAAQ,CAC/D,CAAA;AACH,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,UAAmB,EAAU,EAAE;IAC7D,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;IACnC,CAAC;IAAC,WAAM,CAAC;QACP,gEAAgE;QAChE,6CAA6C;QAC7C,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;IAC3B,CAAC;AACH,CAAC,CAAA"}

package/dist/utils/index.d.ts

@@ -3,3 +3,4 @@ export * from './languageUtil';
 export * from './periodUtil';
 export * from './studyYearUtil';
 export * from './filterCourseRoundUtils';
+export * from './versionUtils';

package/dist/utils/index.js

@@ -19,4 +19,5 @@ __exportStar(require("./languageUtil"), exports);
 __exportStar(require("./periodUtil"), exports);
 __exportStar(require("./studyYearUtil"), exports);
 __exportStar(require("./filterCourseRoundUtils"), exports);
+__exportStar(require("./versionUtils"), exports);
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,iDAA8B;AAC9B,+CAA4B;AAC5B,kDAA+B;AAC/B,2DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6CAA0B;AAC1B,iDAA8B;AAC9B,+CAA4B;AAC5B,kDAA+B;AAC/B,2DAAwC;AACxC,iDAA8B"}

package/dist/utils/periodUtil.d.ts

@@ -13,4 +13,4 @@ export declare const getKthStudyPeriod: (date: Date, startPeriod: {
     code: string | undefined;
     startDate: Date | undefined;
     endDate: Date | undefined;
-}, type: "start" | "end") => 4 | 0 | 1 | 2 | 3 | 5 | undefined;
+}, type: "start" | "end") => 0 | 4 | 1 | 2 | 3 | 5 | undefined;

package/dist/utils/periodUtil.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getKthStudyPeriod = exports.getPeriodCodeForDate = exports.findValidProgramForCode = exports.findPeriodByKod = exports.transformDigitsInPeriod = exports.transformPeriodInDigits = exports.parsePeriod = void 0;
+const versionUtils_1 = require("./versionUtils");
 const parsePeriod = (period) => {
     const match = period.match(/(VT|HT)(\d{4})/);
     if (!match) {
@@ -33,9 +34,6 @@ const findPeriodByKod = (kod, periods) => {
     return periods.find(p => p.Kod === kod);
 };
 exports.findPeriodByKod = findPeriodByKod;
-const getSortedPrograms = (programs) => {
-    return [...programs].sort((a, b) => (Number(b.versionsnummer) || 0) - (Number(a.versionsnummer) || 0));
-};
 const isProgramValidForPeriod = (program, periodStart) => {
     const { giltigFrom } = program;
     if (!(giltigFrom === null || giltigFrom === void 0 ? void 0 : giltigFrom.startDay) || !(giltigFrom === null || giltigFrom === void 0 ? void 0 : giltigFrom.lastDay))
@@ -48,7 +46,7 @@ const findValidProgramForCode = (code, periods, programs) => {
     if (!matchedPeriod)
         return undefined;
     const periodStart = new Date(matchedPeriod.Giltighetsperiod.Startdatum);
-    const sortedPrograms = getSortedPrograms(programs);
+    const sortedPrograms = (0, versionUtils_1.sortByVersionsnummerDesc)(programs);
     const validPrograms = sortedPrograms.filter((program, index, arr) => isProgramValidForPeriod(program, periodStart));
     if (validPrograms.length > 0)
         return validPrograms[0];

package/dist/utils/periodUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"periodUtil.js","sourceRoot":"","sources":["../../src/utils/periodUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"periodUtil.js","sourceRoot":"","sources":["../../src/utils/periodUtil.ts"],"names":[],"mappings":";;;AAEA,iDAAyD;AAElD,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE;IAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;IAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC,uDAAuD,EAAE,MAAM,CAAC,CAAA;QAC7E,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACvD,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB;AAEM,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAE,EAAE;IACxD,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAElC,IAAI,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpE,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAA;QAClD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC5B,OAAO,IAAI,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAVY,QAAA,uBAAuB,2BAUnC;AACM,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAU,EAAE;IAChE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;IACtD,OAAO,GAAG,QAAQ,GAAG,IAAI,EAAE,CAAA;AAC7B,CAAC,CAAA;AAJY,QAAA,uBAAuB,2BAInC;AAED,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,OAAqB,EAA0B,EAAE;IACvF,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAA;AAC1C,CAAC,CAAA;AAEM,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,OAAqB,EAA0B,EAAE;IAC5F,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;AACzC,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAED,MAAM,uBAAuB,GAAG,CAAC,OAAuB,EAAE,WAAiB,EAAW,EAAE;IACtF,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAA;IAC9B,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,CAAA,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAA;QAAE,OAAO,KAAK,CAAA;IAE/D,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;IAElD,OAAO,WAAW,IAAI,YAAY,CAAA;AACpC,CAAC,CAAA;AAEM,MAAM,uBAAuB,GAAG,CACrC,IAAY,EACZ,OAAqB,EACrB,QAA0B,EACE,EAAE;IAC9B,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACrD,IAAI,CAAC,aAAa;QAAE,OAAO,SAAS,CAAA;IAEpC,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;IAEvE,MAAM,cAAc,GAAG,IAAA,uCAAwB,EAAC,QAAQ,CAAC,CAAA;IAEzD,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAA;IAEnH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,aAAa,CAAC,CAAC,CAAC,CAAA;IAErD,OAAO,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAClE,CAAC,CAAA;AAjBY,QAAA,uBAAuB,2BAiBnC;AAEM,MAAM,oBAAoB,GAAG,CAAC,IAAU,EAAE,EAAE;IACjD,MAAM,IAAI,GAAG,CAAC,CAAA;IACd,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;IAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;IAC7B,MAAM,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAA;IAC3C,OAAO,GAAG,QAAQ,GAAG,IAAI,EAAE,CAAA;AAC7B,CAAC,CAAA;AANY,QAAA,oBAAoB,wBAMhC;AAED,4IAA4I;AACrI,MAAM,iBAAiB,GAAG,CAC/B,IAAU,EACV,WAIC,EACD,IAAqB,EACrB,EAAE;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;IACjC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;IAE1B,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAEzF,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,WAAW,CAAC,SAAS;YAAE,OAAO,CAAC,CAAA;QAC/E,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,WAAW,CAAC,SAAS,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,CAAA;QAC9F,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,WAAW,CAAC,OAAO;YAAE,OAAO,CAAC,CAAA;QAC9E,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,WAAW,CAAC,SAAS,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,CAAA;QAC9F,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,WAAW,CAAC,OAAO;YAAE,OAAO,CAAC,CAAA;QAC9E,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,WAAW,CAAC,OAAO;YAAE,OAAO,CAAC,CAAA;IAC/E,CAAC;SAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,CAAA;QACpD,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;YAAE,OAAO,CAAC,CAAA;QACvC,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,CAAC,CAAA;QACzC,IAAI,KAAK,IAAI,CAAC;YAAE,OAAO,CAAC,CAAA;QACxB,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC;YAAE,OAAO,CAAC,CAAA;QACpD,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC;YAAE,OAAO,CAAC,CAAA;IACpE,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AA9BY,QAAA,iBAAiB,qBA8B7B"}

package/dist/utils/programStrukturUtil.d.ts

@@ -1,6 +1,24 @@
 import { LadokMellanlagerApiClient, Strukturdel } from '@kth/ladok-mellanlager-client';
 import { Language } from './languageUtil';
 import { StructurePartInstance } from '../mapStructureCourses';
+import { StructurePartVersion } from '../mapStructurePartVersions';
+import { StudyYear } from './studyYearUtil';
+export type ProgramCourse = StructurePartVersion & Partial<Omit<StructurePartInstance, 'Tillfallesperioder'>> & {
+    Valvillkor: CategorizedStrukturdel['Valvillkor'];
+    Tillfallesperioder: Partial<StructurePartInstance['Tillfallesperioder'][number]> & {
+        ForstaUndervisningsdatum: string;
+        SistaUndervisningsdatum: string;
+    }[];
+};
+export type ProgramCurriculumFromStructure = {
+    studyYears: StudyYear[];
+} | {
+    studyYears: StudyYear[];
+    programmeSpecialization: {
+        programmeSpecializationCode: string;
+        title: string;
+    };
+};
 export declare const handleError: (message: string, error?: any) => {
     error: string;
     details: any;
@@ -9,79 +27,12 @@ export declare const fetchStructureByTillfalleUid: (uid: string, ladokClient: La
 export declare const fetchStructureByInstansUid: (uid: string, ladokClient: LadokMellanlagerApiClient) => Promise<Strukturdel[]>;
 export declare const fetchStructurePartInstances: (utbildningstillfalleUIDn: string[], ladokClient: LadokMellanlagerApiClient) => Promise<(import("@kth/ladok-mellanlager-client").UtbildningstillfalleSlim | undefined)[]>;
 export declare const fetchStructurePartsVersions: (utbildningsinstansUIDn: string[], ladokClient: LadokMellanlagerApiClient) => Promise<(import("@kth/ladok-mellanlager-client").UtbildningsinstansSlim | undefined)[]>;
+type CategorizedStrukturdel = Strukturdel & {
+    Valvillkor: string;
+};
 export declare const fetchAndCategorizeStructureParts: (utbildningstillfalleUID: string, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<{
-    courseListFromStructure: {
-        Valvillkor: string;
-        kod: string;
-        benamning: string;
-        utbildningstyp?: import("./languageUtil").TranslatedUtbildningstyp;
-        utbildningsinstansUid: string;
-        uid: string;
-        tillfalleskod: string;
-        status?: import("@kth/ladok-attributvarde-utils").LadokStatus;
-        omfattning: {
-            number: number;
-            formattedWithUnit: string;
-        };
-        startperiod?: import("./languageUtil").TranslatedGrunddata;
-        Tillfallesperioder: {
-            ForstaRegistreringsdatum: string;
-            ForstaUndervisningsdatum: string;
-            Lasperiodsfordelning?: {
-                Lasperiodskod: string;
-                Omfattningsvarde: number;
-            }[];
-            Omfattningsvarde: number;
-            SistaRegistreringsdatum: string;
-            SistaUndervisningsdatum: string;
-        }[];
-    }[];
-    specializationListFromStructure: StructurePartInstance[];
+    structureCourses: ProgramCourse[];
+    structureSpecializations: StructurePartInstance[];
 }>;
-export declare const fetchProgramStructure: (utbildningstillfalleUID: string, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<({
-    studyYears: {
-        yearNumber: number;
-        courses: {
-            kod: string;
-            benamning: string;
-            Valvillkor: string;
-            omfattning: {
-                number: number;
-                formattedWithUnit: string;
-            };
-            startperiod?: {
-                code: string;
-            };
-            Tillfallesperioder: {
-                SistaUndervisningsdatum: string;
-            }[];
-            uid: string;
-            utbildningsinstansUid: string;
-        }[];
-    }[];
-    programmeSpecialization: {
-        programmeSpecializationCode: string;
-        title: string;
-    };
-} | {
-    studyYears: {
-        yearNumber: number;
-        courses: {
-            kod: string;
-            benamning: string;
-            Valvillkor: string;
-            omfattning: {
-                number: number;
-                formattedWithUnit: string;
-            };
-            startperiod?: {
-                code: string;
-            };
-            Tillfallesperioder: {
-                SistaUndervisningsdatum: string;
-            }[];
-            uid: string;
-            utbildningsinstansUid: string;
-        }[];
-    }[];
-})[]>;
+export declare const fetchProgramStructure: (utbildningstillfalleUID: string, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<ProgramCurriculumFromStructure[]>;
+export {};