@kth/om-kursen-ladok-client 2.0.6 → 2.1.0

package/dist/search/createSearchApi.js

@@ -11,30 +11,28 @@ 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 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 mapCourseRoundSearchDTO_1 = require("./utils/mapCourseRoundSearchDTO");
-const mapCourseVersionDTO_1 = require("./utils/mapCourseVersionDTO");
-const typeChecking_1 = require("../utils/typeChecking");
-const createSupportApis_1 = require("../supportApis/createSupportApis");
-const getLatestCompletedCourseVersions_1 = require("./utils/getLatestCompletedCourseVersions");
+const searchService_1 = require("./searchService");
+const supportService_1 = require("../supportApis/supportService");
+const SearchError_1 = require("../utils/SearchError");
 const createSearchApi = (ladokClient) => {
+    const searchService = new searchService_1.SearchService(ladokClient);
+    const supportService = new supportService_1.SupportService(ladokClient);
     return {
         searchCourses: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
             try {
                 const cleanSearchParams = (0, searchUtils_1.validateAndCleanSearchParams)(searchParams);
-                const departmentList = yield getDepartmentList(ladokClient, language);
+                const departmentList = yield supportService.getSchoolsWithDepartmentsForSearch(language);
                 const { requestQuery, filterPeriod } = (0, searchUtils_1.prepareSearchRequestQueryForKursTillfallen)(cleanSearchParams, departmentList);
                 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);
                 // TODO Remove this once we have a query parameter to filter for miljö courses
-                const courseVersionsToShow = possiblyFilterByMiljo(groupedCourses, cleanSearchParams.onlyMHU);
+                const courseVersionsToShow = (0, searchUtils_1.possiblyFilterByMiljo)(groupedCourses, cleanSearchParams.onlyMHU);
                 const courseRoundSearchDTOs = courseVersionsToShow.map(mapCourseRoundSearchDTO_1.mapCourseRoundSearchDTO);
                 return { searchHits: courseRoundSearchDTOs };
             }
@@ -46,79 +44,29 @@ const createSearchApi = (ladokClient) => {
                 };
             }
         }),
-        searchCourseVersions: (searchParams, language) => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const cleanSearchParams = (0, searchUtils_1.validateAndCleanSearchParams)(searchParams);
-                const departmentList = yield getDepartmentList(ladokClient, language);
-                const requestQueryForKursInstans = (0, searchUtils_1.prepareSearchRequestQueryForKursInstans)(cleanSearchParams, departmentList);
-                const allCourseVersions = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstansSlim, requestQueryForKursInstans);
-                const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient); // TODO: Use cached values
-                const allMappedCourseVersions = allCourseVersions.map(courseVersion => (0, mapCourse_1.mapCourse)(courseVersion, language, gradingScalesCodes));
-                const latestCourseVersions = findLatestCourseVersions(allMappedCourseVersions);
-                const latestApprovedCourses = (0, getLatestCompletedCourseVersions_1.getLatestCompletedCourseVersions)(latestCourseVersions);
-                // TODO Remove this once we have a query parameter to filter for miljö courses
-                const courseVersionsToShow = possiblyFilterByMiljo(latestApprovedCourses, cleanSearchParams.onlyMHU);
-                const courseVersionDTOs = courseVersionsToShow.map(mapCourseVersionDTO_1.mapCourseVersionDTO);
-                return { searchHits: courseVersionDTOs };
-            }
-            catch (error) {
-                const searchError = (0, errorUtils_1.toSearchError)(error);
+        searchCourseVersions: searchService.searchCourseVersions.bind(searchService),
+        getDepartmentWithCourseList: (departmentParams, language) => __awaiter(void 0, void 0, void 0, function* () {
+            const { department, courses } = yield searchService.getDepartmentWithCourseList(departmentParams, language);
+            if (!department) {
                 return {
-                    searchHits: [],
-                    errorCode: searchError.errorCode,
+                    departmentWithCourseList: {
+                        departmentCode: '',
+                        department: '',
+                        courses: [],
+                    },
+                    errorCode: SearchError_1.SearchErrorCode.UNKNOWN_ERROR,
                 };
             }
+            return {
+                departmentWithCourseList: {
+                    departmentCode: department.code,
+                    department: department.name,
+                    courses,
+                },
+                errorCode: SearchError_1.SearchErrorCode.UNKNOWN_ERROR,
+            };
         }),
     };
 };
 exports.createSearchApi = createSearchApi;
