@kth/om-kursen-ladok-client 2.0.1 → 2.0.3

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.
Files changed (44) hide show
  1. package/dist/attributVardenConstants.d.ts +5 -0
  2. package/dist/attributVardenConstants.js +73 -1
  3. package/dist/attributVardenConstants.js.map +1 -1
  4. package/dist/createApiClient.js +70 -39
  5. package/dist/createApiClient.js.map +1 -1
  6. package/dist/mapCourse.d.ts +1 -1
  7. package/dist/mapCourse.js +3 -2
  8. package/dist/mapCourse.js.map +1 -1
  9. package/dist/mapCourseSyllabus.js +5 -4
  10. package/dist/mapCourseSyllabus.js.map +1 -1
  11. package/dist/mapProgramInstans.d.ts +1 -1
  12. package/dist/mapProgramInstans.js +3 -2
  13. package/dist/mapProgramInstans.js.map +1 -1
  14. package/dist/mapProgramSyllabus.js +1 -1
  15. package/dist/mapProgramSyllabus.js.map +1 -1
  16. package/dist/mapProgramTillfalle.js +3 -3
  17. package/dist/mapProgramTillfalle.js.map +1 -1
  18. package/dist/mapSearchResult.d.ts +1 -1
  19. package/dist/mapSearchResult.js +8 -8
  20. package/dist/mapSearchResult.js.map +1 -1
  21. package/dist/mapStructurePartVersions.js +1 -1
  22. package/dist/mapStructurePartVersions.js.map +1 -1
  23. package/dist/queryConstants.d.ts +1 -0
  24. package/dist/queryConstants.js +5 -0
  25. package/dist/queryConstants.js.map +1 -0
  26. package/dist/search/utils/getLatestCompletedCourseVersions.js +1 -1
  27. package/dist/search/utils/getLatestCompletedCourseVersions.js.map +1 -1
  28. package/dist/search/utils/searchUtils.js +3 -3
  29. package/dist/search/utils/searchUtils.js.map +1 -1
  30. package/dist/types/OmKursenLadokApiClient.d.ts +1 -0
  31. package/dist/utils/courseSyllabusUtil.d.ts +1 -0
  32. package/dist/utils/courseSyllabusUtil.js +17 -3
  33. package/dist/utils/courseSyllabusUtil.js.map +1 -1
  34. package/dist/utils/programStrukturUtil.d.ts +2 -2
  35. package/dist/utils/programStrukturUtil.js +67 -71
  36. package/dist/utils/programStrukturUtil.js.map +1 -1
  37. package/dist/utils/programUtil.js +6 -5
  38. package/dist/utils/programUtil.js.map +1 -1
  39. package/dist/utils/studyYearUtil.js +2 -0
  40. package/dist/utils/studyYearUtil.js.map +1 -1
  41. package/dist/utils/versionUtils.d.ts +1 -1
  42. package/dist/utils/versionUtils.js +4 -4
  43. package/dist/utils/versionUtils.js.map +1 -1
  44. package/package.json +3 -3
package/dist/mapSearchResult.js CHANGED
@@ -8,7 +8,7 @@ const creditsUtil_1 = require("./utils/creditsUtil");
8
8
  const schoolUtil_1 = require("./utils/schoolUtil");
9
9
  // TODO Benni this should be refactored together with mapCourseRound
