@kth/om-kursen-ladok-client 2.2.1 → 2.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/attributVardenConstants.d.ts +0 -3
- package/dist/attributVardenConstants.js +7 -4
- package/dist/attributVardenConstants.js.map +1 -1
- package/dist/createApiClient.js +59 -84
- package/dist/createApiClient.js.map +1 -1
- package/dist/programme/createProgrammeApi.js +2 -2
- package/dist/programme/createProgrammeApi.js.map +1 -1
- package/dist/search/createSearchApi.js +1 -1
- package/dist/search/createSearchApi.js.map +1 -1
- package/dist/search/searchService.js +1 -1
- package/dist/search/searchService.js.map +1 -1
- package/dist/search/types.d.ts +1 -4
- package/dist/search/utils/mapCourseVersionDTO.js +1 -1
- package/dist/search/utils/mapCourseVersionDTO.js.map +1 -1
- package/dist/search/utils/searchUtils.d.ts +4 -4
- package/dist/search/utils/searchUtils.js +2 -10
- package/dist/search/utils/searchUtils.js.map +1 -1
- package/dist/utils/getAllEntitiesByUseOfContinuation.d.ts +6 -2
- package/dist/utils/getAllEntitiesByUseOfContinuation.js +4 -2
- package/dist/utils/getAllEntitiesByUseOfContinuation.js.map +1 -1
- package/dist/utils/mergeResponses.d.ts +2 -1
- package/dist/utils/mergeResponses.js +24 -6
- package/dist/utils/mergeResponses.js.map +1 -1
- package/dist/utils/programUtil.d.ts +3 -3
- package/dist/utils/programUtil.js +38 -52
- package/dist/utils/programUtil.js.map +1 -1
- package/dist/utils/responseUtils.d.ts +4 -0
- package/dist/utils/responseUtils.js +17 -0
- package/dist/utils/responseUtils.js.map +1 -0
- package/package.json +2 -2
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
export declare const ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS: string;
|
|
2
1
|
export declare const ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS: string;
|
|
3
|
-
export declare const ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH: string;
|
|
4
2
|
export declare const INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH: string;
|
|
5
3
|
export declare const INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION: string;
|
|
6
|
-
export declare const ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS: string;
|
|
7
4
|
export declare const INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS: string;
|
|
8
5
|
export declare const ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE: string;
|
|
9
6
|
export declare const INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE: string;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = exports.ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS = exports.
|
|
4
|
-
|
|
3
|
+
exports.INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = exports.ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS = exports.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION = exports.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = void 0;
|
|
4
|
+
// Results in more than 20 attributvarden
|
|
5
|
+
const ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS = [
|
|
5
6
|
'utbildning.attribut.betygsskala',
|
|
6
7
|
'utbildning.attribut.huvudomrade.och.successiv.fordjupning',
|
|
7
8
|
'utbildning.attribut.organisation',
|
|
@@ -47,7 +48,8 @@ exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS = [
|
|
|
47
48
|
'utbildning.lokalt.attribut.29.fullsatt',
|
|
48
49
|
'utbildning.attribut.startperiod',
|
|
49
50
|
].join(',');
|
|
50
|
-
|
|
51
|
+
// Results in more than 20 attributvarden
|
|
52
|
+
const ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH = [
|
|
51
53
|
...exports.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS.split(','),
|
|
52
54
|
'utbildning.attribut.organisation',
|
|
53
55
|
'utbildning.attribut.startperiod',
|
|
@@ -74,7 +76,8 @@ exports.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION = [
|
|
|
74
76
|
'utbildning.attribut.omfattning',
|
|
75
77
|
'utbildning.attribut.examen.uppgift.for.emil',
|
|
76
78
|
].join(',');
|
|
77
|
-
|
|
79
|
+
// Results in more than 20 attributvarden
|
|
80
|
+
const ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS = [
|
|
78
81
|
'utbildning.attribut.omfattning',
|
|
79
82
|
'utbildning.attribut.betygsskala',
|
|
80
83
|
'utbildning.lokalt.attribut.29.utgava',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributVardenConstants.js","sourceRoot":"","sources":["../src/attributVardenConstants.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"attributVardenConstants.js","sourceRoot":"","sources":["../src/attributVardenConstants.ts"],"names":[],"mappings":"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"}
|
package/dist/createApiClient.js
CHANGED
|
@@ -29,11 +29,10 @@ const createSupportApis_1 = require("./supportApis/createSupportApis");
|
|
|
29
29
|
const queryConstants_1 = require("./queryConstants");
|
|
30
30
|
const createProgrammeApi_1 = require("./programme/createProgrammeApi");
|
|
31
31
|
const mergeResponses_1 = require("./utils/mergeResponses");
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
return response.items
|
|
32
|
+
const getAllEntitiesByUseOfContinuation_1 = require("./utils/getAllEntitiesByUseOfContinuation");
|
|
33
|
+
const responseUtils_1 = require("./utils/responseUtils");
|
|
34
|
+
const filterAndMapCourseRounds = (items, language, partOfProgrammes) => {
|
|
35
|
+
return items
|
|
37
36
|
.map(x => (0, mapCourseRound_1.mapCourseRound)(x, language, partOfProgrammes === null || partOfProgrammes === void 0 ? void 0 : partOfProgrammes[x.tillfalle_uid]))
|
|
38
37
|
.filter(x => x !== undefined)
|
|
39
38
|
.filter(utils_1.removeCourseRoundsBasedOnTillfalleskod)
|
|
@@ -49,18 +48,20 @@ const createApiClient = (config) => {
|
|
|
49
48
|
const ladokClient = (0, ladok_mellanlager_client_1.createClient)(config);
|
|
50
49
|
return {
|
|
51
50
|
getLatestCourseVersion: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
-
const result = yield ladokClient.
|
|
51
|
+
const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstans, {
|
|
53
52
|
kodEllerBenamning: courseCode,
|
|
54
53
|
striktKod: 'true',
|
|
55
|
-
|
|
54
|
+
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
55
|
+
utbildningstypgrundtyp: 'KURS',
|
|
56
|
+
}, {
|
|
57
|
+
maxSearchResultsToReturn: 1000,
|
|
58
|
+
maxContinuationIterations: 10,
|
|
56
59
|
});
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
}
|
|
60
|
-
if (result.searchMeta.pageResultSize === 0) {
|
|
60
|
+
const allEntities = (0, responseUtils_1.throwIfContinuationError)(result);
|
|
61
|
+
if (allEntities.length === 0) {
|
|
61
62
|
return Object.assign(Object.assign({}, result.responseInfo), { statusCode: 404, message: 'not found' });
|
|
62
63
|
}
|
|
63
|
-
const course =
|
|
64
|
+
const course = allEntities
|
|
64
65
|
.sort((a, b) => (0, ladok_attributvarde_utils_1.extractVersionNumber)(b.Attributvarden) - (0, ladok_attributvarde_utils_1.extractVersionNumber)(a.Attributvarden))
|
|
65
66
|
.at(0);
|
|
66
67
|
const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
|
|
@@ -71,61 +72,62 @@ const createApiClient = (config) => {
|
|
|
71
72
|
const requestObject = {
|
|
72
73
|
kodEllerBenamning: courseCode,
|
|
73
74
|
striktKod: 'true',
|
|
74
|
-
|
|
75
|
+
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
76
|
+
utbildningstypgrundtyp: 'KURS',
|
|
75
77
|
};
|
|
76
|
-
const [
|
|
77
|
-
|
|
78
|
-
ladokClient.
|
|
78
|
+
const [resultActiveCourseVersions, resultDiscontinuedCourseVersions] = yield Promise.all([
|
|
79
|
+
(0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstans, requestObject),
|
|
80
|
+
(0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstans, Object.assign(Object.assign({}, requestObject), { avvecklad: 'true' })),
|
|
79
81
|
]);
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
if (
|
|
85
|
-
return Object.assign(Object.assign({},
|
|
82
|
+
const allEntitiesActive = (0, responseUtils_1.throwIfContinuationError)(resultActiveCourseVersions);
|
|
83
|
+
const allEntitiesCancelled = (0, responseUtils_1.throwIfContinuationError)(resultDiscontinuedCourseVersions);
|
|
84
|
+
const activeAndCancelledResponseInfo = (0, mergeResponses_1.mergeResponseInfo)(resultActiveCourseVersions.responseInfo, resultDiscontinuedCourseVersions.responseInfo);
|
|
85
|
+
const allEntitiesActiveAndCancelledVersions = (0, mergeResponses_1.mergePlainArrays)(allEntitiesActive, allEntitiesCancelled, item => item.instans_uid);
|
|
86
|
+
if (allEntitiesActiveAndCancelledVersions.length === 0) {
|
|
87
|
+
return Object.assign(Object.assign({}, activeAndCancelledResponseInfo), { statusCode: 404, message: 'not found' });
|
|
86
88
|
}
|
|
87
|
-
const course =
|
|
89
|
+
const course = allEntitiesActiveAndCancelledVersions
|
|
88
90
|
.sort((a, b) => (0, ladok_attributvarde_utils_1.extractVersionNumber)(b.Attributvarden) - (0, ladok_attributvarde_utils_1.extractVersionNumber)(a.Attributvarden))
|
|
89
91
|
.at(0);
|
|
90
92
|
const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
|
|
91
93
|
const mappedCourse = (0, mapCourse_1.mapCourse)(course, language, gradingScalesCodes);
|
|
92
|
-
return Object.assign(Object.assign({},
|
|
94
|
+
return Object.assign(Object.assign({}, activeAndCancelledResponseInfo), mappedCourse);
|
|
93
95
|
}),
|
|
94
96
|
Search: (0, createSearchApi_1.createSearchApi)(ladokClient),
|
|
95
97
|
Programme: (0, createProgrammeApi_1.createProgrammeApi)(ladokClient),
|
|
96
98
|
getActiveCourseRounds: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
97
99
|
const currentDate = (0, utils_1.getFormattedCurrentDate)();
|
|
98
|
-
const result = yield ladokClient.sokKursTillfalleSlim
|
|
99
|
-
|
|
100
|
+
const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode, pagaendeDatum: currentDate }));
|
|
101
|
+
const allEntities = (0, responseUtils_1.throwIfContinuationError)(result);
|
|
102
|
+
return filterAndMapCourseRounds(allEntities, language);
|
|
100
103
|
}),
|
|
101
104
|
getActiveAndFutureCourseRounds: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
102
105
|
const currentDate = (0, utils_1.getFormattedCurrentDate)();
|
|
103
106
|
const requestObject = Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode });
|
|
104
107
|
const [resultPagaendeDatum, resultTerminsKodStart] = yield Promise.all([
|
|
105
|
-
ladokClient.sokKursTillfalleSlim
|
|
106
|
-
ladokClient.sokKursTillfalleSlim
|
|
108
|
+
(0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, Object.assign({ pagaendeDatum: currentDate }, requestObject)),
|
|
109
|
+
(0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, Object.assign({ terminkodStart: (0, courseSyllabusUtil_1.getSemester)(currentDate) }, requestObject)),
|
|
107
110
|
]);
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
111
|
+
const allEntitiesPagaendeDatum = (0, responseUtils_1.throwIfContinuationError)(resultPagaendeDatum);
|
|
112
|
+
const allEntitiesTerminsKodStart = (0, responseUtils_1.throwIfContinuationError)(resultTerminsKodStart);
|
|
113
|
+
const allEntitiesActiveAndFutureRounds = (0, mergeResponses_1.mergePlainArrays)(allEntitiesPagaendeDatum, allEntitiesTerminsKodStart, item => item.tillfalle_uid);
|
|
114
|
+
if (!allEntitiesActiveAndFutureRounds) {
|
|
115
|
+
return filterAndMapCourseRounds(allEntitiesActiveAndFutureRounds, language);
|
|
111
116
|
}
|
|
112
117
|
const periods = yield ladokClient.period(); // TODO: Use cached values
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
if (typeof periods.data !== 'object') {
|
|
117
|
-
throw new Error('periods.data is not an object.');
|
|
118
|
-
}
|
|
119
|
-
const partOfProgrammes = yield (0, partOfProgrammeUtil_1.getPartOfProgrammes)(resultActiveAndFutureRounds.items, periods.data.Period, ladokClient);
|
|
120
|
-
return filterAndMapCourseRounds(resultActiveAndFutureRounds, language, partOfProgrammes);
|
|
118
|
+
const periodsData = (0, responseUtils_1.throwIfError)(periods);
|
|
119
|
+
const partOfProgrammes = yield (0, partOfProgrammeUtil_1.getPartOfProgrammes)(allEntitiesActiveAndFutureRounds, periodsData.Period, ladokClient);
|
|
120
|
+
return filterAndMapCourseRounds(allEntitiesActiveAndFutureRounds, language, partOfProgrammes);
|
|
121
121
|
}),
|
|
122
122
|
getCourseRoundsFromPeriod: (courseCode, fromPeriod, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
123
|
-
const result = yield ladokClient.sokKursTillfalleSlim
|
|
124
|
-
|
|
123
|
+
const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode, terminkodStart: fromPeriod }));
|
|
124
|
+
const allEntities = (0, responseUtils_1.throwIfContinuationError)(result);
|
|
125
|
+
return filterAndMapCourseRounds(allEntities, language);
|
|
125
126
|
}),
|
|
126
127
|
getCourseRoundsForExactStartPeriod: (courseCode, startPeriod, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
127
|
-
const result = yield ladokClient.sokKursTillfalleSlim
|
|
128
|
-
|
|
128
|
+
const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, Object.assign(Object.assign({}, DEFAULT_COURSE_ROUNDS_QUERY_PARAMS), { kodEllerBenamning: courseCode, startPeriod: startPeriod }));
|
|
129
|
+
const allEntities = (0, responseUtils_1.throwIfContinuationError)(result);
|
|
130
|
+
return filterAndMapCourseRounds(allEntities, language);
|
|
129
131
|
}),
|
|
130
132
|
getUtbildningsPlan: (uid, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
131
133
|
const result = yield ladokClient.planForUtbildningUtbildningsinstans(uid);
|
|
@@ -174,28 +176,15 @@ const createApiClient = (config) => {
|
|
|
174
176
|
}),
|
|
175
177
|
getCourseSyllabus: (courseCode, semester, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
176
178
|
try {
|
|
177
|
-
const result = yield ladokClient.
|
|
179
|
+
const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokPlan, {
|
|
178
180
|
kodEllerBenamning: courseCode,
|
|
179
181
|
striktKod: 'true',
|
|
180
182
|
tillstand: 'BESLUTAD',
|
|
181
|
-
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
|
|
182
|
-
instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
|
|
183
183
|
});
|
|
184
|
-
|
|
185
|
-
throw new Error(`API call failed: ${result.responseInfo.apiError || 'Unknown error'}`);
|
|
186
|
-
}
|
|
187
|
-
if (typeof result.data !== 'object') {
|
|
188
|
-
throw new Error('result.data is not an object.');
|
|
189
|
-
}
|
|
190
|
-
const syllabuses = result.data;
|
|
184
|
+
const syllabuses = (0, responseUtils_1.throwIfContinuationError)(result);
|
|
191
185
|
const periods = yield ladokClient.period(); // TODO: Use cached values
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
}
|
|
195
|
-
if (typeof periods.data !== 'object') {
|
|
196
|
-
throw new Error('periods.data is not an object.');
|
|
197
|
-
}
|
|
198
|
-
const activeSyllabus = (0, courseSyllabusUtil_1.getSyllabusForSemester)(semester, syllabuses, periods.data.Period);
|
|
186
|
+
const periodsData = (0, responseUtils_1.throwIfError)(periods);
|
|
187
|
+
const activeSyllabus = (0, courseSyllabusUtil_1.getSyllabusForSemester)(semester, syllabuses, periodsData.Period);
|
|
199
188
|
if (!activeSyllabus) {
|
|
200
189
|
throw new Error(`No syllabus found for course ${courseCode} in semester ${semester}.`);
|
|
201
190
|
}
|
|
@@ -219,28 +208,21 @@ const createApiClient = (config) => {
|
|
|
219
208
|
}),
|
|
220
209
|
getCourseSyllabuses: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
221
210
|
try {
|
|
222
|
-
const result = yield ladokClient.
|
|
211
|
+
const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokPlan, {
|
|
223
212
|
kodEllerBenamning: courseCode,
|
|
224
213
|
striktKod: 'true',
|
|
225
|
-
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
|
|
226
|
-
instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
|
|
227
214
|
});
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
if (typeof result.data !== 'object') {
|
|
232
|
-
throw new Error('result.data is not an object.');
|
|
233
|
-
}
|
|
234
|
-
const data = Object.values(result.data);
|
|
235
|
-
const syllabuses = data.slice(1); // Assume the first element is metadata, skip it.
|
|
215
|
+
const syllabuses = (0, responseUtils_1.throwIfContinuationError)(result);
|
|
216
|
+
const data = Object.values(syllabuses);
|
|
217
|
+
const syllabusesData = data.slice(1); // Assume the first element is metadata, skip it.
|
|
236
218
|
const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(ladokClient);
|
|
237
|
-
const UtbildningsinstansUID =
|
|
219
|
+
const UtbildningsinstansUID = syllabusesData[1].UtbildningsinstansUID;
|
|
238
220
|
const examinationModules = yield (0, examinationModulesUtil_1.getExaminationModules)(UtbildningsinstansUID, language, ladokClient);
|
|
239
221
|
if (!examinationModules) {
|
|
240
222
|
throw new Error(`No examination modules were found for UtbildningsinstansUID ${UtbildningsinstansUID}`);
|
|
241
223
|
}
|
|
242
224
|
const formattedExaminationModules = (0, examinationModulesUtil_1.formatExaminationTitles)(examinationModules, language);
|
|
243
|
-
const mappedSyllabuses =
|
|
225
|
+
const mappedSyllabuses = syllabusesData.map((syllabus) => (0, mapCourseSyllabus_1.mapCourseSyllabus)(syllabus, gradingScalesCodes, formattedExaminationModules, language));
|
|
244
226
|
return mappedSyllabuses;
|
|
245
227
|
}
|
|
246
228
|
catch (error) {
|
|
@@ -249,21 +231,14 @@ const createApiClient = (config) => {
|
|
|
249
231
|
}),
|
|
250
232
|
getAllValidCourseSyllabuses: (courseCode, language) => __awaiter(void 0, void 0, void 0, function* () {
|
|
251
233
|
try {
|
|
252
|
-
const result = yield ladokClient.
|
|
234
|
+
const result = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokPlan, {
|
|
253
235
|
kodEllerBenamning: courseCode,
|
|
254
236
|
striktKod: 'true',
|
|
255
237
|
tillstand: 'BESLUTAD',
|
|
256
|
-
|
|
257
|
-
instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_SYLLABUS,
|
|
258
|
-
antalTraffar: '100',
|
|
238
|
+
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
259
239
|
});
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
}
|
|
263
|
-
if (typeof result.data !== 'object') {
|
|
264
|
-
throw new Error('result.data is not an object.');
|
|
265
|
-
}
|
|
266
|
-
const data = Object.values(result.data);
|
|
240
|
+
const allEntities = (0, responseUtils_1.throwIfContinuationError)(result);
|
|
241
|
+
const data = Object.values(allEntities);
|
|
267
242
|
let syllabuses;
|
|
268
243
|
if (!data[0].instans)
|
|
269
244
|
syllabuses = data.slice(1); // The first element is metadata, skip it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createApiClient.js","sourceRoot":"","sources":["../src/createApiClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"createApiClient.js","sourceRoot":"","sources":["../src/createApiClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4EAUsC;AAGtC,2CAAuC;AACvC,qDAAiD;AACjD,mCAIgB;AAEhB,6DAAyD;AACzD,8EAAoF;AACpF,2EAA4G;AAC5G,qEAAmE;AACnE,mEAKmC;AACnC,2DAAuD;AACvD,mEAAoF;AAEpF,qEAAiE;AACjE,8DAA0D;AAC1D,uEAA6E;AAC7E,qDAK4B;AAC5B,uEAAkE;AAClE,qDAAoD;AACpD,uEAAmE;AACnE,2DAA4E;AAC5E,iGAA6F;AAC7F,yDAA8E;AAE9E,MAAM,wBAAwB,GAAG,CAC/B,KAA2E,EAC3E,QAAkB,EAClB,gBAAoD,EACpD,EAAE;IACF,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,+BAAc,EAAC,CAAC,EAAE,QAAQ,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;SAC1E,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC;SAC5B,MAAM,CAAC,8CAAsC,CAAC;SAC9C,MAAM,CAAC,kDAA0C,CAAC,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,kCAAkC,GAAqC;IAC3E,SAAS,EAAE,MAAM;IACjB,cAAc,EAAE,2DAAiC;IACjD,qBAAqB,EAAE,gBAAgB;IACvC,YAAY,EAAE,kCAAiB;CAChC,CAAA;AAEM,MAAM,eAAe,GAAG,CAAC,MAAuC,EAA0B,EAAE;IACjG,MAAM,WAAW,GAAG,IAAA,uCAA4B,EAAC,MAAM,CAAC,CAAA;IACxD,OAAO;QACL,sBAAsB,EAAE,CAAO,UAAU,EAAE,QAAQ,EAAE,EAAE;YACrD,MAAM,MAAM,GAAG,MAAM,IAAA,qEAAiC,EACpD,WAAW,CAAC,qBAAqB,EACjC;gBACE,iBAAiB,EAAE,UAAU;gBAC7B,SAAS,EAAE,MAAM;gBACjB,YAAY,EAAE,kCAAiB;gBAC/B,sBAAsB,EAAE,MAAM;aAC/B,EACD;gBACE,wBAAwB,EAAE,IAAI;gBAC9B,yBAAyB,EAAE,EAAE;aAC9B,CACF,CAAA;YAED,MAAM,WAAW,GAAG,IAAA,wCAAwB,EAAC,MAAM,CAAC,CAAA;YAEpD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC7B,uCACK,MAAM,CAAC,YAAY,KACtB,UAAU,EAAE,GAAG,EACf,OAAO,EAAE,WAAW,IACrB;YACH,CAAC;YAED,MAAM,MAAM,GAAG,WAAW;iBACvB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,gDAAoB,EAAC,CAAC,CAAC,cAAc,CAAC,GAAG,IAAA,gDAAoB,EAAC,CAAC,CAAC,cAAc,CAAC,CAAC;iBAC/F,EAAE,CAAC,CAAC,CAAC,CAAA;YACR,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAA;YACnE,MAAM,YAAY,GAAG,IAAA,qBAAS,EAAC,MAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAA;YACrE,uCAAY,MAAM,CAAC,YAAY,GAAK,YAAY,EAAE;QACpD,CAAC,CAAA;QAED,wCAAwC,EAAE,CAAO,UAAU,EAAE,QAAQ,EAAE,EAAE;YACvE,MAAM,aAAa,GAA+B;gBAChD,iBAAiB,EAAE,UAAU;gBAC7B,SAAS,EAAE,MAAM;gBACjB,YAAY,EAAE,kCAAiB;gBAC/B,sBAAsB,EAAE,MAAM;aAC/B,CAAA;YAED,MAAM,CAAC,0BAA0B,EAAE,gCAAgC,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACvF,IAAA,qEAAiC,EAC/B,WAAW,CAAC,qBAAqB,EACjC,aAAa,CACd;gBACD,IAAA,qEAAiC,EAC/B,WAAW,CAAC,qBAAqB,kCAC5B,aAAa,KAAE,SAAS,EAAE,MAAM,IACtC;aACF,CAAC,CAAA;YAEF,MAAM,iBAAiB,GAAG,IAAA,wCAAwB,EAAC,0BAA0B,CAAC,CAAA;YAC9E,MAAM,oBAAoB,GAAG,IAAA,wCAAwB,EAAC,gCAAgC,CAAC,CAAA;YAEvF,MAAM,8BAA8B,GAAG,IAAA,kCAAiB,EACtD,0BAA0B,CAAC,YAAY,EACvC,gCAAgC,CAAC,YAAY,CAC9C,CAAA;YAED,MAAM,qCAAqC,GAAG,IAAA,iCAAgB,EAC5D,iBAAiB,EACjB,oBAAoB,EACpB,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAY,CAC1B,CAAA;YAED,IAAI,qCAAqC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvD,uCACK,8BAA8B,KACjC,UAAU,EAAE,GAAG,EACf,OAAO,EAAE,WAAW,IACrB;YACH,CAAC;YAED,MAAM,MAAM,GAAG,qCAAqC;iBACjD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAA,gDAAoB,EAAC,CAAC,CAAC,cAAc,CAAC,GAAG,IAAA,gDAAoB,EAAC,CAAC,CAAC,cAAc,CAAC,CAAC;iBAC/F,EAAE,CAAC,CAAC,CAAC,CAAA;YACR,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAA;YACnE,MAAM,YAAY,GAAG,IAAA,qBAAS,EAAC,MAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAA;YACrE,uCAAY,8BAA8B,GAAK,YAAY,EAAE;QAC/D,CAAC,CAAA;QAED,MAAM,EAAE,IAAA,iCAAe,EAAC,WAAW,CAAC;QACpC,SAAS,EAAE,IAAA,uCAAkB,EAAC,WAAW,CAAC;QAE1C,qBAAqB,EAAE,CAAO,UAAU,EAAE,QAAQ,EAAE,EAAE;YACpD,MAAM,WAAW,GAAG,IAAA,+BAAuB,GAAE,CAAA;YAE7C,MAAM,MAAM,GAAG,MAAM,IAAA,qEAAiC,EAGpD,WAAW,CAAC,oBAAoB,kCAC7B,kCAAkC,KACrC,iBAAiB,EAAE,UAAU,EAC7B,aAAa,EAAE,WAAW,IAC1B,CAAA;YAEF,MAAM,WAAW,GAAG,IAAA,wCAAwB,EAAC,MAAM,CAAC,CAAA;YACpD,OAAO,wBAAwB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QACxD,CAAC,CAAA;QAED,8BAA8B,EAAE,CAAO,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC7D,MAAM,WAAW,GAAG,IAAA,+BAAuB,GAAE,CAAA;YAE7C,MAAM,aAAa,mCACd,kCAAkC,KACrC,iBAAiB,EAAE,UAAU,GAC9B,CAAA;YAED,MAAM,CAAC,mBAAmB,EAAE,qBAAqB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACrE,IAAA,qEAAiC,EAC/B,WAAW,CAAC,oBAAoB,kBAE9B,aAAa,EAAE,WAAW,IACvB,aAAa,EAEnB;gBACD,IAAA,qEAAiC,EAC/B,WAAW,CAAC,oBAAoB,kBAE9B,cAAc,EAAE,IAAA,gCAAW,EAAC,WAAW,CAAC,IACrC,aAAa,EAEnB;aACF,CAAC,CAAA;YAEF,MAAM,wBAAwB,GAAG,IAAA,wCAAwB,EAAC,mBAAmB,CAAC,CAAA;YAC9E,MAAM,0BAA0B,GAAG,IAAA,wCAAwB,EAAC,qBAAqB,CAAC,CAAA;YAElF,MAAM,gCAAgC,GAAG,IAAA,iCAAgB,EACvD,wBAAwB,EACxB,0BAA0B,EAC1B,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAC3B,CAAA;YAED,IAAI,CAAC,gCAAgC,EAAE,CAAC;gBACtC,OAAO,wBAAwB,CAAC,gCAAgC,EAAE,QAAQ,CAAC,CAAA;YAC7E,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAA,CAAC,0BAA0B;YACrE,MAAM,WAAW,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,CAAA;YAEzC,MAAM,gBAAgB,GAAG,MAAM,IAAA,yCAAmB,EAChD,gCAAgC,EAChC,WAAW,CAAC,MAAM,EAClB,WAAW,CACZ,CAAA;YAED,OAAO,wBAAwB,CAAC,gCAAgC,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAA;QAC/F,CAAC,CAAA;QAED,yBAAyB,EAAE,CAAO,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE;YACpE,MAAM,MAAM,GAAG,MAAM,IAAA,qEAAiC,EAGpD,WAAW,CAAC,oBAAoB,kCAC7B,kCAAkC,KACrC,iBAAiB,EAAE,UAAU,EAC7B,cAAc,EAAE,UAAU,IAC1B,CAAA;YAEF,MAAM,WAAW,GAAG,IAAA,wCAAwB,EAAC,MAAM,CAAC,CAAA;YACpD,OAAO,wBAAwB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QACxD,CAAC,CAAA;QAED,kCAAkC,EAAE,CAAO,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE;YAC9E,MAAM,MAAM,GAAG,MAAM,IAAA,qEAAiC,EAGpD,WAAW,CAAC,oBAAoB,kCAC7B,kCAAkC,KACrC,iBAAiB,EAAE,UAAU,EAC7B,WAAW,EAAE,WAAW,IACxB,CAAA;YAEF,MAAM,WAAW,GAAG,IAAA,wCAAwB,EAAC,MAAM,CAAC,CAAA;YACpD,OAAO,wBAAwB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QACxD,CAAC,CAAA;QACD,kBAAkB,EAAE,CAAO,GAAG,EAAE,QAAQ,EAAE,EAAE;YAC1C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,mCAAmC,CAAC,GAAG,CAAC,CAAA;YACzE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC9B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAC5G,CAAC,CACF,CAAA,CAAC,wDAAwD;gBAE1D,IAAI,CAAC,IAAI;oBAAE,OAAO,SAAS,CAAA;gBAE3B,OAAO,IAAA,uCAAkB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;YAC3C,CAAC;QACH,CAAC,CAAA;QACD,8CAA8C,EAAE,CAAO,uBAAuB,EAAE,QAAQ,EAAE,EAAE;YAC1F,MAAM,oBAAoB,GAAG,MAAM,WAAW,CAAC,wBAAwB,CAAC,uBAAuB,EAAE;gBAC/F,cAAc,EAAE,wBAAwB;aACzC,CAAC,CAAA;YACF,IAAI,oBAAoB,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,IAAI,CAAA,EAAE,CAAC;gBACzE,OAAO,IAAA,oCAAW,EAAC,iDAAiD,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAA;YAC1G,CAAC;YAED,MAAM,qBAAqB,GAAG,IAAA,yCAAa,EAAC,oBAAoB,CAAC,IAAI,CAAC,cAAc,EAAE,wBAAwB,CAAC,CAAA;YAC/G,MAAM,kBAAkB,GAAG,MAAM,IAAA,8CAAqB,EAAC,qBAAsB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;YACrG,MAAM,2BAA2B,GAAG,IAAA,gDAAuB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;YACzF,OAAO,2BAA2B,CAAA;QACpC,CAAC,CAAA;QACD,4CAA4C,EAAE,CAAO,qBAAqB,EAAE,QAAQ,EAAE,EAAE;YACtF,MAAM,kBAAkB,GAAG,MAAM,IAAA,8CAAqB,EAAC,qBAAqB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;YACpG,MAAM,2BAA2B,GAAG,IAAA,gDAAuB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;YACzF,OAAO,2BAA2B,CAAA;QACpC,CAAC,CAAA;QACD,wBAAwB,EAAE,CAAO,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAClE,MAAM,eAAe,GAAG,MAAM,IAAA,iCAAmB,EAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;YAE/F,OAAO,eAAe,CAAA;QACxB,CAAC,CAAA;QAED,iBAAiB,EAAE,CAAO,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAC3D,IAAI,CAAC;gBACH,MAAM,cAAc,GAAG,MAAM,IAAA,gCAAkB,EAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;gBAC7F,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,EAAE,CAAA;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAA;YACzD,CAAC;QACH,CAAC,CAAA;QAED,+BAA+B,EAAE,CAAO,uBAAuB,EAAE,QAAQ,EAAE,EAAE;YAC3E,OAAO,MAAM,IAAA,2CAAqB,EAAC,uBAAuB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QACpF,CAAC,CAAA;QAED,oBAAoB,EAAE,CAAO,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAC9D,OAAO,MAAM,IAAA,0CAA4B,EAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;QACzF,CAAC,CAAA;QACD,iBAAiB,EAAE,CAAO,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAC1D,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAA,qEAAiC,EAA4B,WAAW,CAAC,OAAO,EAAE;oBACrG,iBAAiB,EAAE,UAAU;oBAC7B,SAAS,EAAE,MAAM;oBACjB,SAAS,EAAE,UAAU;iBACtB,CAAC,CAAA;gBAEF,MAAM,UAAU,GAAG,IAAA,wCAAwB,EAAC,MAAM,CAAC,CAAA;gBACnD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAA,CAAC,0BAA0B;gBACrE,MAAM,WAAW,GAAG,IAAA,4BAAY,EAAC,OAAO,CAAC,CAAA;gBAEzC,MAAM,cAAc,GAAG,IAAA,2CAAsB,EAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;gBAEvF,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,MAAM,IAAI,KAAK,CAAC,gCAAgC,UAAU,gBAAgB,QAAQ,GAAG,CAAC,CAAA;gBACxF,CAAC;gBAED,MAAM,qBAAqB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAA;gBAExD,MAAM,kBAAkB,GAAG,MAAM,IAAA,8CAAqB,EAAC,qBAAqB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;gBAEpG,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,+DAA+D,qBAAqB,EAAE,CAAC,CAAA;gBACzG,CAAC;gBACD,MAAM,2BAA2B,GAAG,IAAA,gDAAuB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;gBAEzF,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAA;gBACnE,MAAM,cAAc,GAAG,IAAA,qCAAiB,EACtC,cAAc,EACd,kBAAkB,EAClB,2BAA2B,EAC3B,QAAQ,CACT,CAAA;gBACD,OAAO,cAAc,CAAA;YACvB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,EAAE,CAAC,CAAA;YACzD,CAAC;QACH,CAAC,CAAA;QACD,kBAAkB,EAAE,CAAO,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;YAC5D,MAAM,eAAe,GAAG,MAAM,IAAA,4CAA8B,EAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;YAC1G,OAAO,eAAe,CAAA;QACxB,CAAC,CAAA;QACD,mBAAmB,EAAE,CAAO,UAAU,EAAE,QAAQ,EAAE,EAAE;YAClD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAA,qEAAiC,EAA4B,WAAW,CAAC,OAAO,EAAE;oBACrG,iBAAiB,EAAE,UAAU;oBAC7B,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAA;gBAEF,MAAM,UAAU,GAAG,IAAA,wCAAwB,EAAC,MAAM,CAAC,CAAA;gBAEnD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;gBACtC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA,CAAC,iDAAiD;gBACtF,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAA;gBAEnE,MAAM,qBAAqB,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAA;gBAErE,MAAM,kBAAkB,GAAG,MAAM,IAAA,8CAAqB,EAAC,qBAAqB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;gBAEpG,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,+DAA+D,qBAAqB,EAAE,CAAC,CAAA;gBACzG,CAAC;gBAED,MAAM,2BAA2B,GAAG,IAAA,gDAAuB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;gBAEzF,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE,CAC5D,IAAA,qCAAiB,EAAC,QAAQ,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,QAAQ,CAAC,CACvF,CAAA;gBACD,OAAO,gBAAgB,CAAA;YACzB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC,CAAA;QACD,2BAA2B,EAAE,CAAO,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC1D,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAA,qEAAiC,EAA4B,WAAW,CAAC,OAAO,EAAE;oBACrG,iBAAiB,EAAE,UAAU;oBAC7B,SAAS,EAAE,MAAM;oBACjB,SAAS,EAAE,UAAU;oBACrB,YAAY,EAAE,kCAAiB;iBAChC,CAAC,CAAA;gBAEF,MAAM,WAAW,GAAG,IAAA,wCAAwB,EAAC,MAAM,CAAC,CAAA;gBAEpD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;gBACvC,IAAI,UAAU,CAAA;gBACd,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO;oBAClB,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA,CAAC,0CAA0C;;oBAClE,UAAU,GAAG,IAAI,CAAA;gBACtB,MAAM,gBAAgB,GAAG,IAAA,mCAAc,EAAC,UAAU,CAAC,CAAA,CAAC,yGAAyG;gBAC7J,MAAM,gBAAgB,GAAG,IAAA,iDAA4B,EAAC,gBAAgB,CAAC,CAAA,CAAC,oEAAoE;gBAE5I,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAA;gBACnE,MAAM,gBAAgB,GAAG,EAAE,CAAA;gBAC3B,MAAM,WAAW,GAAG,IAAI,GAAG,EAAe,CAAA;gBAE1C,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;oBACxC,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAA;oBAEhC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC1B,MAAM,kBAAkB,GAAG,MAAM,IAAA,8CAAqB,EAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;wBAElF,IAAI,CAAC,kBAAkB,EAAE,CAAC;4BACxB,MAAM,IAAI,KAAK,CAAC,+DAA+D,GAAG,EAAE,CAAC,CAAA;wBACvF,CAAC;wBAED,MAAM,SAAS,GAAG,IAAA,gDAAuB,EAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAA;wBACvE,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;oBACjC,CAAC;oBAED,MAAM,2BAA2B,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;oBACxD,MAAM,MAAM,GAAG,IAAA,qCAAiB,EAAC,QAAQ,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,QAAQ,CAAC,CAAA;oBAErG,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBAC/B,CAAC;gBACD,OAAO,gBAAgB,CAAA;YACzB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAA;YAC3D,CAAC;QACH,CAAC,CAAA;QACD,mBAAmB,EAAE,GAAS,EAAE;YAC9B,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAgB,EAAC,WAAW,CAAC,CAAA;YACzD,OAAO,aAAa,CAAA;QACtB,CAAC,CAAA;QACD,wBAAwB,EAAE,GAAS,EAAE;YACnC,MAAM,kBAAkB,GAAG,MAAM,IAAA,0CAAqB,EAAC,WAAW,CAAC,CAAA;YACnE,OAAO,kBAAkB,CAAA;QAC3B,CAAC,CAAA;QACD,UAAU,EAAE,GAAS,EAAE;YACrB,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAA;YAC1C,OAAO,OAAO,CAAA;QAChB,CAAC,CAAA;QACD,OAAO,EAAE,IAAA,oCAAgB,EAAC,WAAW,CAAC;KACvC,CAAA;AACH,CAAC,CAAA;AAhXY,QAAA,eAAe,mBAgX3B"}
|
|
@@ -34,9 +34,9 @@ const createProgrammeApi = (ladokClient) => {
|
|
|
34
34
|
maxContinuationIterations: 6,
|
|
35
35
|
});
|
|
36
36
|
};
|
|
37
|
-
const [activeProgrammes, cancelledProgrammes] = yield Promise.all([
|
|
37
|
+
const [{ allEntities: activeProgrammes }, { allEntities: cancelledProgrammes }] = yield Promise.all([
|
|
38
38
|
fetchProgrammes(activeProgrammesRequestQuery),
|
|
39
|
-
getAvvecklad ? fetchProgrammes(cancelledProgrammesRequestQuery) : Promise.resolve([]),
|
|
39
|
+
getAvvecklad ? fetchProgrammes(cancelledProgrammesRequestQuery) : Promise.resolve({ allEntities: [] }),
|
|
40
40
|
]);
|
|
41
41
|
const mergedProgrammes = (0, mergeResponses_1.mergePlainArrays)(activeProgrammes, cancelledProgrammes, item => item.instans_uid);
|
|
42
42
|
const mappedProgrammes = mergedProgrammes.map(programme => (0, mapProgrammeVersion_1.mapProgrammeVersion)(programme, language));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createProgrammeApi.js","sourceRoot":"","sources":["../../src/programme/createProgrammeApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sDAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"createProgrammeApi.js","sourceRoot":"","sources":["../../src/programme/createProgrammeApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sDAAqD;AACrD,kGAGmD;AACnD,gEAA4D;AAC5D,wEAAwF;AACxF,2EAAkF;AAClF,4DAA0D;AAC1D,uEAAoE;AAE7D,MAAM,kBAAkB,GAAG,CAAC,WAAsC,EAAgB,EAAE;IACzF,OAAO;QACL,uBAAuB,EAAE,wBAAsC,EAAE,+DAAjC,QAAQ,EAAE,YAAY,GAAG,IAAI;YAC3D,IAAI,CAAC;gBACH,MAAM,4BAA4B,GAAG;oBACnC,GAAG,EAAE,SAAS;oBACd,qBAAqB,EAAE,qEAA2C;oBAClE,YAAY,EAAE,kCAAiB;oBAC/B,gBAAgB,EAAE,gEAAoC;iBACvD,CAAA;gBAED,MAAM,+BAA+B,mCAChC,4BAA4B,KAC/B,SAAS,EAAE,MAAM,GAClB,CAAA;gBAED,MAAM,eAAe,GAAG,CACtB,KAAqC,EACmC,EAAE;oBAC1E,OAAO,IAAA,qEAAiC,EAAC,WAAW,CAAC,yBAAyB,EAAE,KAAK,EAAE;wBACrF,wBAAwB,EAAE,GAAG;wBAC7B,yBAAyB,EAAE,CAAC;qBAC7B,CAAC,CAAA;gBACJ,CAAC,CAAA;gBAED,MAAM,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBAClG,eAAe,CAAC,4BAA4B,CAAC;oBAC7C,YAAY,CAAC,CAAC,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;iBACvG,CAAC,CAAA;gBAEF,MAAM,gBAAgB,GAAG,IAAA,iCAAgB,EAAC,gBAAgB,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAY,CAAC,CAAA;gBAC3G,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAA,yCAAmB,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAA;gBACpG,MAAM,qBAAqB,GAAG,IAAA,4CAAqB,EAAC,gBAAgB,CAAC,CAAA;gBAErE,OAAO,qBAAqB,CAAA;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAA;YAC/D,CAAC;QACH,CAAC,CAAA;KACF,CAAA;AACH,CAAC,CAAA;AAxCY,QAAA,kBAAkB,sBAwC9B"}
|
|
@@ -28,7 +28,7 @@ const createSearchApi = (ladokClient) => {
|
|
|
28
28
|
const cleanSearchParams = (0, searchUtils_1.validateAndCleanSearchParams)(searchParams);
|
|
29
29
|
const departmentList = yield supportService.getSchoolsWithDepartmentsForSearch(language);
|
|
30
30
|
const { requestQuery, filterPeriod } = (0, searchUtils_1.prepareSearchRequestQueryForKursTillfallen)(cleanSearchParams, departmentList);
|
|
31
|
-
const allCourses = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, requestQuery);
|
|
31
|
+
const { allEntities: allCourses } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokKursTillfalleSlim, requestQuery);
|
|
32
32
|
const mappedCourses = allCourses.map(course => (0, mapSearchResult_1.mapKursTillfalleResult)(course, language));
|
|
33
33
|
const groupedCourses = (0, groupSearchResults_1.groupSearchResults)(mappedCourses, filterPeriod);
|
|
34
34
|
// TODO Remove this once we have a query parameter to filter for miljö courses
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qDAI4B;AAC5B,kGAA8F;AAC9F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,6EAAyE;AACzE,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AAE/C,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO;QACL,aAAa,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YAC9C,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAExF,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,UAAU,GAAG,MAAM,IAAA,qEAAiC,
|
|
1
|
+
{"version":3,"file":"createSearchApi.js","sourceRoot":"","sources":["../../src/search/createSearchApi.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,qDAI4B;AAC5B,kGAA8F;AAC9F,wDAA2D;AAC3D,8DAA0D;AAC1D,oDAAmD;AACnD,6EAAyE;AACzE,mDAA+C;AAC/C,kEAA8D;AAC9D,sDAAsD;AAE/C,MAAM,eAAe,GAAG,CAAC,WAAsC,EAAa,EAAE;IACnF,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,WAAW,CAAC,CAAA;IACpD,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACtD,OAAO;QACL,aAAa,EAAE,CAAO,YAAY,EAAE,QAAQ,EAAE,EAAE;YAC9C,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAExF,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,IAAA,wDAA0C,EAC/E,iBAAiB,EACjB,cAAc,CACf,CAAA;gBAED,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qEAAiC,EAGzE,WAAW,CAAC,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"}
|
|
@@ -49,7 +49,7 @@ class SearchService {
|
|
|
49
49
|
}
|
|
50
50
|
searchLatestApprovedCourseVersions(requestQueryForKursInstans, language, continuationOptions) {
|
|
51
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
|
-
const allCourseVersions = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(this.ladokClient.
|
|
52
|
+
const { allEntities: allCourseVersions } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(this.ladokClient.sokUtbildningsInstans, requestQueryForKursInstans, continuationOptions);
|
|
53
53
|
const gradingScalesCodes = yield (0, gradingScalesUtils_1.getGradingScalesCodes)(this.ladokClient); // TODO: Use cached values
|
|
54
54
|
const allMappedCourseVersions = allCourseVersions.map(courseVersion => (0, mapCourse_1.mapCourse)(courseVersion, language, gradingScalesCodes));
|
|
55
55
|
const latestCourseVersions = (0, searchUtils_1.findLatestCourseVersions)(allMappedCourseVersions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchService.js","sourceRoot":"","sources":["../../src/search/searchService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,4CAAwC;AACxC,oDAAmD;AACnD,oEAAmE;AACnE,kGAA8F;AAC9F,+FAA2F;AAC3F,qEAAiE;AACjE,qDAM4B;AAE5B,4EAAwE;AACxE,kEAA8D;AAC9D,sDAAkD;AAGlD,MAAa,aAAa;IAGxB,YAAoB,WAAsC;QAAtC,gBAAW,GAAX,WAAW,CAA2B;QACxD,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,WAAW,CAAC,CAAA;QAC/D,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,WAAW,CAAC,CAAA;IACvD,CAAC;IAEY,oBAAoB,CAAC,YAA0B,EAAE,QAAkB;;YAC9E,IAAI,CAAC;gBACH,MAAM,iBAAiB,GAAG,IAAA,0CAA4B,EAAC,YAAY,CAAC,CAAA;gBAEpE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAA;gBAE7F,MAAM,0BAA0B,GAAG,IAAA,qDAAuC,EAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA;gBAE7G,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,kCAAkC,CAAC,0BAA0B,EAAE,QAAQ,CAAC,CAAA;gBAEjH,8EAA8E;gBAC9E,MAAM,oBAAoB,GAAG,IAAA,mCAAqB,EAAC,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;KAAA;IAEa,kCAAkC,CAC9C,
|
|
1
|
+
{"version":3,"file":"searchService.js","sourceRoot":"","sources":["../../src/search/searchService.ts"],"names":[],"mappings":"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"}
|
package/dist/search/types.d.ts
CHANGED
|
@@ -27,10 +27,7 @@ export type CleanSearchParams = Omit<SearchParams, 'utbildningsniva'> & {
|
|
|
27
27
|
};
|
|
28
28
|
export type CourseVersionDTO = {
|
|
29
29
|
kod: string;
|
|
30
|
-
benamning:
|
|
31
|
-
name: string | undefined;
|
|
32
|
-
nameOther: string | undefined;
|
|
33
|
-
};
|
|
30
|
+
benamning: string;
|
|
34
31
|
omfattning: string;
|
|
35
32
|
utbildningstyp: string;
|
|
36
33
|
};
|
|
@@ -5,7 +5,7 @@ const mapCourseVersionDTO = (courseVersion) => {
|
|
|
5
5
|
var _a, _b, _c;
|
|
6
6
|
return {
|
|
7
7
|
kod: courseVersion.kod,
|
|
8
|
-
benamning: (_a = courseVersion === null || courseVersion === void 0 ? void 0 : courseVersion.benamning) !== null && _a !== void 0 ? _a : '',
|
|
8
|
+
benamning: (_a = courseVersion === null || courseVersion === void 0 ? void 0 : courseVersion.benamning.name) !== null && _a !== void 0 ? _a : '',
|
|
9
9
|
omfattning: courseVersion.omfattning.formattedWithUnit,
|
|
10
10
|
utbildningstyp: (_c = (_b = courseVersion.utbildningstyp) === null || _b === void 0 ? void 0 : _b.level.name) !== null && _c !== void 0 ? _c : '',
|
|
11
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapCourseVersionDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseVersionDTO.ts"],"names":[],"mappings":";;;AAGO,MAAM,mBAAmB,GAAG,CAAC,aAAqB,EAAoB,EAAE;;IAC7E,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,SAAS,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,mCAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"mapCourseVersionDTO.js","sourceRoot":"","sources":["../../../src/search/utils/mapCourseVersionDTO.ts"],"names":[],"mappings":";;;AAGO,MAAM,mBAAmB,GAAG,CAAC,aAAqB,EAAoB,EAAE;;IAC7E,OAAO;QACL,GAAG,EAAE,aAAa,CAAC,GAAG;QACtB,SAAS,EAAE,MAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC,IAAI,mCAAI,EAAE;QAC9C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,iBAAiB;QACtD,cAAc,EAAE,MAAA,MAAA,aAAa,CAAC,cAAc,0CAAE,KAAK,CAAC,IAAI,mCAAI,EAAE;KAC/D,CAAA;AACH,CAAC,CAAA;AAPY,QAAA,mBAAmB,uBAO/B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SokUtbildningsInstansQuery, SokUtbildningsTillfalleQuery } from '@kth/ladok-mellanlager-client';
|
|
2
2
|
import { CleanSearchParams, SearchParams } from '../types';
|
|
3
3
|
import { SchoolWithDepartments } from '../../supportApis/types';
|
|
4
4
|
import { Course } from '../../mapCourse';
|
|
@@ -13,14 +13,14 @@ import { Course } from '../../mapCourse';
|
|
|
13
13
|
*/
|
|
14
14
|
export declare const validateAndCleanSearchParams: (searchParams: SearchParams) => CleanSearchParams;
|
|
15
15
|
export declare const prepareSearchRequestQueryForKursTillfallen: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => {
|
|
16
|
-
requestQuery: NonNullable<
|
|
16
|
+
requestQuery: NonNullable<SokUtbildningsTillfalleQuery>;
|
|
17
17
|
filterPeriod: boolean;
|
|
18
18
|
};
|
|
19
|
-
export declare const prepareSearchRequestQueryForKursInstans: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => NonNullable<
|
|
19
|
+
export declare const prepareSearchRequestQueryForKursInstans: (searchParams: CleanSearchParams, schoolsWithDepartments: SchoolWithDepartments[]) => NonNullable<SokUtbildningsInstansQuery>;
|
|
20
20
|
export declare const prepareSearchRequestQueryForDepartmentList: (schoolsWithDepartments: SchoolWithDepartments[], { rawUtbildningsniva, organisation, }: {
|
|
21
21
|
organisation?: string;
|
|
22
22
|
rawUtbildningsniva: string[] | undefined;
|
|
23
|
-
}) => NonNullable<
|
|
23
|
+
}) => NonNullable<SokUtbildningsInstansQuery>;
|
|
24
24
|
/**
|
|
25
25
|
* This function takes an array of courseVersions, groups them by their kod, and finds the latest version of each course.
|
|
26
26
|
* It returns an array of distinct courses (based on kod).
|
|
@@ -5,7 +5,6 @@ const SearchError_1 = require("../../utils/SearchError");
|
|
|
5
5
|
const utils_1 = require("../../utils");
|
|
6
6
|
const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
|
|
7
7
|
const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
|
|
8
|
-
const attributVardenConstants_1 = require("../../attributVardenConstants");
|
|
9
8
|
const typeChecking_1 = require("../../utils/typeChecking");
|
|
10
9
|
const queryConstants_1 = require("../../queryConstants");
|
|
11
10
|
const educationalTypeUtils_1 = require("./educationalTypeUtils");
|
|
@@ -57,19 +56,12 @@ const mapUtbildningsniva = (utbildningsniva) => {
|
|
|
57
56
|
return undefined;
|
|
58
57
|
}
|
|
59
58
|
};
|
|
60
|
-
// TODO Benni, maybe this does not make things cleaner, observe
|
|
61
|
-
// TODO Benni don't forget this when cleaning up types on query object
|
|
62
|
-
const DEFAULT_INSTANCE_QUERY_PARAMS = {
|
|
63
|
-
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH,
|
|
64
|
-
instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH,
|
|
65
|
-
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
66
|
-
};
|
|
67
59
|
const prepareSearchRequestQueryForKursTillfallen = (searchParams, schoolsWithDepartments) => {
|
|
68
60
|
const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
|
|
69
61
|
const educationalTypes = (0, educationalTypeUtils_1.getUtbildningsnivaParameterForKursTillfalle)(utbildningsniva);
|
|
70
62
|
const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
|
|
71
63
|
const filterPeriod = !Boolean(startPeriod);
|
|
72
|
-
const requestQuery = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(
|
|
64
|
+
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 });
|
|
73
65
|
return { requestQuery, filterPeriod }; // TODO Benni this does two things, filterPeriod should probably be split out
|
|
74
66
|
};
|
|
75
67
|
exports.prepareSearchRequestQueryForKursTillfallen = prepareSearchRequestQueryForKursTillfallen;
|
|
@@ -84,7 +76,7 @@ const getOrganisationsFilter = (organisationer, organisation) => {
|
|
|
84
76
|
const prepareSearchRequestQueryForKursInstans = (searchParams, schoolsWithDepartments) => {
|
|
85
77
|
const { kodEllerBenamning, avvecklad, organisation, utbildningsniva } = searchParams;
|
|
86
78
|
const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
|
|
87
|
-
return Object.assign(Object.assign(Object.assign(Object.assign(
|
|
79
|
+
return Object.assign(Object.assign(Object.assign(Object.assign({}, minimalSearchRequestQueryForKursInstans(queryConstants_1.MAX_ANTAL_TRAFFAR, utbildningsniva)), { kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*' }), (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter }));
|
|
88
80
|
};
|
|
89
81
|
exports.prepareSearchRequestQueryForKursInstans = prepareSearchRequestQueryForKursInstans;
|
|
90
82
|
const minimalSearchRequestQueryForKursInstans = (antalTraffar, utbildningsniva) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":";;;AACA,yDAAqD;AAErD,uCAAqE;AACrE,8EAAqE;AACrE,4EAA0E;
|
|
1
|
+
{"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
-
import { MellanlagringSearchResponse, SokUtbildningsInstansSlimQuery, SokUtbildningsTillfalleSlimQuery } from '@kth/ladok-mellanlager-client';
|
|
1
|
+
import { MellanlagringSearchResponse, ResponseInfoError, ResponseInfoOk, SokUtbildningsInstansSlimQuery, SokUtbildningsTillfalleSlimQuery } from '@kth/ladok-mellanlager-client';
|
|
2
2
|
import { ContinuationOptions } from '../search/types';
|
|
3
|
+
export type AllEntitiesByUseOfContinuation<T> = {
|
|
4
|
+
responseInfo: ResponseInfoOk | ResponseInfoError;
|
|
5
|
+
allEntities: T[];
|
|
6
|
+
};
|
|
3
7
|
export declare const getAllEntitiesByUseOfContinuation: <T, K extends SokUtbildningsInstansSlimQuery | SokUtbildningsTillfalleSlimQuery>(apiCall: (requestQuery: K, requestHeader?: {
|
|
4
8
|
continuationToken?: string;
|
|
5
|
-
}) => Promise<MellanlagringSearchResponse<T>>, requestQuery: K, { maxSearchResultsToReturn, maxContinuationIterations, }?: ContinuationOptions) => Promise<T
|
|
9
|
+
}) => Promise<MellanlagringSearchResponse<T>>, requestQuery: K, { maxSearchResultsToReturn, maxContinuationIterations, }?: ContinuationOptions) => Promise<AllEntitiesByUseOfContinuation<T>>;
|
|
@@ -18,12 +18,14 @@ const getAllEntitiesByUseOfContinuation = (apiCall_1, requestQuery_1, ...args_1)
|
|
|
18
18
|
let continuationToken = undefined;
|
|
19
19
|
let iterationCount = 0;
|
|
20
20
|
let allEntities = [];
|
|
21
|
+
let responseInfo;
|
|
21
22
|
do {
|
|
22
23
|
if (iterationCount >= maxContinuationIterations) {
|
|
23
24
|
throw SearchError_1.SearchError.overflow(`Maximum number of continuation iterations reached: ${maxContinuationIterations}`);
|
|
24
25
|
}
|
|
25
26
|
const requestHeader = Object.assign({}, (continuationToken !== null && continuationToken !== undefined && { continuationToken }));
|
|
26
27
|
const result = yield apiCall(requestQuery, requestHeader);
|
|
28
|
+
responseInfo = result.responseInfo;
|
|
27
29
|
// TODO Benni If we get this error after a few continuations, what should happen? At least error log
|
|
28
30
|
if (typeof result === 'string') {
|
|
29
31
|
throw SearchError_1.SearchError.unknown(result);
|
|
@@ -34,7 +36,7 @@ const getAllEntitiesByUseOfContinuation = (apiCall_1, requestQuery_1, ...args_1)
|
|
|
34
36
|
}
|
|
35
37
|
if (result.searchMeta.pageResultSize === 0) {
|
|
36
38
|
// TODO Benni: can we occur this on the last continuationToken? Check here whether we have allCourses at all or not
|
|
37
|
-
return [];
|
|
39
|
+
return { responseInfo, allEntities: [] };
|
|
38
40
|
}
|
|
39
41
|
allEntities = allEntities.concat(result.items);
|
|
40
42
|
if (allEntities.length > maxSearchResultsToReturn) {
|
|
@@ -43,7 +45,7 @@ const getAllEntitiesByUseOfContinuation = (apiCall_1, requestQuery_1, ...args_1)
|
|
|
43
45
|
continuationToken = (_a = result.searchMeta.continuationToken) !== null && _a !== void 0 ? _a : undefined;
|
|
44
46
|
iterationCount++;
|
|
45
47
|
} while (continuationToken);
|
|
46
|
-
return allEntities;
|
|
48
|
+
return { responseInfo, allEntities };
|
|
47
49
|
});
|
|
48
50
|
exports.getAllEntitiesByUseOfContinuation = getAllEntitiesByUseOfContinuation;
|
|
49
51
|
//# sourceMappingURL=getAllEntitiesByUseOfContinuation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../src/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"getAllEntitiesByUseOfContinuation.js","sourceRoot":"","sources":["../../src/utils/getAllEntitiesByUseOfContinuation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAOA,sDAAkD;AAGlD,MAAM,4BAA4B,GAAG,GAAG,CAAA,CAAC,0HAA0H;AACnK,MAAM,2BAA2B,GAAG,CAAC,CAAA;AAE9B,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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import { MellanlagringSearchResponse } from '@kth/ladok-mellanlager-client';
|
|
1
|
+
import { MellanlagringSearchResponse, ResponseInfo } from '@kth/ladok-mellanlager-client';
|
|
2
2
|
export declare const mergePlainArrays: <T>(a: T[], b: T[], uniqueItemKey: (item: T) => string) => T[];
|
|
3
3
|
export declare const mergeApiResponses: <T>(a: MellanlagringSearchResponse<T>, b: MellanlagringSearchResponse<T>, uniqueItemKey: (item: T) => string) => MellanlagringSearchResponse<T>;
|
|
4
|
+
export declare const mergeResponseInfo: (a: ResponseInfo, b: ResponseInfo) => ResponseInfo;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.mergeApiResponses = exports.mergePlainArrays = void 0;
|
|
3
|
+
exports.mergeResponseInfo = exports.mergeApiResponses = exports.mergePlainArrays = void 0;
|
|
4
4
|
const mergePlainArrays = (a, b, uniqueItemKey) => {
|
|
5
5
|
const mergedItemsMap = new Map();
|
|
6
6
|
for (const item of a !== null && a !== void 0 ? a : []) {
|
|
@@ -18,13 +18,10 @@ const mergeApiResponses = (a, b, uniqueItemKey) => {
|
|
|
18
18
|
return a;
|
|
19
19
|
if (b.type === 'error')
|
|
20
20
|
return b;
|
|
21
|
+
const mergedResponseInfo = (0, exports.mergeResponseInfo)(a.responseInfo, b.responseInfo);
|
|
21
22
|
return {
|
|
22
23
|
type: 'success',
|
|
23
|
-
responseInfo:
|
|
24
|
-
apiError: a.responseInfo.apiError || b.responseInfo.apiError,
|
|
25
|
-
statusCode: Math.max(a.responseInfo.statusCode, b.responseInfo.statusCode),
|
|
26
|
-
statusText: a.responseInfo.statusText || b.responseInfo.statusText,
|
|
27
|
-
},
|
|
24
|
+
responseInfo: mergedResponseInfo,
|
|
28
25
|
searchMeta: {
|
|
29
26
|
pageResultSize: ((_a = a.searchMeta.pageResultSize) !== null && _a !== void 0 ? _a : 0) + ((_b = b.searchMeta.pageResultSize) !== null && _b !== void 0 ? _b : 0),
|
|
30
27
|
requestCharge: ((_c = a.searchMeta.requestCharge) !== null && _c !== void 0 ? _c : 0) + ((_d = b.searchMeta.requestCharge) !== null && _d !== void 0 ? _d : 0),
|
|
@@ -34,4 +31,25 @@ const mergeApiResponses = (a, b, uniqueItemKey) => {
|
|
|
34
31
|
};
|
|
35
32
|
};
|
|
36
33
|
exports.mergeApiResponses = mergeApiResponses;
|
|
34
|
+
const mergeResponseInfo = (a, b) => {
|
|
35
|
+
const isError = a.apiError || b.apiError;
|
|
36
|
+
if (isError) {
|
|
37
|
+
const errorResponse = a.apiError ? a : b;
|
|
38
|
+
const errorMessage = errorResponse.message || 'Unknown error';
|
|
39
|
+
return {
|
|
40
|
+
apiError: true,
|
|
41
|
+
message: errorMessage,
|
|
42
|
+
statusCode: errorResponse.statusCode,
|
|
43
|
+
statusText: errorResponse.statusText,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
// This ensures statusCode and statusText are always from the same response
|
|
47
|
+
const useResponseA = a.statusCode >= b.statusCode;
|
|
48
|
+
return {
|
|
49
|
+
apiError: false,
|
|
50
|
+
statusCode: useResponseA ? a.statusCode : b.statusCode,
|
|
51
|
+
statusText: useResponseA ? a.statusText : b.statusText,
|
|
52
|
+
};
|
|
53
|
+
};
|
|
54
|
+
exports.mergeResponseInfo = mergeResponseInfo;
|
|
37
55
|
//# sourceMappingURL=mergeResponses.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeResponses.js","sourceRoot":"","sources":["../../src/utils/mergeResponses.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"mergeResponses.js","sourceRoot":"","sources":["../../src/utils/mergeResponses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { LadokMellanlagerApiClient,
|
|
1
|
+
import { LadokMellanlagerApiClient, PeriodItem, SokUtbildningsInstansItem, SokUtbildningsInstansSlimItem, SokUtbildningsTillfalleItem, SokUtbildningsTillfalleSlimItem } from '@kth/ladok-mellanlager-client';
|
|
2
2
|
import { Language } from './languageUtil';
|
|
3
3
|
import { ProgrammeVersion } from '../mapProgrammeVersion';
|
|
4
4
|
import { Lokalmarkning } from '@kth/ladok-attributvarde-utils';
|
|
5
5
|
import { ProgramCourse } from './programStrukturUtil';
|
|
6
6
|
import { ProgramSyllabus } from '../mapProgramSyllabus';
|
|
7
7
|
import { CompleteProgrammeVersion } from '../programme/types';
|
|
8
|
-
export declare const filterAndMapProgramTillfalle: (
|
|
8
|
+
export declare const filterAndMapProgramTillfalle: (items: Array<SokUtbildningsTillfalleItem | SokUtbildningsTillfalleSlimItem>, language: Language) => import("../mapProgramTillfalle").ProgramTillfalle[];
|
|
9
9
|
export declare const selectProgramInstans: (code: string | undefined, periods: PeriodItem[], programs: ProgrammeVersion[]) => ProgrammeVersion | undefined;
|
|
10
|
-
export declare const filterAndMapProgramInstans: (
|
|
10
|
+
export declare const filterAndMapProgramInstans: (items: Array<SokUtbildningsInstansItem | SokUtbildningsInstansSlimItem>, periods: PeriodItem[], code: string, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<CompleteProgrammeVersion | undefined>;
|
|
11
11
|
export declare const hasCourseListMarking: (lokalmarkning: Lokalmarkning[] | undefined) => boolean;
|
|
12
12
|
export declare const getProgramTerms: (program: ProgrammeVersion, oldestProgram: ProgrammeVersion, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<string[]>;
|
|
13
13
|
export declare const findProgramVersion: (programCode: string, semester: string, language: Language, ladokClient: LadokMellanlagerApiClient) => Promise<CompleteProgrammeVersion | undefined>;
|
|
@@ -27,6 +27,9 @@ const mapProgramSyllabus_1 = require("../mapProgramSyllabus");
|
|
|
27
27
|
const attributVardenConstants_1 = require("../attributVardenConstants");
|
|
28
28
|
const AcademicSemester_1 = require("./AcademicSemester");
|
|
29
29
|
const mergeResponses_1 = require("./mergeResponses");
|
|
30
|
+
const getAllEntitiesByUseOfContinuation_1 = require("./getAllEntitiesByUseOfContinuation");
|
|
31
|
+
const queryConstants_1 = require("../queryConstants");
|
|
32
|
+
const responseUtils_1 = require("./responseUtils");
|
|
30
33
|
const SEMESTER_FOR_START_READING_STRUCTURES = {
|
|
31
34
|
code: 'HT2025', // we will increase 2025 by {lengthInStudyYear} (maximum study year that we have for a program) since there can be ongoing programs until 2025
|
|
32
35
|
year: 2025,
|
|
@@ -36,11 +39,8 @@ const SEMESTER_FOR_END_READING_SYLLABUSES = {
|
|
|
36
39
|
code: 'VT2025',
|
|
37
40
|
date: '2025-06-02',
|
|
38
41
|
}; // Based on the follwoing document: https://confluence.sys.kth.se/confluence/pages/viewpage.action?pageId=262933569
|
|
39
|
-
const filterAndMapProgramTillfalle = (
|
|
40
|
-
|
|
41
|
-
throw new Error(`API error: ${response.responseInfo.message}`);
|
|
42
|
-
}
|
|
43
|
-
return response.items
|
|
42
|
+
const filterAndMapProgramTillfalle = (items, language) => {
|
|
43
|
+
return items
|
|
44
44
|
.map(x => (0, mapProgramTillfalle_1.mapProgramTillfalle)(x, language))
|
|
45
45
|
.filter(x => x !== undefined)
|
|
46
46
|
.filter(x => (0, exports.hasCourseListMarking)(x.lokalmarkning));
|
|
@@ -53,14 +53,11 @@ const selectProgramInstans = (code, periods, programs) => {
|
|
|
53
53
|
return (0, versionUtils_1.findLatestVersion)(programs);
|
|
54
54
|
};
|
|
55
55
|
exports.selectProgramInstans = selectProgramInstans;
|
|
56
|
-
const filterAndMapProgramInstans = (
|
|
56
|
+
const filterAndMapProgramInstans = (items, periods, code, language, ladokClient
|
|
57
57
|
// TODO: needs to be refactored to use addFirstAdmissionTerm when we are moving programme related stuff to Programme scope
|
|
58
58
|
) => __awaiter(void 0, void 0, void 0, function* () {
|
|
59
59
|
var _a, _b;
|
|
60
|
-
|
|
61
|
-
throw new Error(`API error in filterAndMapProgramInstans: ${response.responseInfo.message}`);
|
|
62
|
-
}
|
|
63
|
-
const mappedPrograms = response.items
|
|
60
|
+
const mappedPrograms = items
|
|
64
61
|
.map(item => (0, mapProgrammeVersion_1.mapProgrammeVersion)(item, language))
|
|
65
62
|
.filter((program) => !!program);
|
|
66
63
|
// A program can have different versions, we need to have the oldest one to know what is the first admission date for the program
|
|
@@ -95,14 +92,9 @@ const getProgramTerms = (program, oldestProgram, language, ladokClient) => __awa
|
|
|
95
92
|
var _a, _b, _c, _d;
|
|
96
93
|
const { kod, sistaAntagningstermin } = program;
|
|
97
94
|
const periods = yield ladokClient.period();
|
|
98
|
-
|
|
99
|
-
throw new Error(`API call failed: ${periods.responseInfo.apiError || 'Unknown error'}`);
|
|
100
|
-
}
|
|
101
|
-
if (typeof periods.data !== 'object') {
|
|
102
|
-
throw new Error('periods.data is not an object.');
|
|
103
|
-
}
|
|
95
|
+
const periodsData = (0, responseUtils_1.throwIfError)(periods);
|
|
104
96
|
const lastAdmissionTermData = sistaAntagningstermin
|
|
105
|
-
? (0, periodUtil_1.findPeriodByKod)(sistaAntagningstermin.toLadokPeriodString(),
|
|
97
|
+
? (0, periodUtil_1.findPeriodByKod)(sistaAntagningstermin.toLadokPeriodString(), periodsData.Period)
|
|
106
98
|
: undefined;
|
|
107
99
|
// 1. getting period data
|
|
108
100
|
const requestObjectForStructures = {
|
|
@@ -111,12 +103,12 @@ const getProgramTerms = (program, oldestProgram, language, ladokClient) => __awa
|
|
|
111
103
|
striktKod: 'true',
|
|
112
104
|
terminKodStart: getTerminKodStartForFetchStructures(program.lengthInStudyYears),
|
|
113
105
|
attributVarden: 'status,utbildning.attribut.lokalmarkning,utbildning.attribut.startperiod,utbildning.attribut.kod',
|
|
114
|
-
antalTraffar:
|
|
106
|
+
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
115
107
|
};
|
|
116
|
-
const
|
|
108
|
+
const { allEntities: allEntitiesForStructures } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokProgramTillfalleSlim, requestObjectForStructures);
|
|
117
109
|
// 2. searching for structures
|
|
118
110
|
const skipSyllabusesCheck = !!((_a = oldestProgram.giltigFrom) === null || _a === void 0 ? void 0 : _a.startDay) && oldestProgram.giltigFrom.startDay > SEMESTER_FOR_END_READING_SYLLABUSES.date;
|
|
119
|
-
let
|
|
111
|
+
let allEntitiesForSyllabuses;
|
|
120
112
|
// here we will sort out invalid syllabuses terms as well, we need syllabuses being valid after the giltigFran data and before sistaAntagningstermin date
|
|
121
113
|
if (!skipSyllabusesCheck) {
|
|
122
114
|
const requestObjectForSyllabuses = {
|
|
@@ -126,24 +118,25 @@ const getProgramTerms = (program, oldestProgram, language, ladokClient) => __awa
|
|
|
126
118
|
attributVarden: 'utbildning.lokalt.attribut.29.utgava',
|
|
127
119
|
giltigTill: (_b = lastAdmissionTermData === null || lastAdmissionTermData === void 0 ? void 0 : lastAdmissionTermData.TomDatum) !== null && _b !== void 0 ? _b : SEMESTER_FOR_END_READING_SYLLABUSES.date,
|
|
128
120
|
giltigFran: (_d = (_c = oldestProgram.giltigFrom) === null || _c === void 0 ? void 0 : _c.startDay) !== null && _d !== void 0 ? _d : DATE_FOR_START_READING_SYLLABUSES, // we are not able to add giltigTill without giltigFran so this is added for that purpose only
|
|
129
|
-
antalTraffar:
|
|
121
|
+
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
130
122
|
};
|
|
131
|
-
|
|
123
|
+
const { allEntities } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokPlanSlim, requestObjectForSyllabuses);
|
|
124
|
+
allEntitiesForSyllabuses = allEntities;
|
|
132
125
|
}
|
|
133
126
|
// 3. searching for sylabuses
|
|
134
127
|
let programTermsFromStructures = [];
|
|
135
|
-
if (
|
|
136
|
-
const mappedTerms =
|
|
128
|
+
if (allEntitiesForStructures) {
|
|
129
|
+
const mappedTerms = allEntitiesForStructures.map(x => (0, mapProgramTerm_1.mapProgramTerm)(x, language)).filter(Boolean);
|
|
137
130
|
const filteredTerms = mappedTerms.filter(x => (0, exports.hasCourseListMarking)(x.lokalmarkning));
|
|
138
131
|
const startPeriods = filteredTerms.map(x => x.startPeriod);
|
|
139
132
|
programTermsFromStructures = startPeriods;
|
|
140
133
|
}
|
|
141
134
|
// 4. startPeriod for all found structures
|
|
142
135
|
let programTermsFromSyllabuses = [];
|
|
143
|
-
if (
|
|
144
|
-
const validSyllabuses =
|
|
136
|
+
if (allEntitiesForSyllabuses) {
|
|
137
|
+
const validSyllabuses = allEntitiesForSyllabuses.filter((syllabus) => !!syllabus && 'GiltigFran' in syllabus);
|
|
145
138
|
const matchedPeriodCodes = validSyllabuses
|
|
146
|
-
.map(x => { var _a; return (_a = (0, studyYearUtil_1.findMatchingPeriod)(x.GiltigFran,
|
|
139
|
+
.map(x => { var _a; return (_a = (0, studyYearUtil_1.findMatchingPeriod)(x.GiltigFran, periodsData.Period)) === null || _a === void 0 ? void 0 : _a.Kod; })
|
|
147
140
|
.filter(typeChecking_1.isDefined);
|
|
148
141
|
const filteredTerms = matchedPeriodCodes.filter(x => (x === null || x === void 0 ? void 0 : x.includes('VT')) || (x === null || x === void 0 ? void 0 : x.includes('HT')));
|
|
149
142
|
programTermsFromSyllabuses = filteredTerms;
|
|
@@ -165,19 +158,14 @@ const findProgramVersion = (programCode, semester, language, ladokClient) => __a
|
|
|
165
158
|
typ: 'program',
|
|
166
159
|
instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION,
|
|
167
160
|
};
|
|
168
|
-
const [
|
|
169
|
-
ladokClient.sokUtbildningsInstansSlim
|
|
170
|
-
ladokClient.sokUtbildningsInstansSlim
|
|
161
|
+
const [{ allEntities: allEntitiesActiveProgrammes }, { allEntities: allEntitiesAvveckladProgrammes }] = yield Promise.all([
|
|
162
|
+
(0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstansSlim, Object.assign({}, requestObject)),
|
|
163
|
+
(0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokUtbildningsInstansSlim, Object.assign({ avvecklad: 'true' }, requestObject)),
|
|
171
164
|
]);
|
|
172
|
-
const response = (0, mergeResponses_1.
|
|
165
|
+
const response = (0, mergeResponses_1.mergePlainArrays)(allEntitiesActiveProgrammes, allEntitiesAvveckladProgrammes, item => item.instans_uid);
|
|
173
166
|
const periods = yield ladokClient.period(); // TODO: Use cached values
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
}
|
|
177
|
-
if (typeof periods.data !== 'object') {
|
|
178
|
-
throw new Error('periods.data is not an object.');
|
|
179
|
-
}
|
|
180
|
-
const programInstans = yield (0, exports.filterAndMapProgramInstans)(response, periods.data.Period, semester, language, ladokClient);
|
|
167
|
+
const periodsData = (0, responseUtils_1.throwIfError)(periods);
|
|
168
|
+
const programInstans = yield (0, exports.filterAndMapProgramInstans)(response, periodsData.Period, semester, language, ladokClient);
|
|
181
169
|
return programInstans;
|
|
182
170
|
});
|
|
183
171
|
exports.findProgramVersion = findProgramVersion;
|
|
@@ -189,9 +177,13 @@ const findProgramInstance = (programCode, semester, language, ladokClient) => __
|
|
|
189
177
|
baraSistaVersion: 'false',
|
|
190
178
|
attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
|
|
191
179
|
instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
|
|
180
|
+
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
192
181
|
};
|
|
193
|
-
const
|
|
194
|
-
|
|
182
|
+
const { allEntities } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokProgramTillfalleSlim, requestObject, {
|
|
183
|
+
maxSearchResultsToReturn: 1000,
|
|
184
|
+
maxContinuationIterations: 10,
|
|
185
|
+
});
|
|
186
|
+
const programTillfalleList = (0, exports.filterAndMapProgramTillfalle)(allEntities, language);
|
|
195
187
|
return (programTillfalleList === null || programTillfalleList === void 0 ? void 0 : programTillfalleList.length) ? programTillfalleList[0] : undefined;
|
|
196
188
|
});
|
|
197
189
|
exports.findProgramInstance = findProgramInstance;
|
|
@@ -212,15 +204,9 @@ function getAllProgrammeSpecializationCodes(curriculums) {
|
|
|
212
204
|
.filter((code) => typeof code === 'string');
|
|
213
205
|
}
|
|
214
206
|
const findProgramSyllabusForSemester = (programCode, semester, language, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
|
|
215
|
-
var _a;
|
|
216
207
|
const periods = yield ladokClient.period(); // TODO: get this from cached value in future
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
}
|
|
220
|
-
if (typeof periods.data !== 'object') {
|
|
221
|
-
throw new Error('periods.data is not an object.');
|
|
222
|
-
}
|
|
223
|
-
const smesterPeriodData = (0, periodUtil_1.findPeriodByKod)(semester, periods.data.Period);
|
|
208
|
+
const periodsData = (0, responseUtils_1.throwIfError)(periods);
|
|
209
|
+
const smesterPeriodData = (0, periodUtil_1.findPeriodByKod)(semester, periodsData.Period);
|
|
224
210
|
const requestObjectForSyllabuses = {
|
|
225
211
|
kodEllerBenamning: programCode,
|
|
226
212
|
striktKod: 'true',
|
|
@@ -229,10 +215,10 @@ const findProgramSyllabusForSemester = (programCode, semester, language, ladokCl
|
|
|
229
215
|
instansAttributVarden: 'versionsnummer',
|
|
230
216
|
giltigTill: smesterPeriodData === null || smesterPeriodData === void 0 ? void 0 : smesterPeriodData.TomDatum,
|
|
231
217
|
giltigFran: smesterPeriodData === null || smesterPeriodData === void 0 ? void 0 : smesterPeriodData.FromDatum,
|
|
232
|
-
antalTraffar:
|
|
218
|
+
antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
|
|
233
219
|
};
|
|
234
|
-
const
|
|
235
|
-
const validSyllabuses =
|
|
220
|
+
const { allEntities } = yield (0, getAllEntitiesByUseOfContinuation_1.getAllEntitiesByUseOfContinuation)(ladokClient.sokPlanSlim, requestObjectForSyllabuses);
|
|
221
|
+
const validSyllabuses = allEntities.filter((syllabus) => !!syllabus && 'GiltigFran' in syllabus);
|
|
236
222
|
if (!(validSyllabuses === null || validSyllabuses === void 0 ? void 0 : validSyllabuses.length))
|
|
237
223
|
throw new Error(`No program syllabuses found for ${programCode} - ${semester}`);
|
|
238
224
|
const sortedSyllabuses = (0, courseSyllabusUtil_1.sortSyllabuses)(validSyllabuses);
|
|
@@ -242,7 +228,7 @@ const findProgramSyllabusForSemester = (programCode, semester, language, ladokCl
|
|
|
242
228
|
const responseForSelectedSyllabus = yield ladokClient.planForUtbildning(plan_uid);
|
|
243
229
|
if (!(responseForSelectedSyllabus === null || responseForSelectedSyllabus === void 0 ? void 0 : responseForSelectedSyllabus.data))
|
|
244
230
|
throw new Error(`Error in fetching syllabus data for ${plan_uid}`);
|
|
245
|
-
return (0, mapProgramSyllabus_1.mapProgramSyllabus)(responseForSelectedSyllabus.data,
|
|
231
|
+
return (0, mapProgramSyllabus_1.mapProgramSyllabus)(responseForSelectedSyllabus.data, periodsData.Period, language);
|
|
246
232
|
});
|
|
247
233
|
exports.findProgramSyllabusForSemester = findProgramSyllabusForSemester;
|
|
248
234
|
const hasSpecialization = (curriculum) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"programUtil.js","sourceRoot":"","sources":["../../src/utils/programUtil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"programUtil.js","sourceRoot":"","sources":["../../src/utils/programUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { MellanlagringResponse } from '@kth/ladok-mellanlager-client';
|
|
2
|
+
import { AllEntitiesByUseOfContinuation } from './getAllEntitiesByUseOfContinuation';
|
|
3
|
+
export declare function throwIfError<TData>(response: MellanlagringResponse<TData>): TData;
|
|
4
|
+
export declare function throwIfContinuationError<TData>(response: AllEntitiesByUseOfContinuation<TData>): TData[];
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.throwIfError = throwIfError;
|
|
4
|
+
exports.throwIfContinuationError = throwIfContinuationError;
|
|
5
|
+
function throwIfError(response) {
|
|
6
|
+
if (response.type === 'error') {
|
|
7
|
+
throw new Error(`API call failed: ${response.responseInfo.message || 'Unknown error'}`);
|
|
8
|
+
}
|
|
9
|
+
return response.data;
|
|
10
|
+
}
|
|
11
|
+
function throwIfContinuationError(response) {
|
|
12
|
+
if (response.responseInfo.apiError) {
|
|
13
|
+
throw new Error(`API call failed: ${response.responseInfo.message || 'Unknown error'}`);
|
|
14
|
+
}
|
|
15
|
+
return response.allEntities;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=responseUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"responseUtils.js","sourceRoot":"","sources":["../../src/utils/responseUtils.ts"],"names":[],"mappings":";;AAQA,oCAKC;AAED,4DAKC;AAZD,SAAgB,YAAY,CAAQ,QAAsC;IACxE,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,CAAC,YAAY,CAAC,OAAO,IAAI,eAAe,EAAE,CAAC,CAAA;IACzF,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,CAAA;AACtB,CAAC;AAED,SAAgB,wBAAwB,CAAQ,QAA+C;IAC7F,IAAI,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,CAAC,YAAY,CAAC,OAAO,IAAI,eAAe,EAAE,CAAC,CAAA;IACzF,CAAC;IACD,OAAO,QAAQ,CAAC,WAAW,CAAA;AAC7B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kth/om-kursen-ladok-client",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.1",
|
|
4
4
|
"description": "Om kursen specific logic and mappings, uses both @kth/ladok-mellanlager-client and @kth/ladok-attributevarde-utils.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@kth/ladok-attributvarde-utils": "1.0.3",
|
|
25
|
-
"@kth/ladok-mellanlager-client": "1.0
|
|
25
|
+
"@kth/ladok-mellanlager-client": "1.1.0",
|
|
26
26
|
"date-fns": "^4.1.0",
|
|
27
27
|
"showdown": "^2.1.0"
|
|
28
28
|
}
|