-// 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
- * @param onlyMHU
- * @returns
- */
-const possiblyFilterByMiljo = (courses, onlyMHU = false) => {
-    if (!onlyMHU)
-        return courses;
-    return courses.filter(course => course.isMiljo);
-};
-// TODO Benni: 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).
- * This should not be needed anymore since we are using the "senasteversion" in the search.
- * @param courseVersions
- * @returns
- */
-const findLatestCourseVersions = (courseVersions) => {
-    const coursesGroupedByKurskod = new Map();
-    for (const course of courseVersions) {
-        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(typeChecking_1.isDefined);
-    return latestDefinedCourses;
-};
-/**
- * This function retrieves a list of SchoolWithDepartments from ladok
- * @param ladokClient
- * @param language
- * @returns
- */
-const getDepartmentList = (ladokClient, language) => __awaiter(void 0, void 0, void 0, function* () {
-    const supportAPI = (0, createSupportApis_1.createSupportApi)(ladokClient);
-    const [currentDepartmentList, deprecatedDepartmentList] = yield Promise.all([
-        supportAPI.createDepartmentList(language),
-        supportAPI.createDepartmentList(language, true),
-    ]);
-    const departmentList = [...currentDepartmentList, ...deprecatedDepartmentList];
-    return departmentList;
-});
 //# sourceMappingURL=createSearchApi.js.map

package/dist/search/createSearchApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAQA,qDAI4B;AAC5B,iGAA6F;AAC7F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,4CAAgD;AAChD,oEAAmE;AACnE,oCAAsD;AACtD,6EAAyE;AACzE,qEAAiE;AACjE,wDAAiD;AACjD,wEAAmE;AACnE,+FAA2F;AAEpF,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,OAAO;QACL,aAAa,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YAC9C,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;gBAErE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,UAAU,GAAG,MAAM,IAAA,qEAAiC,EAGxD,WAAW,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAA;gBAEjD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,wCAAsB,EAAC,MAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAEzF,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC,aAAa,EAAE,YAAY,CAAC,CAAA;gBAEtE,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,cAAc,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBAE7F,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,GAAG,CAAC,iDAAuB,CAAC,CAAA;gBAE/E,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,CAAA;YAC9C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,WAAW,GAAG,IAAA,0BAAa,EAAC,KAAK,CAAC,CAAA;gBACxC,OAAO;oBACL,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,WAAW,CAAC,SAAS;iBACjC,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QACD,oBAAoB,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YACrD,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;gBAErE,MAAM,0BAA0B,GAAG,IAAA,qDAAuC,EAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA;gBAE7G,MAAM,iBAAiB,GAAG,MAAM,IAAA,qEAAiC,EAG/D,WAAW,CAAC,yBAAyB,EAAE,0BAA0B,CAAC,CAAA;gBAEpE,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAA,CAAC,0BAA0B;gBAE9F,MAAM,uBAAuB,GAAG,iBAAiB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CACpE,IAAA,qBAAS,EAAC,aAAa,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CACvD,CAAA;gBAED,MAAM,oBAAoB,GAAG,wBAAwB,CAAC,uBAAuB,CAAC,CAAA;gBAE9E,MAAM,qBAAqB,GAAG,IAAA,mEAAgC,EAAC,oBAAoB,CAAC,CAAA;gBAEpF,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,qBAAqB,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBAEpG,MAAM,iBAAiB,GAAuB,oBAAoB,CAAC,GAAG,CAAC,yCAAmB,CAAC,CAAA;gBAE3F,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAA;YAC1C,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;KACF,CAAA;AACH,CAAC,CAAA;AA1EY,QAAA,eAAe,mBA0E3B;AAED,8EAA8E;AAC9E;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,CAAkC,OAAY,EAAE,UAAmB,KAAK,EAAO,EAAE;IAC7G,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAA;IAC5B,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACjD,CAAC,CAAA;AAED,kGAAkG;AAClG;;;;;;GAMG;AACH,MAAM,wBAAwB,GAAG,CAAC,cAAwB,EAAY,EAAE;IACtE,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAoB,CAAA;IAC3D,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACpC,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACvD,CAAC;IACD,MAAM,mCAAmC,GAAe,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CACvG,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CACrB,CAAA;IAED,MAAM,oBAAoB,GAAa,mCAAmC;SACvE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;SAC1C,MAAM,CAAC,wBAAS,CAAC,CAAA;IAEpB,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,iBAAiB,GAAG,CAAO,WAAsC,EAAE,QAAkB,EAAE,EAAE;IAC7F,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,WAAW,CAAC,CAAA;IAChD,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC1E,UAAU,CAAC,oBAAoB,CAAC,QAAQ,CAAC;QACzC,UAAU,CAAC,oBAAoB,CAAC,QAAQ,EAAE,IAAI,CAAC;KAChD,CAAC,CAAA;IACF,MAAM,cAAc,GAAG,CAAC,GAAG,qBAAqB,EAAE,GAAG,wBAAwB,CAAC,CAAA;IAC9E,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA"}
+{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qDAI4B;AAC5B,kGAA8F;AAC9F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,6EAAyE;AACzE,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AAE/C,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO;QACL,aAAa,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YAC9C,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAExF,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,UAAU,GAAG,MAAM,IAAA,qEAAiC,EAGxD,WAAW,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAA;gBAEjD,MAAM,aAAa,GAAG,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,wCAAsB,EAAC,MAAO,EAAE,QAAQ,CAAC,CAAC,CAAA;gBAEzF,MAAM,cAAc,GAAG,IAAA,uCAAkB,EAAC,aAAa,EAAE,YAAY,CAAC,CAAA;gBAEtE,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,IAAA,mCAAqB,EAAC,cAAc,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAA;gBAE7F,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,GAAG,CAAC,iDAAuB,CAAC,CAAA;gBAE/E,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,CAAA;YAC9C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,WAAW,GAAG,IAAA,0BAAa,EAAC,KAAK,CAAC,CAAA;gBACxC,OAAO;oBACL,UAAU,EAAE,EAAE;oBACd,SAAS,EAAE,WAAW,CAAC,SAAS;iBACjC,CAAA;YACH,CAAC;QACH,CAAC,CAAA;QACD,oBAAoB,EAAE,aAAa,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC5E,2BAA2B,EAAE,CAAO,gBAAgB,EAAE,QAAQ,EAAE,EAAE;YAChE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,aAAa,CAAC,2BAA2B,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;YAE3G,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;oBACL,wBAAwB,EAAE;wBACxB,cAAc,EAAE,EAAE;wBAClB,UAAU,EAAE,EAAE;wBACd,OAAO,EAAE,EAAE;qBACZ;oBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;iBACzC,CAAA;YACH,CAAC;YAED,OAAO;gBACL,wBAAwB,EAAE;oBACxB,cAAc,EAAE,UAAU,CAAC,IAAI;oBAC/B,UAAU,EAAE,UAAU,CAAC,IAAI;oBAC3B,OAAO;iBACR;gBACD,SAAS,EAAE,6BAAe,CAAC,aAAa;aACzC,CAAA;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AA/DY,QAAA,eAAe,mBA+D3B"}

package/dist/search/searchService.d.ts

@@ -0,0 +1,24 @@
+import { LadokMellanlagerApiClient } from '@kth/ladok-mellanlager-client';
+import { CourseVersionDTO, DepartmentParams, SearchParams } from './types';
+import { Language } from '../utils';
+import { OrganisationService } from '../supportApis/organisationService';
+import { SupportService } from '../supportApis/supportService';
+import { DepartmentFlat } from '../supportApis/types';
+export declare class SearchService {
+    private ladokClient;
+    organisationService: OrganisationService;
+    supportService: SupportService;
+    constructor(ladokClient: LadokMellanlagerApiClient);
+    searchCourseVersions(searchParams: SearchParams, language: Language): Promise<{
+        searchHits: CourseVersionDTO[];
+        errorCode?: undefined;
+    } | {
+        searchHits: never[];
+        errorCode: import("../utils/SearchError").SearchErrorCode;
+    }>;
+    private searchLatestApprovedCourseVersions;
+    getDepartmentWithCourseList({ organisation, utbildningsniva: rawUtbildningsniva }: DepartmentParams, language: Language): Promise<{
+        department: DepartmentFlat | undefined;
+        courses: CourseVersionDTO[];
+    }>;
+}

package/dist/search/searchService.js

@@ -0,0 +1,80 @@
+"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.SearchService = void 0;
+const mapCourse_1 = require("../mapCourse");
+const errorUtils_1 = require("../utils/errorUtils");
+const gradingScalesUtils_1 = require("../utils/gradingScalesUtils");
+const getAllEntitiesByUseOfContinuation_1 = require("../utils/getAllEntitiesByUseOfContinuation");
+const getLatestCompletedCourseVersions_1 = require("./utils/getLatestCompletedCourseVersions");
+const mapCourseVersionDTO_1 = require("./utils/mapCourseVersionDTO");
+const searchUtils_1 = require("./utils/searchUtils");
+const organisationService_1 = require("../supportApis/organisationService");
+const supportService_1 = require("../supportApis/supportService");
+const SearchError_1 = require("../utils/SearchError");
+class SearchService {
+    constructor(ladokClient) {
+        this.ladokClient = ladokClient;
+        this.organisationService = new organisationService_1.OrganisationService(ladokClient);
+        this.supportService = new supportService_1.SupportService(ladokClient);
+    }
+    searchCourseVersions(searchParams, language) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const cleanSearchParams = (0, searchUtils_1.validateAndCleanSearchParams)(searchParams);
+                const departmentList = yield this.supportService.getSchoolsWithDepartmentsForSearch(language);
+                const requestQueryForKursInstans = (0, searchUtils_1.prepareSearchRequestQueryForKursInstans)(cleanSearchParams, departmentList);
+                const latestApprovedCourses = yield this.searchLatestApprovedCourseVersions(requestQueryForKursInstans, language);
+                // TODO Remove this once we have a query parameter to filter for miljö courses
+                const courseVersionsToShow = (0, searchUtils_1.possiblyFilterByMiljo)(latestApprovedCourses, cleanSearchParams.onlyMHU);
+                const courseVersionDTOs = courseVersionsToShow.map(mapCourseVersionDTO_1.mapCourseVersionDTO);
+                return { searchHits: courseVersionDTOs };
+            }
+            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 allCourseVersions = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(this.ladokClient.sokUtbildningsInstansSlim, requestQueryForKursInstans, continuationOptions);
+            const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(this.ladokClient); // TODO: Use cached values
+            const allMappedCourseVersions = allCourseVersions.map(courseVersion => (0, mapCourse_1.mapCourse)(courseVersion, language, gradingScalesCodes));
+            const latestCourseVersions = (0, searchUtils_1.findLatestCourseVersions)(allMappedCourseVersions);
+            return (0, getLatestCompletedCourseVersions_1.getLatestCompletedCourseVersions)(latestCourseVersions);
+        });
+    }
+    getDepartmentWithCourseList(_a, language_1) {
+        return __awaiter(this, arguments, void 0, function* ({ organisation, utbildningsniva: rawUtbildningsniva }, language) {
+            console.log(`Searching for courses in department: "${organisation}" with educational level: "${rawUtbildningsniva}"`);
+            if (!organisation) {
+                throw SearchError_1.SearchError.missingParameter(`Got: organsation: "${organisation}", utbildningsniva: "${rawUtbildningsniva}"`);
+            }
+            const schoolsWithDepartments = yield this.supportService.getSchoolsWithDepartmentsForSearch(language);
+            // This endpoint is not supposed to accept user input for department code or educational level,
+            // so we prepare the request query based on the departmentParams instead of cleaning them.
+            const requestQueryForKursInstans = (0, searchUtils_1.prepareSearchRequestQueryForDepartmentList)(schoolsWithDepartments, {
+                organisation,
+                rawUtbildningsniva,
+            });
+            const latestApprovedCourseVersions = yield this.searchLatestApprovedCourseVersions(requestQueryForKursInstans, language, { maxContinuationIterations: 10, maxSearchResultsToReturn: 1000 });
+            const courseVersionDTOs = latestApprovedCourseVersions.map(mapCourseVersionDTO_1.mapCourseVersionDTO);
+            const department = yield this.supportService.getDepartmentByCode(organisation, language);
+            return { department, courses: courseVersionDTOs };
+        });
+    }
+}
+exports.SearchService = SearchService;
+//# sourceMappingURL=searchService.js.map