10
10
  const mapKursTillfalleResult = (courseRound, language) => {
11
- var _a, _b, _c, _d, _e, _f, _g, _h;
11
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
12
12
  const benamning = {
13
13
  sv: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.svensk.benamning'),
14
14
  en: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.engelsk.benamning'),
@@ -24,12 +24,12 @@ const mapKursTillfalleResult = (courseRound, language) => {
24
24
  const startperiod = (0, ladok_attributvarde_utils_1.extractStartPeriod)(courseRound.Attributvarden);
25
25
  const studietakt = (0, ladok_attributvarde_utils_1.extractStudietakt)(courseRound.Attributvarden);
26
26
  const schoolCode = (0, schoolUtil_1.extractSchoolCodeFromOrganisation)(organisation, language);
27
- const omfattning = courseRound.index['utbildning.attribut.omfattning'];
27
+ const omfattning = (_b = (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.omfattning', 'omfattning')) !== null && _b !== void 0 ? _b : '';
28
28
  const isMiljo = (0, ladok_attributvarde_utils_1.extractIsMiljo)(courseRound.instans.Attributvarden);
29
29
  return {
30
- versionsnummer: courseRound.index.versionsnummer,
30
+ versionsnummer: (0, ladok_attributvarde_utils_1.extractVersionNumber)(courseRound.instans.Attributvarden),
31
31
  kod: (0, ladok_attributvarde_utils_1.extractString)(courseRound.instans.Attributvarden, 'utbildning.attribut.kod'),
32
- benamning: (_b = benamning[language]) !== null && _b !== void 0 ? _b : '',
32
+ benamning: (_c = benamning[language]) !== null && _c !== void 0 ? _c : '',
33
33
  omfattning: {
34
34
  number: omfattning,
35
35
  formattedWithUnit: (0, creditsUtil_1.formatCreditsWithUnitLabel)(omfattning, utbildningstyp, language),
@@ -46,16 +46,16 @@ const mapKursTillfalleResult = (courseRound, language) => {
46
46
  },
47
47
  period: {
48
48
  startperiod: (startperiod === null || startperiod === void 0 ? void 0 : startperiod.code) || '',
49
- forstaUndervisningsdatum: Object.assign({ date: (_c = courseRound.Tillfallesperioder.at(0)) === null || _c === void 0 ? void 0 : _c.ForstaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_d = courseRound.Tillfallesperioder.at(0)) === null || _d === void 0 ? void 0 : _d.ForstaUndervisningsdatum), {
49
+ forstaUndervisningsdatum: Object.assign({ date: (_d = courseRound.Tillfallesperioder.at(0)) === null || _d === void 0 ? void 0 : _d.ForstaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_e = courseRound.Tillfallesperioder.at(0)) === null || _e === void 0 ? void 0 : _e.ForstaUndervisningsdatum), {
50
50
  code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
51
51
  startDate: startperiod && new Date(startperiod.startDay),
52
52
  endDate: startperiod && new Date(startperiod.lastDay),
53
- }, 'start') }, (0, utils_1.getYearAndWeek)((_e = courseRound.Tillfallesperioder.at(0)) === null || _e === void 0 ? void 0 : _e.ForstaUndervisningsdatum)),
54
- sistaUndervisningsdatum: Object.assign({ date: (_f = courseRound.Tillfallesperioder.at(-1)) === null || _f === void 0 ? void 0 : _f.SistaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_g = courseRound.Tillfallesperioder.at(-1)) === null || _g === void 0 ? void 0 : _g.SistaUndervisningsdatum), {
53
+ }, 'start') }, (0, utils_1.getYearAndWeek)((_f = courseRound.Tillfallesperioder.at(0)) === null || _f === void 0 ? void 0 : _f.ForstaUndervisningsdatum)),
54
+ sistaUndervisningsdatum: Object.assign({ date: (_g = courseRound.Tillfallesperioder.at(-1)) === null || _g === void 0 ? void 0 : _g.SistaUndervisningsdatum, period: (0, utils_1.getKthStudyPeriod)(new Date((_h = courseRound.Tillfallesperioder.at(-1)) === null || _h === void 0 ? void 0 : _h.SistaUndervisningsdatum), {
55
55
  code: startperiod === null || startperiod === void 0 ? void 0 : startperiod.code,
56
56
  startDate: startperiod && new Date(startperiod.startDay),
57
57
  endDate: startperiod && new Date(startperiod.lastDay),
58
- }, 'end') }, (0, utils_1.getYearAndWeek)((_h = courseRound.Tillfallesperioder.at(-1)) === null || _h === void 0 ? void 0 : _h.SistaUndervisningsdatum)),
58
+ }, 'end') }, (0, utils_1.getYearAndWeek)((_j = courseRound.Tillfallesperioder.at(-1)) === null || _j === void 0 ? void 0 : _j.SistaUndervisningsdatum)),
59
59
  tillfallesperioderNummer: courseRound.Tillfallesperioder.length,
60
60
  },
61
61
  schoolCode,
package/dist/mapSearchResult.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mapSearchResult.js","sourceRoot":"","sources":["../src/mapSearchResult.ts"],"names":[],"mappings":"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"}
package/dist/mapStructurePartVersions.js CHANGED
@@ -12,7 +12,7 @@ const mapStructurePartVersions = (course, language) => {
12
12
  };
13
13
  const utbildningstyp = (0, ladok_attributvarde_utils_1.extractUtbildningstyp)(Attributvarden);
14
14
  const kod = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.kod');