package/dist/search/searchService.js.map

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

package/dist/search/types.d.ts

@@ -3,6 +3,11 @@ import { Language } from '../utils';
 export type SearchApi = {
     searchCourses: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseRoundSearchDTO>>;
     searchCourseVersions: (searchParams: SearchParams, language: Language) => Promise<SearchCourseResponse<CourseVersionDTO>>;
+    getDepartmentWithCourseList: (searchParams: DepartmentParams, language: Language) => Promise<DepartmentWithCourseListResponse>;
+};
+export type DepartmentWithCourseListResponse = {
+    departmentWithCourseList: DepartmentWithCourseList;
+    errorCode?: string;
 };
 export type SearchCourseResponse<T> = {
     searchHits: T[];
@@ -58,3 +63,13 @@ export type RequestQuery = {
 } | {
     terminkodStart: string;
 });
+export type ContinuationOptions = {
+    maxSearchResultsToReturn?: number;
+    maxContinuationIterations?: number;
+};
+export type DepartmentWithCourseList = {
+    department: string;
+    departmentCode: string;
+    courses: CourseVersionDTO[];
+};
+export type DepartmentParams = Pick<SearchParams, 'utbildningsniva' | 'organisation'>;

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

@@ -9,3 +9,15 @@ export declare const getVersionUtbildningstyperForEducationalLevels: (educationa
     ID: number;
     Kod: string;
 }[];
+/**
+ * Takes an array of educational levels and returns a comma-separated string of the corresponding utbildningstypKoder.
+ * @param educationalLevels
+ * @returns
+ */
+export declare const getUtbildningsnivaParameterForKursTillfalle: (educationalLevels: EducationalLevelCode[] | undefined) => string | undefined;
+/**
+ * Takes an array of educational levels and returns a comma-separated string of the corresponding utbildningstypIDn.
+ * @param educationalLevels
+ * @returns
+ */
+export declare const getUtbildningsnivaParameterForKursInstans: (educationalLevels: EducationalLevelCode[] | undefined) => string;

package/dist/search/utils/educationalTypeUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersionUtbildningstyperForEducationalLevels = exports.getAllVersionUtbildningstyperIDs = void 0;
+exports.getUtbildningsnivaParameterForKursInstans = exports.getUtbildningsnivaParameterForKursTillfalle = exports.getVersionUtbildningstyperForEducationalLevels = exports.getAllVersionUtbildningstyperIDs = void 0;
 const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
 const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
 const getAllVersionUtbildningstyperIDs = () => {
@@ -33,4 +33,31 @@ const getVersionUtbildningstyperForEducationalLevels = (educationalLevels) => {
     });
 };
 exports.getVersionUtbildningstyperForEducationalLevels = getVersionUtbildningstyperForEducationalLevels;