15
- const omfattning = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.omfattning');
15
+ const omfattning = (0, ladok_attributvarde_utils_1.extractString)(Attributvarden, 'utbildning.attribut.omfattning', 'omfattning');
16
16
  return {
17
17
  kod: kod,
18
18
  benamning: benamning[language],
package/dist/mapStructurePartVersions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mapStructurePartVersions.js","sourceRoot":"","sources":["../src/mapStructurePartVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAqF;AAGrF,uDAAkG;AAClG,qDAAgE;AAazD,MAAM,wBAAwB,GAAG,CACtC,MAAmD,EACnD,QAAkB,EACI,EAAE;IACxB,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAA;IAEjC,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,sCAAsC,CAAC;QACzE,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,uCAAuC,CAAC;KAC3E,CAAA;IAED,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,cAAc,CAAC,CAAA;IAE5D,MAAM,GAAG,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,yBAAyB,CAAC,CAAA;IACpE,MAAM,UAAU,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,gCAAgC,CAAC,CAAA;IAElF,OAAO;QACL,GAAG,EAAE,GAAI;QACT,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAE;QAC/B,cAAc,EAAE,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACnF,qBAAqB,EAAE,MAAM,CAAC,GAAG;QACjC,UAAU,EAAE;YACV,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC;YAC1B,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,UAAW,EAAE,cAAc,EAAE,QAAQ,CAAC;SACrF;KACF,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,wBAAwB,4BA0BpC"}
1
+ {"version":3,"file":"mapStructurePartVersions.js","sourceRoot":"","sources":["../src/mapStructurePartVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAqF;AAGrF,uDAAkG;AAClG,qDAAgE;AAazD,MAAM,wBAAwB,GAAG,CACtC,MAAmD,EACnD,QAAkB,EACI,EAAE;IACxB,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAA;IAEjC,MAAM,SAAS,GAAG;QAChB,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,sCAAsC,CAAC;QACzE,EAAE,EAAE,IAAA,yCAAa,EAAC,cAAc,EAAE,uCAAuC,CAAC;KAC3E,CAAA;IAED,MAAM,cAAc,GAAG,IAAA,iDAAqB,EAAC,cAAc,CAAC,CAAA;IAE5D,MAAM,GAAG,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,yBAAyB,CAAC,CAAA;IACpE,MAAM,UAAU,GAAG,IAAA,yCAAa,EAAC,cAAc,EAAE,gCAAgC,EAAE,YAAY,CAAC,CAAA;IAEhG,OAAO;QACL,GAAG,EAAE,GAAI;QACT,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAE;QAC/B,cAAc,EAAE,cAAc,IAAI,IAAA,sCAAuB,EAAC,cAAc,EAAE,QAAQ,CAAC;QACnF,qBAAqB,EAAE,MAAM,CAAC,GAAG;QACjC,UAAU,EAAE;YACV,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC;YAC1B,iBAAiB,EAAE,IAAA,wCAA0B,EAAC,UAAW,EAAE,cAAc,EAAE,QAAQ,CAAC;SACrF;KACF,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,wBAAwB,4BA0BpC"}
package/dist/queryConstants.d.ts ADDED
@@ -0,0 +1 @@
1
+ export declare const MAX_ANTAL_TRAFFAR = "100";
package/dist/queryConstants.js ADDED
@@ -0,0 +1,5 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MAX_ANTAL_TRAFFAR = void 0;
4
+ exports.MAX_ANTAL_TRAFFAR = '100';
5
+ //# sourceMappingURL=queryConstants.js.map
package/dist/queryConstants.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"queryConstants.js","sourceRoot":"","sources":["../src/queryConstants.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,KAAK,CAAA"}
package/dist/search/utils/getLatestCompletedCourseVersions.js CHANGED
@@ -10,7 +10,7 @@ const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
10
10
  */
11
11
  const getLatestCompletedCourseVersions = (courseVersions) => {
12
12
  return courseVersions.filter(course => {
13
- const versionsnummer = parseInt(course.versionsnummer, 10);
13
+ const { versionsnummer } = course;
14
14
  if (course.ladokStatusCode === ladok_attributvarde_utils_1.LadokStatusCode.Complete)
15
15
  return true;
16
16
  return versionsnummer > 1; // If a versionnummer is greater than 1, there once has been at least one completed version
package/dist/search/utils/getLatestCompletedCourseVersions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getLatestCompletedCourseVersions.js","sourceRoot":"","sources":["../../../src/search/utils/getLatestCompletedCourseVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAgE;AAGhE;;;;;GAKG;AACI,MAAM,gCAAgC,GAAG,CAC9C,cAAmB,EACd,EAAE;IACP,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;QAE1D,IAAI,MAAM,CAAC,eAAe,KAAK,2CAAe,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAA;QAEpE,OAAO,cAAc,GAAG,CAAC,CAAA,CAAC,2FAA2F;IACvH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAVY,QAAA,gCAAgC,oCAU5C"}
1
+ {"version":3,"file":"getLatestCompletedCourseVersions.js","sourceRoot":"","sources":["../../../src/search/utils/getLatestCompletedCourseVersions.ts"],"names":[],"mappings":";;;AAAA,8EAAgE;AAGhE;;;;;GAKG;AACI,MAAM,gCAAgC,GAAG,CAC9C,cAAmB,EACd,EAAE;IACP,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAA;QAEjC,IAAI,MAAM,CAAC,eAAe,KAAK,2CAAe,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAA;QAEpE,OAAO,cAAc,GAAG,CAAC,CAAA,CAAC,2FAA2F;IACvH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAVY,QAAA,gCAAgC,oCAU5C"}
package/dist/search/utils/searchUtils.js CHANGED
@@ -8,6 +8,7 @@ const utbildningsTypIdConstants_1 = require("../utbildningsTypIdConstants");
8
8
  const attributVardenConstants_1 = require("../../attributVardenConstants");
9
9
  const educationalTypeUtils_1 = require("./educationalTypeUtils");
10
10
  const typeChecking_1 = require("../../utils/typeChecking");
11
+ const queryConstants_1 = require("../../queryConstants");
11
12
  /**
12
13
  * Validates and cleans the search parameters for the search API.
13
14
  * Throws an error if the searchParams are invalid.
@@ -56,13 +57,12 @@ const mapUtbildningsniva = (utbildningsniva) => {
56
57
  return undefined;
57
58
  }
58
59
  };
59
- const MAX_ANTAL_TRAFFAR = '100';
60
60
  // TODO Benni, maybe this does not make things cleaner, observe
61
61
  // TODO Benni don't forget this when cleaning up types on query object
62
62
  const DEFAULT_INSTANCE_QUERY_PARAMS = {
63
63
  attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH,
64
64
  instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_COURSE_ROUNDS_SEARCH,
65
- antalTraffar: MAX_ANTAL_TRAFFAR,
65
+ antalTraffar: queryConstants_1.MAX_ANTAL_TRAFFAR,
66
66
  };
67
67
  const prepareSearchRequestQueryForKursTillfallen = (searchParams, schoolsWithDepartments) => {
68
68
  const { kodEllerBenamning, organisation, sprak, startPeriod, utbildningsniva, avvecklad } = searchParams;
@@ -109,7 +109,7 @@ const getOrganisationsFilter = (organisationer, organisation) => {
109
109
  const prepareSearchRequestQueryForKursInstans = (searchParams, schoolsWithDepartments) => {
110
110
  const { kodEllerBenamning, avvecklad, organisation, utbildningsniva } = searchParams;
111
111
  const organisationsFilter = getOrganisationsFilter(schoolsWithDepartments, organisation);
112
- return Object.assign(Object.assign(Object.assign({ kodEllerBenamning: kodEllerBenamning !== null && kodEllerBenamning !== void 0 ? kodEllerBenamning : '*', antalTraffar: MAX_ANTAL_TRAFFAR }, (avvecklad && { avvecklad })), (organisationsFilter && { organisation: organisationsFilter })), { utbildningstypgrundtyp: 'KURS', utbildningstypid: getUtbildningsnivaParameterForKursInstans(utbildningsniva), instansAttributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_COURSE_VERSIONS, senasteversion: 'true' });
112
+ 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' });
113
113
  };
114
114
  exports.prepareSearchRequestQueryForKursInstans = prepareSearchRequestQueryForKursInstans;
115
115
  /**
package/dist/search/utils/searchUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"searchUtils.js","sourceRoot":"","sources":["../../../src/search/utils/searchUtils.ts"],"names":[],"mappings":"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"}
package/dist/types/OmKursenLadokApiClient.d.ts CHANGED
@@ -32,6 +32,7 @@ export type OmKursenLadokApiClient = {
32
32
  getCourseSyllabus: (courseCode: string, semester: string, language: Language) => Promise<KursPlan> | undefined;
33
33
  getProgramSyllabus: (courseCode: string, semester: string, language: Language) => Promise<ProgramSyllabus>;
34
34
  getCourseSyllabuses: (courseCode: string, language: Language) => Promise<KursPlan[]> | undefined;
35
+ getAllValidCourseSyllabuses: (courseCode: string, language: Language) => Promise<KursPlan[]> | undefined;
35
36
  getAllGradingScales: () => Promise<any>;
36
37
  getAllGradingScalesCodes: () => Promise<any>;
37
38
  getPeriods: () => Promise<MellanlagringResponse<Period>>;
package/dist/utils/courseSyllabusUtil.d.ts CHANGED
@@ -3,3 +3,4 @@ import { PeriodItem } from '@kth/ladok-mellanlager-client/dist/types/endpoints/p
3
3
  export declare const getSemester: (dateStr: string) => string;
4
4
  export declare function sortSyllabuses(syllabuses: (SokPlanItem | SokPlanSlimItem)[]): (SokPlanItem | SokPlanSlimItem)[];
5
5
  export declare function getSyllabusForSemester(semester: string, syllabuses: SokPlanItem[] | SokPlanSlimItem[], periods: PeriodItem[]): SokPlanItem | SokPlanSlimItem | null;
6
+ export declare const uniqueSyllabusesByGiltigFran: (syllabuses: (SokPlanItem | SokPlanSlimItem)[]) => any[];
package/dist/utils/courseSyllabusUtil.js CHANGED
@@ -1,9 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getSemester = void 0;
3
+ exports.uniqueSyllabusesByGiltigFran = exports.getSemester = void 0;
4
4
  exports.sortSyllabuses = sortSyllabuses;
5
5
  exports.getSyllabusForSemester = getSyllabusForSemester;
6
6
  const periodUtil_1 = require("./periodUtil");
7
+ const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
7
8
  const getSemester = (dateStr) => {
8
9
  const [yearStr, monthStr] = dateStr.split('-');
9
10
  const year = parseInt(yearStr, 10);
@@ -26,8 +27,8 @@ function sortSyllabuses(syllabuses) {
26
27
  return dateB - dateA;
27
28
  }
28
29
  // Step 2: If same GiltigFran date, sort by latest course version (descending)
29
- const versionA = parseInt(a.index.versionsnummer, 10);
30
- const versionB = parseInt(b.index.versionsnummer, 10);
30
+ const versionA = (0, ladok_attributvarde_utils_1.extractVersionNumber)(a.instans.Attributvarden);
31
+ const versionB = (0, ladok_attributvarde_utils_1.extractVersionNumber)(b.instans.Attributvarden);
31
32
  if (versionA !== versionB) {
32
33
  return versionB - versionA;
33
34
  }
@@ -69,4 +70,17 @@ function getSyllabusForSemester(semester, syllabuses, periods) {
69
70
  const sortedSyllabuses = sortSyllabuses(validSyllabuses);
70
71
  return sortedSyllabuses.length > 0 ? sortedSyllabuses[0] : null;
71
72
  }
73
+ const uniqueSyllabusesByGiltigFran = (syllabuses) => {
74
+ const seen = new Set();
75
+ const filtered = [];
76
+ for (const syllabus of syllabuses) {
77
+ const key = syllabus.GiltigFran;
78
+ if (!seen.has(key)) {
79
+ seen.add(key);
80
+ filtered.push(syllabus);
81
+ }
82
+ }
83
+ return filtered;
84
+ };
85
+ exports.uniqueSyllabusesByGiltigFran = uniqueSyllabusesByGiltigFran;
72
86
  //# sourceMappingURL=courseSyllabusUtil.js.map
package/dist/utils/courseSyllabusUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"courseSyllabusUtil.js","sourceRoot":"","sources":["../../src/utils/courseSyllabusUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"courseSyllabusUtil.js","sourceRoot":"","sources":["../../src/utils/courseSyllabusUtil.ts"],"names":[],"mappings":";;;AAmBA,wCAoCC;AAED,wDA4BC;AApFD,6CAAsD;AAEtD,8EAAqE;AAE9D,MAAM,WAAW,GAAG,CAAC,OAAe,EAAU,EAAE;IACrD,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC9C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IAEpC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,IAAI,EAAE,CAAA;IACpB,CAAC;SAAM,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,EAAE,CAAC;QACrC,OAAO,KAAK,IAAI,EAAE,CAAA;IACpB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;AACjD,CAAC,CAAA;AAZY,QAAA,WAAW,eAYvB;AAED,SAAgB,cAAc,CAAC,UAA6C;IAC1E,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC9B,2DAA2D;QAC3D,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAA;QAC9C,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAA;QAC9C,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACpB,OAAO,KAAK,GAAG,KAAK,CAAA;QACtB,CAAC;QAED,8EAA8E;QAC9E,MAAM,QAAQ,GAAG,IAAA,gDAAoB,EAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC/D,MAAM,QAAQ,GAAG,IAAA,gDAAoB,EAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC/D,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,QAAQ,GAAG,QAAQ,CAAA;QAC5B,CAAC;QAED,oFAAoF;QACpF,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAU,EAAE;;YACtC,MAAM,GAAG,GAAG,MAAA,MAAA,GAAG,CAAC,sBAAsB,CAAC,IAAI,CACzC,CAAC,aAAkB,EAAE,EAAE,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,KAAK,sCAAsC,CACxG,0CAAE,MAAM,0CAAG,CAAC,CAAC,CAAA;YACd,OAAO,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA,CAAC,yCAAyC;QACtF,CAAC,CAAA;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;QAE9B,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,QAAQ,GAAG,QAAQ,CAAA,CAAC,iCAAiC;QAC9D,CAAC;QAED,kFAAkF;QAClF,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAA;QACnG,MAAM,UAAU,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAA;QACnG,OAAO,UAAU,GAAG,UAAU,CAAA;IAChC,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAgB,sBAAsB,CACpC,QAAgB,EAChB,UAA6C,EAC7C,OAAqB;IAErB,MAAM,qBAAqB,GAAG,IAAA,oCAAuB,EAAC,QAAQ,CAAC,CAAA;IAC/D,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAC7D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;IAC5E,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,qBAAqB,CAAC,CAAA;IAChF,IAAI,WAAiB,CAAA;IAErB,IAAI,WAAW,EAAE,CAAC;QAChB,WAAW,GAAG,IAAI,IAAI,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACjE,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,2DAA2D,qBAAqB,EAAE,CAAC,CAAA;IACrG,CAAC;IAED,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,QAAuC,EAAE,EAAE;QACpF,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QAC/C,OAAO,SAAS,IAAI,WAAW,CAAA;IACjC,CAAC,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,cAAc,CAAC,eAAe,CAAC,CAAA;IAExD,OAAO,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AACjE,CAAC;AAEM,MAAM,4BAA4B,GAAG,CAAC,UAA6C,EAAE,EAAE;IAC5F,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,MAAM,QAAQ,GAAU,EAAE,CAAA;IAE1B,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QAClC,MAAM,GAAG,GAAG,QAAQ,CAAC,UAAU,CAAA;QAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACb,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAbY,QAAA,4BAA4B,gCAaxC"}
package/dist/utils/programStrukturUtil.d.ts CHANGED
@@ -25,8 +25,8 @@ export declare const handleError: (message: string, error?: any) => {
25
25
  };
26
26
  export declare const fetchStructureByTillfalleUid: (uid: string, ladokClient: LadokMellanlagerApiClient) => Promise<import("@kth/ladok-mellanlager-client").UtbildningstillfalleStruktur | undefined>;
27
27
  export declare const fetchStructureByInstansUid: (uid: string, ladokClient: LadokMellanlagerApiClient) => Promise<Strukturdel[]>;
28
- export declare const fetchStructurePartInstances: (utbildningstillfalleUIDn: string[], ladokClient: LadokMellanlagerApiClient) => Promise<(import("@kth/ladok-mellanlager-client").UtbildningstillfalleSlim | undefined)[]>;
29
- export declare const fetchStructurePartsVersions: (utbildningsinstansUIDn: string[], ladokClient: LadokMellanlagerApiClient) => Promise<(import("@kth/ladok-mellanlager-client").UtbildningsinstansSlim | undefined)[]>;
28
+ export declare const fetchStructurePartInstance: (utbildningstillfalleUID: string, ladokClient: LadokMellanlagerApiClient) => Promise<import("@kth/ladok-mellanlager-client").UtbildningstillfalleSlim | undefined>;
29
+ export declare const fetchStructurePartVersion: (utbildningsinstansUID: string, ladokClient: LadokMellanlagerApiClient) => Promise<import("@kth/ladok-mellanlager-client").UtbildningsinstansSlim | undefined>;
30
30
  type CategorizedStrukturdel = Strukturdel & {
31
31
  Valvillkor: string;
32
32
  };
package/dist/utils/programStrukturUtil.js CHANGED
@@ -9,11 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- exports.fetchProgramStructure = exports.fetchAndCategorizeStructureParts = exports.fetchStructurePartsVersions = exports.fetchStructurePartInstances = exports.fetchStructureByInstansUid = exports.fetchStructureByTillfalleUid = exports.handleError = void 0;
12
+ exports.fetchProgramStructure = exports.fetchAndCategorizeStructureParts = exports.fetchStructurePartVersion = exports.fetchStructurePartInstance = exports.fetchStructureByInstansUid = exports.fetchStructureByTillfalleUid = exports.handleError = void 0;
13
13
  const mapStructureCourses_1 = require("../mapStructureCourses");
14
14
  const mapStructurePartVersions_1 = require("../mapStructurePartVersions");
15
15
  const ladok_attributvarde_utils_1 = require("@kth/ladok-attributvarde-utils");
16
16
  const studyYearUtil_1 = require("./studyYearUtil");
17
+ const typeChecking_1 = require("./typeChecking");
17
18
  const handleError = (message, error) => {
18
19
  console.error(message, error);
19
20
  return { error: message, details: (error === null || error === void 0 ? void 0 : error.message) || 'Unknown error' };
@@ -40,46 +41,30 @@ const fetchStructureByInstansUid = (uid, ladokClient) => __awaiter(void 0, void
40
41
  }
41
42
  });
42
43
  exports.fetchStructureByInstansUid = fetchStructureByInstansUid;
43
- const fetchStructurePartInstances = (utbildningstillfalleUIDn, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
44
+ const fetchStructurePartInstance = (utbildningstillfalleUID, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
44
45
  try {
45
- const moduler = yield Promise.all(utbildningstillfalleUIDn.map((utbildningstillfalleUID) => __awaiter(void 0, void 0, void 0, function* () {
46
- try {
47
- const utbildningsinstans = yield ladokClient.utbildningstillfalleSlim(utbildningstillfalleUID, {
48
- attributVarden: 'utbildningsinstans.uid,utbildning.attribut.utbildningstillfalleskod,utbildningstyp,utbildning.attribut.startperiod,status',
49
- });
50
- return utbildningsinstans.data;
51
- }
52
- catch (error) {
53
- throw (0, exports.handleError)(`Error fetching module for utbildningsbasUID ${utbildningstillfalleUIDn}:`, error);
54
- }
55
- })));
56
- return moduler.filter(module => module !== null);
46
+ const utbildningsinstans = yield ladokClient.utbildningstillfalleSlim(utbildningstillfalleUID, {
47
+ attributVarden: 'utbildningsinstans.uid,utbildning.attribut.utbildningstillfalleskod,utbildningstyp,utbildning.attribut.startperiod,status',
48
+ });
49
+ return utbildningsinstans.data;
57
50
  }
58
51
  catch (error) {
59
- throw (0, exports.handleError)('Failed to fetch modules', error);
52
+ throw (0, exports.handleError)(`Error fetching module for utbildningstillfalleUID ${utbildningstillfalleUID}:`, error);
60
53
  }
61
54
  });
62
- exports.fetchStructurePartInstances = fetchStructurePartInstances;
63
- const fetchStructurePartsVersions = (utbildningsinstansUIDn, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
55
+ exports.fetchStructurePartInstance = fetchStructurePartInstance;
56
+ const fetchStructurePartVersion = (utbildningsinstansUID, ladokClient) => __awaiter(void 0, void 0, void 0, function* () {
64
57
  try {
65
- const moduler = yield Promise.all(utbildningsinstansUIDn.map((utbildningsinstansUID) => __awaiter(void 0, void 0, void 0, function* () {
66
- try {
67
- const utbildningsinstans = yield ladokClient.utbildningsinstansSlim(utbildningsinstansUID, {
68
- attributVarden: 'utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.kod,utbildningstyp,utbildning.attribut.omfattning',
69
- });
70
- return utbildningsinstans.data;
71
- }
72
- catch (error) {
73
- throw (0, exports.handleError)(`Error fetching module for utbildningsinstansUID ${utbildningsinstansUID}:`, error);
74
- }
75
- })));
76
- return moduler.filter(module => module !== null);
58
+ const utbildningsinstans = yield ladokClient.utbildningsinstansSlim(utbildningsinstansUID, {
59
+ attributVarden: 'utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.kod,utbildningstyp,utbildning.attribut.omfattning',
60
+ });
61
+ return utbildningsinstans.data;
77
62
  }
78
63
  catch (error) {
79
- throw (0, exports.handleError)('Failed to fetch utbildningsinstanses', error);
64
+ throw (0, exports.handleError)(`Error fetching module for utbildningsinstansUID ${utbildningsinstansUID}:`, error);
80
65
  }
81
66
  });
82
- exports.fetchStructurePartsVersions = fetchStructurePartsVersions;
67
+ exports.fetchStructurePartVersion = fetchStructurePartVersion;
83
68
  const categoryMap = {
84
69
  'VILLKORLIGT VALFRI': 'VV',
85
70
  REKOMMENDERAD: 'R',
@@ -98,45 +83,37 @@ const categorizeStructureParts = (strukturDelar) => {
98
83
  };
99
84
  function fetchStructurePartsByType(categorizedStrukturDelar, language, ladokClient) {
100
85
  return __awaiter(this, void 0, void 0, function* () {
101
- const categorizedMap = new Map(categorizedStrukturDelar.map(c => [c.UtbildningsbasUID, c]));
102
- const utbildningsbasUIDn = categorizedStrukturDelar.map(d => d.UtbildningsbasUID);
103
86
  const results = [];
104
- for (const uid of utbildningsbasUIDn) {
105
- const categorized = categorizedMap.get(uid);
106
- if (!categorized)
87
+ for (const categorized of categorizedStrukturDelar) {
88
+ const { UtbildningsbasUID, AvserTillfalle } = categorized;
89
+ if (!UtbildningsbasUID)
107
90
  continue;
108
- // here we try to findout which type the utbildningsbasUID belongs to: instance or version
109
- const [instanceResult, versionResult] = yield Promise.allSettled([
110
- (0, exports.fetchStructurePartInstances)([uid], ladokClient),
111
- (0, exports.fetchStructurePartsVersions)([uid], ladokClient),
112
- ]);
113
- function isSuccessfulNonEmptyResult(result) {
114
- return (result.status === 'fulfilled' &&
115
- Array.isArray(result.value) &&
116
- result.value.length > 0 &&
117
- result.value[0] !== undefined);
91
+ if (AvserTillfalle) {
92
+ // Instance type – only fetch instance data
93
+ const instanceResult = yield (0, exports.fetchStructurePartInstance)(UtbildningsbasUID, ladokClient);
94
+ if ((0, typeChecking_1.isDefined)(instanceResult)) {
95
+ results.push({
96
+ type: 'instance',
97
+ data: (0, mapStructureCourses_1.mapStructurePartInstances)(instanceResult, language),
98
+ categorized,
99
+ });
100
+ }
118
101
  }
119
- if (isSuccessfulNonEmptyResult(instanceResult)) {
120
- // it means that the data belongs to instance type
121
- results.push({
122
- type: 'instance',
123
- data: (0, mapStructureCourses_1.mapStructurePartInstances)(instanceResult.value[0], language),
124
- categorized,
125
- });
126
- }
127
- if (isSuccessfulNonEmptyResult(versionResult)) {
128
- // it means that the data belongs to version type
129
- results.push({
130
- type: 'version',
131
- data: (0, mapStructurePartVersions_1.mapStructurePartVersions)(versionResult.value[0], language),
132
- categorized,
133
- });
102
+ else {
103
+ // Version type – only fetch version data
104
+ const versionResult = yield (0, exports.fetchStructurePartVersion)(UtbildningsbasUID, ladokClient);
105
+ if ((0, typeChecking_1.isDefined)(versionResult)) {
106
+ results.push({
107
+ type: 'version',
108
+ data: (0, mapStructurePartVersions_1.mapStructurePartVersions)(versionResult, language),
109
+ categorized,
110
+ });
111
+ }
134
112
  }
135
113
  }
136
114
  return results;
137
115
  });
138
116
  }
139
- const SPECIALIZATION_INSTANCE_TYPE = 'Inriktningstillfälle';
140
117
  function isSpecializationInstance(instance) {
141
118
  if (instance.type === 'instance') {
142
119
  const utbildningstyp = instance.data.utbildningstyp;
@@ -145,6 +122,14 @@ function isSpecializationInstance(instance) {
145
122
  else
146
123
  return false;
147
124
  }
125
+ function isInvalidData(instance) {
126
+ if (instance.type === 'instance') {
127
+ const utbildningstyp = instance.data.utbildningstyp;
128
+ return (utbildningstyp === null || utbildningstyp === void 0 ? void 0 : utbildningstyp.id) === ladok_attributvarde_utils_1.EducationalTypeID.UTBSAM; // more invalid instances can be added here
129
+ }
130
+ else
131
+ return false;
132
+ }
148
133
  function separateSpecializations(structureParts) {
149
134
  const filteredMappedStructurePartsDividedByType = [];
150
135
  const specializationListFromStructure = [];
@@ -156,7 +141,8 @@ function separateSpecializations(structureParts) {
156
141
  }
157
142
  }
158
143
  else {
159
- filteredMappedStructurePartsDividedByType.push(structurePart);
144
+ if (!isInvalidData(structurePart))
145
+ filteredMappedStructurePartsDividedByType.push(structurePart);
160
146
  }
161
147
  });
162
148
  return { filteredMappedStructurePartsDividedByType, specializationListFromStructure };
@@ -167,8 +153,12 @@ function mergeStructurePartInstancesAndVersions(filteredMappedStructurePartsDivi
167
153
  const instanceParts = filteredMappedStructurePartsDividedByType.filter(part => part.type === 'instance');
168
154
  const versionParts = filteredMappedStructurePartsDividedByType.filter(part => part.type === 'version');
169
155
  // Fetch versions for all instances
170
- const uids = instanceParts.map(part => part.data.utbildningsinstansUid);
171
- const versionResponse = yield (0, exports.fetchStructurePartsVersions)(uids, ladokClient);
156
+ const versionResponse = [];
157
+ for (const part of instanceParts) {
158
+ const uid = part.data.utbildningsinstansUid;
159
+ const version = yield (0, exports.fetchStructurePartVersion)(uid, ladokClient);
160
+ versionResponse.push(version);
161
+ }
172
162
  const mappedVersions = versionResponse.map(v => (0, mapStructurePartVersions_1.mapStructurePartVersions)(v, language));
173
163
  const versionMap = new Map(mappedVersions.map(v => [v.utbildningsinstansUid, v]));
174
164
  const mergedResults = [];
@@ -231,14 +221,20 @@ const getMainProgramInstanceData = (uid, language, ladokClient) => __awaiter(voi
231
221
  const mapSpecializationCurriculums = (specializations, startperiodCode, lengthInStudyYears, language, ladokClient, allPeriods) => __awaiter(void 0, void 0, void 0, function* () {
232
222
  const tillfalleUids = specializations.map(s => s.uid);
233
223
  const instansUids = specializations.map(s => s.utbildningsinstansUid);
234
- const specializatons = yield (0, exports.fetchStructurePartsVersions)(instansUids, ladokClient);
235
- const mappedSpecializations = specializatons
236
- .filter(Boolean)
224
+ const specializationsData = [];
225
+ for (const uid of instansUids) {
226
+ const version = yield (0, exports.fetchStructurePartVersion)(uid, ladokClient);
227
+ if (version)
228
+ specializationsData.push(version);
229
+ }
230
+ const mappedSpecializations = specializationsData
231
+ .filter(typeChecking_1.isDefined)
237
232
  .map(entity => (0, mapStructurePartVersions_1.mapStructurePartVersions)(entity, language));
238
- const specializationsCourseListFromStructure = yield Promise.all(tillfalleUids.map((uid) => __awaiter(void 0, void 0, void 0, function* () {
233
+ const specializationsCourseListFromStructure = [];
234
+ for (const uid of tillfalleUids) {
239
235
  const { structureCourses, freeTexts } = yield (0, exports.fetchAndCategorizeStructureParts)(uid, language, ladokClient);
240
- return { structureCourses, freeTexts };
241
- })));
236
+ specializationsCourseListFromStructure.push({ structureCourses, freeTexts });
237
+ }
242
238
  return mappedSpecializations.map((spec, index) => ({
243
239
  studyYears: (0, studyYearUtil_1.generateStudyYearData)(specializationsCourseListFromStructure[index].structureCourses, specializationsCourseListFromStructure[index].freeTexts, allPeriods, startperiodCode, lengthInStudyYears),
244
240
  programmeSpecialization: {
package/dist/utils/programStrukturUtil.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"programStrukturUtil.js","sourceRoot":"","sources":["../../src/utils/programStrukturUtil.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"programStrukturUtil.js","sourceRoot":"","sources":["../../src/utils/programStrukturUtil.ts"],"names":[],"mappings":"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"}
package/dist/utils/programUtil.js CHANGED
@@ -24,6 +24,7 @@ const versionUtils_1 = require("./versionUtils");
24
24
  const programStrukturUtil_1 = require("./programStrukturUtil");
25
25
  const courseSyllabusUtil_1 = require("./courseSyllabusUtil");
26
26
  const mapProgramSyllabus_1 = require("../mapProgramSyllabus");
27
+ const attributVardenConstants_1 = require("../attributVardenConstants");
27
28
  const SEMESTER_FOR_START_READING_STRUCTURES = {
28
29
  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
29
30
  year: 2025,
@@ -33,7 +34,6 @@ const SEMESTER_FOR_END_READING_SYLLABUSES = {
33
34
  code: 'VT2025',
34
35
  date: '2025-06-02',
35
36
  }; // Based on the follwoing document: https://confluence.sys.kth.se/confluence/pages/viewpage.action?pageId=262933569
36
- const ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE = 'utbildning.attribut.organisation,utbildningstyp,utbildning.attribut.lokalmarkning,status,installt,utbildning.attribut.utbildningstillfalleskod';
37
37
  const filterAndMapProgramTillfalle = (response, language) => {
38
38
  if (response.type === 'error') {
39
39
  throw new Error(`API error: ${response.responseInfo.message}`);
@@ -159,7 +159,7 @@ const findProgramVersion = (programCode, semester, language, ladokClient) => __a
159
159
  kodEllerBenamning: programCode,
160
160
  striktKod: 'true',
161
161
  // typ: 'program', TODO: we should un-comment this when the issue in prod is fixed
162
- instansAttributVarden: 'utbildning.attribut.organisation,utbildningstyp,utbildning.attribut.giltig.from,utbildning.attribut.tilltradesniva,utbildning.lokalt.attribut.29.sista.antagningstermin.en,utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.kod',
162
+ instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_PROGRAM_VERSION,
163
163
  };
164
164
  const response = yield ladokClient.sokUtbildningsInstansSlim(requestObject);
165
165
  const periods = yield ladokClient.period(); // TODO: Use cached values
@@ -179,8 +179,8 @@ const findProgramInstance = (programCode, semester, language, ladokClient) => __
179
179
  startPeriod: semester,
180
180
  striktKod: 'true',
181
181
  baraSistaVersion: 'false',
182
- attributVarden: ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
183
- instansAttributVarden: 'utbildning.attribut.tilltradesniva,utbildning.attribut.svensk.benamning,utbildning.attribut.engelsk.benamning,utbildning.attribut.kod',
182
+ attributVarden: attributVardenConstants_1.ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
183
+ instansAttributVarden: attributVardenConstants_1.INSTANS_ATTRIBUT_VARDEN_FOR_ACTIVE_PROGRAM_INSTANCE,
184
184
  };
185
185
  const response = yield ladokClient.sokProgramTillfalleSlim(requestObject);
186
186
  const programTillfalleList = (0, exports.filterAndMapProgramTillfalle)(response, language);
@@ -218,6 +218,7 @@ const findProgramSyllabusForSemester = (programCode, semester, language, ladokCl
218
218
  striktKod: 'true',
219
219
  tillstand: 'BESLUTAD',
220
220
  attributVarden: 'utbildning.lokalt.attribut.29.utgava',
221
+ instansAttributVarden: 'versionsnummer',
221
222
  giltigTill: smesterPeriodData === null || smesterPeriodData === void 0 ? void 0 : smesterPeriodData.TomDatum,
222
223
  giltigFran: smesterPeriodData === null || smesterPeriodData === void 0 ? void 0 : smesterPeriodData.FromDatum,
223
224
  antalTraffar: '100',
@@ -256,7 +257,7 @@ function enrichCurriculumsInformationDataWithSyllabusData(curriculums, syllabusD
256
257
  const specCode = (_a = curriculum.programmeSpecialization) === null || _a === void 0 ? void 0 : _a.programmeSpecializationCode;
257
258
  const dataSource = isSpecialization ? specializationDataMap.get(specCode) : syllabusData;
258
259
  if (isSpecialization)
259
- curriculum.programmeSpecialization.description = dataSource.beskrivning;
260
+ curriculum.programmeSpecialization.description = dataSource === null || dataSource === void 0 ? void 0 : dataSource.beskrivning;
260
261
  const enrichedStudyYears = curriculum.studyYears.map(studyYear => {
261
262
  const year = studyYear.yearNumber;
262
263
  return Object.assign(Object.assign({}, studyYear), { supplementaryInfo: (dataSource === null || dataSource === void 0 ? void 0 : dataSource[`arskursinformationAr${year}`]) || undefined, conditionallyElectiveCoursesInfo: (dataSource === null || dataSource === void 0 ? void 0 : dataSource[`infoVvkurserAr${year}`]) || undefined });