+/**
+ * Takes an array of educational levels and returns a comma-separated string of the corresponding utbildningstypKoder.
+ * @param educationalLevels
+ * @returns
+ */
+const getUtbildningsnivaParameterForKursTillfalle = (educationalLevels) => {
+    if (!educationalLevels)
+        return undefined;
+    return getCommaSeparatedEducationalTypesInFormat('Kod', educationalLevels);
+};
+exports.getUtbildningsnivaParameterForKursTillfalle = getUtbildningsnivaParameterForKursTillfalle;
+/**
+ * Takes an array of educational levels and returns a comma-separated string of the corresponding utbildningstypIDn.
+ * @param educationalLevels
+ * @returns
+ */
+const getUtbildningsnivaParameterForKursInstans = (educationalLevels) => {
+    if (!educationalLevels)
+        return (0, exports.getAllVersionUtbildningstyperIDs)().join(',');
+    return getCommaSeparatedEducationalTypesInFormat('ID', educationalLevels);
+};
+exports.getUtbildningsnivaParameterForKursInstans = getUtbildningsnivaParameterForKursInstans;
+const getCommaSeparatedEducationalTypesInFormat = (format, educationalLevels) => {
+    const selectedEducationalTypes = (0, exports.getVersionUtbildningstyperForEducationalLevels)(educationalLevels);
+    const selectedEducationalTypeIdentifiers = selectedEducationalTypes.map(item => item[format]);
+    return selectedEducationalTypeIdentifiers.join(',');
+};
 //# sourceMappingURL=educationalTypeUtils.js.map

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

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

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

@@ -1,6 +1,7 @@
 import { SokUtbildningsInstansSlimQuery, SokUtbildningsTillfalleSlimQuery } from '@kth/ladok-mellanlager-client';
 import { CleanSearchParams, SearchParams } from '../types';
-import { SchoolWithDepartments } from '../../supportApis/createSupportApis';
+import { SchoolWithDepartments } from '../../supportApis/types';
+import { Course } from '../../mapCourse';
 /**
  * Validates and cleans the search parameters for the search API.
  * Throws an error if the searchParams are invalid.
@@ -16,3 +17,24 @@ export declare const prepareSearchRequestQueryForKursTillfallen: (searchParams:
     filterPeriod: boolean;
 };
 export declare const prepareSearchRequestQueryForKursInstans: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => NonNullable<SokUtbildningsInstansSlimQuery>;
+export declare const prepareSearchRequestQueryForDepartmentList: (schoolsWithDepartments: SchoolWithDepartments[], { rawUtbildningsniva, organisation, }: {
+    organisation?: string;
+    rawUtbildningsniva: string[] | undefined;
+}) => NonNullable<SokUtbildningsInstansSlimQuery>;
+/**
+ * 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).
+ * This should not be needed anymore since we are using the "senasteversion" in the search.
+ * @param courseVersions
+ * @returns
+ */
+export declare const findLatestCourseVersions: (courseVersions: Course[]) => Course[];
+/**
+ * If onlyMHU is true, this function filters the courses to only include those that have the flag isMiljo set to true.
+ * @param courses
+ * @param onlyMHU
+ * @returns
+ */
+export declare const possiblyFilterByMiljo: <T extends {
+    isMiljo?: boolean;
+}>(courses: T[], onlyMHU?: boolean) => T[];

package/dist/search/utils/searchUtils.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareSearchRequestQueryForKursInstans = exports.prepareSearchRequestQueryForKursTillfallen = exports.validateAndCleanSearchParams = void 0;
-const SearchError_1 = require("../SearchError");
+exports.possiblyFilterByMiljo = exports.findLatestCourseVersions = exports.prepareSearchRequestQueryForDepartmentList = exports.prepareSearchRequestQueryForKursInstans = 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");
 const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
 const attributVardenConstants_1 = require("../../attributVardenConstants");
-const educationalTypeUtils_1 = require("./educationalTypeUtils");
 const typeChecking_1 = require("../../utils/typeChecking");
 const queryConstants_1 = require("../../queryConstants");
+const educationalTypeUtils_1 = require("./educationalTypeUtils");
 /**
  * Validates and cleans the search parameters for the search API.
  * Throws an error if the searchParams are invalid.
@@ -66,38 +66,13 @@ const DEFAULT_INSTANCE_QUERY_PARAMS = {
 };
 const prepareSearchRequestQueryForKursTillfallen = (searchParams, schoolsWithDepartments) => {
     const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
-    const educationalTypes = getUtbildningsnivaParameterForKursTillfalle(utbildningsniva);
+    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(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }, getStartPeriodOrTerminkodStart(startPeriod)), (educationalTypes && { utbildningsniva: educationalTypes })), (organisationsFilter && { organisation: organisationsFilter })), (sprak && { sprak })), (avvecklad && { avvecklad })), DEFAULT_INSTANCE_QUERY_PARAMS), { utbildningstypid: utbildningsTypIdConstants_1.INSTANCE_UTBILDNINGSTYP_IDS });
     return { requestQuery, filterPeriod }; // TODO Benni this does two things, filterPeriod should probably be split out
 };
 exports.prepareSearchRequestQueryForKursTillfallen = prepareSearchRequestQueryForKursTillfallen;
-/**
- * Takes an array of educational levels and returns a comma-separated string of the corresponding utbildningstypKoder.
- * @param educationalLevels
- * @returns
- */
-const getUtbildningsnivaParameterForKursTillfalle = (educationalLevels) => {
-    if (!educationalLevels)
-        return undefined;
-    return getCommaSeparatedEducationalTypesInFormat('Kod', educationalLevels);
-};
-/**
- * Takes an array of educational levels and returns a comma-separated string of the corresponding utbildningstypIDn.
- * @param educationalLevels
- * @returns
- */
-const getUtbildningsnivaParameterForKursInstans = (educationalLevels) => {
-    if (!educationalLevels)
-        return (0, educationalTypeUtils_1.getAllVersionUtbildningstyperIDs)().join(',');
-    return getCommaSeparatedEducationalTypesInFormat('ID', educationalLevels);
-};
-const getCommaSeparatedEducationalTypesInFormat = (format, educationalLevels) => {
-    const selectedEducationalTypes = (0, educationalTypeUtils_1.getVersionUtbildningstyperForEducationalLevels)(educationalLevels);
-    const selectedEducationalTypeIdentifiers = selectedEducationalTypes.map(item => item[format]);
-    return selectedEducationalTypeIdentifiers.join(',');
-};
 const getOrganisationsFilter = (organisationer, organisation) => {
     var _a, _b;
     if (organisation && (organisation === null || organisation === void 0 ? void 0 : organisation.length) === 1) {
@@ -109,9 +84,21 @@ const getOrganisationsFilter = (organisationer, organisation) => {
 const prepareSearchRequestQueryForKursInstans = (searchParams, schoolsWithDepartments) => {
     const { kodEllerBenamning, avvecklad, organisation, utbildningsniva } = searchParams;
     const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
-    return Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*', antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR }, (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter })), { utbildningstypgrundtyp: 'KURS', utbildningstypid: getUtbildningsnivaParameterForKursInstans(utbildningsniva), instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS, senasteversion: 'true' });
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, minimalSearchRequestQueryForKursInstans(queryConstants_1.MAX_ANTAL_TRAFFAR, utbildningsniva)), { kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }), (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter })), { instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS });
 };
 exports.prepareSearchRequestQueryForKursInstans = prepareSearchRequestQueryForKursInstans;
+const minimalSearchRequestQueryForKursInstans = (antalTraffar, utbildningsniva) => ({
+    antalTraffar,
+    utbildningstypgrundtyp: 'KURS',
+    utbildningstypid: (0, educationalTypeUtils_1.getUtbildningsnivaParameterForKursInstans)(utbildningsniva),
+    senasteversion: 'true',
+});
+const prepareSearchRequestQueryForDepartmentList = (schoolsWithDepartments, { rawUtbildningsniva, organisation, }) => {
+    const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
+    const utbildningsniva = rawUtbildningsniva ? cleanUtbildningsnivaParam(rawUtbildningsniva) : undefined;
+    return Object.assign(Object.assign({}, minimalSearchRequestQueryForKursInstans(queryConstants_1.MAX_ANTAL_TRAFFAR, utbildningsniva)), (organisationsFilter && { organisation: organisationsFilter }));
+};
+exports.prepareSearchRequestQueryForDepartmentList = prepareSearchRequestQueryForDepartmentList;
 /**
  * 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.
@@ -133,4 +120,40 @@ const getDefaultPeriod = () => {
     const defaultPeriod = (0, utils_1.getPeriodCodeForDate)(now);
     return defaultPeriod;
 };
+// TODO Benni: 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).
+ * This should not be needed anymore since we are using the "senasteversion" in the search.
+ * @param courseVersions
+ * @returns
+ */
+const findLatestCourseVersions = (courseVersions) => {
+    const coursesGroupedByKurskod = new Map();
+    for (const course of courseVersions) {
+        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(typeChecking_1.isDefined);
+    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
+ * @param onlyMHU
+ * @returns
+ */
+const possiblyFilterByMiljo = (courses, onlyMHU = false) => {
+    if (!onlyMHU)
+        return courses;
+    return courses.filter(course => course.isMiljo);
+};
+exports.possiblyFilterByMiljo = possiblyFilterByMiljo;
 //# 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/supportApis/coursesByOrgUtil.d.ts

@@ -0,0 +1,32 @@
+import { Organisationskoppling } from '@kth/ladok-mellanlager-client/dist/types/endpoints/organisationskoppling';
+import { Language } from '../utils';
+import { Organisation } from '@kth/ladok-mellanlager-client/dist/types/endpoints/organisation';
+import { SchoolWithDepartments } from './types';
+/**
+ * Handles the retrieval and filtering of schools and their departments based on the presence of courses.
+ *
+ * This function takes lists of organisations and organisation connections, and returns two arrays:
+ * - `current`: Schools with departments that currently have at least one course (optionally including cancelled courses and/or only third cycle courses).
+ * - `deprecated`: Deprecated schools with departments that have at least one course.
+ *
+ * The filtering is performed by checking each department using the provided `hasAtLeastOneCourse` function.
+ *
+ * @param organisationer - Array of organisation objects representing schools and departments.
+ * @param organisationskopplingar - Array of organisation connection objects describing the hierarchy.
+ * @param language - The language to use for school and department names.
+ * @param onlyThirdCycle - If true, only include departments with third cycle (research level) courses. Defaults to false.
+ * @param includeDepartmentsWithCancelledCourses - If true, include departments that have cancelled courses. Defaults to false.
+ * @param hasAtLeastOneCourse - Async function to determine if a department has at least one course, given its code and filtering options.
+ * @returns A promise resolving to an object containing arrays of current and deprecated schools with their filtered departments.
+ */
+export declare const handleSchools: ({ organisationer, organisationskopplingar, language, onlyThirdCycle, includeDepartmentsWithCancelledCourses, hasAtLeastOneCourse, }: {
+    organisationer: Organisation[];
+    organisationskopplingar: Organisationskoppling[];
+    language: Language;
+    onlyThirdCycle?: boolean;
+    includeDepartmentsWithCancelledCourses?: boolean;
+    hasAtLeastOneCourse: (departmentCode: string, includeCancelledCourses: boolean, onlyThirdCycle: boolean) => Promise<boolean>;
+}) => Promise<{
+    current: SchoolWithDepartments[];
+    deprecated: SchoolWithDepartments[];
+}>;