@studyportals/fawkes 9.0.1-4 → 9.0.1-6

package/dist/src/presenters/AreaPresenter.js

@@ -1,5 +1,6 @@
 import { areasAll } from '@studyportals/static-domain-data/areas/areas';
 import { areaGetPath } from '@studyportals/static-domain-data/areas/area-get-path';
+import { countryGetIdFromIsoCode } from '@studyportals/static-domain-data/countries/country-get-id-from-iso-code';
 import { FilterKey } from '@studyportals/search-filters/server-side';
 export class AreaPresenter {
     filterKey = FilterKey.AREA;
@@ -18,13 +19,14 @@ export class AreaPresenter {
         const areas = [];
         areasAll.forEach((area) => {
             const path = areaGetPath(area.id);
+            const countryId = countryGetIdFromIsoCode(area.countryIso);
             if (path === null) {
                 return;
             }
             areas.push({
                 id: area.id,
                 path,
-                countryId: area.countryId
+                countryId: countryId || ""
             });
         });
         return areas;
@@ -33,6 +35,6 @@ export class AreaPresenter {
         return this.fragments;
     }
     isPartOfGivenCountries(areaId, countries) {
-        return areasAll.some(a => a.id === areaId && countries.includes(a.countryId));
+        return areasAll.some(a => a.id === areaId && countries.includes(a.countryIso));
     }
 }

package/dist/src/presenters/CityPresenter.js

@@ -2,6 +2,7 @@ import { FilterKey } from '@studyportals/search-filters/server-side';
 import { countriesExtendedAll } from '@studyportals/static-domain-data/countries/countries-extended';
 import { countryGetIsoCodePath } from '@studyportals/static-domain-data/countries/country-get-iso-path';
 import { areaGetPath } from '@studyportals/static-domain-data/areas/area-get-path';
+import { countryGetIdFromIsoCode } from '@studyportals/static-domain-data/countries/country-get-id-from-iso-code';
 export class CityPresenter {
     filterKey = FilterKey.CITY;
     searchApiClient;
@@ -44,11 +45,12 @@ export class CityPresenter {
         const useAreaPath = areaPath && areaPath.trim() !== '';
         // AreaPath do also includes country, for that reason, we do not need to add countryPath if area exists
         const cityPath = `${useAreaPath ? areaPath : countryPath}/${city.virtualPath}`;
+        const countryId = countryGetIdFromIsoCode(country?.iso || "") || "";
         return {
             id: city.id.toString(),
             path: cityPath,
             areaId: useAreaPath ? city.areaId?.toString() : null,
-            countryId: country ? country.id.toString() : '',
+            countryId,
         };
     }
 }

package/dist/src/presenters/CountryPresenter.js

@@ -1,5 +1,6 @@
 import { countriesExtendedAll } from '@studyportals/static-domain-data/countries/countries-extended';
 import { countryGetIsoCodePath } from '@studyportals/static-domain-data/countries/country-get-iso-path';
+import { countryGetIdFromIsoCode } from '@studyportals/static-domain-data/countries/country-get-id-from-iso-code';
 import { FilterKey } from '@studyportals/search-filters/server-side';
 export class CountryPresenter {
     filterKey = FilterKey.COUNTRY;
@@ -20,16 +21,19 @@ export class CountryPresenter {
             if (!country.iso) {
                 return;
             }
+            const countryId = countryGetIdFromIsoCode(country.iso);
             const path = countryGetIsoCodePath(country.iso);
             if (path === null) {
                 return;
             }
             countries.push({
-                id: country.id,
+                id: countryId || "",
                 iso: country.iso,
                 path
             });
         });
+        //eslint-disable-next-line no-console
+        console.log('generated country fragments', countries);
         return countries;
     }
     getFragments() {

package/dist/src/scholarships/rules/OnlyCountriesDisciplineCountryRule.js

@@ -16,7 +16,7 @@ export class OnlyCountriesDisciplineCountryRule {
         const allowedCountryIds = this.getAllowedCountryIds();
         //eslint-disable-next-line no-console
         console.log('allowed country ids', Array.from(allowedCountryIds));
-        return Promise.resolve(allowedCountryIds.has(selectedCountry));
+        return Promise.resolve(allowedCountryIds.includes(selectedCountry));
     }
     forSitemapGenerator(filterKeyValues) {
         const selectedCountries = filterKeyValues.get(FilterKey.COUNTRY);
@@ -27,13 +27,13 @@ export class OnlyCountriesDisciplineCountryRule {
         if (!selectedCountry) {
             return Promise.resolve(false);
         }
-        return Promise.resolve(this.getAllowedCountryIds().has(selectedCountry));
+        return Promise.resolve(this.getAllowedCountryIds().includes(selectedCountry));
     }
     getAllowedCountryIds() {
-        return new Set(CountryPresenter.getInstance()
+        return Array.from(new Set(CountryPresenter.getInstance()
             .getFragments()
             .filter((country) => this.allowedCountryIsos.includes(country.iso))
-            .map((country) => country.id));
+            .map((country) => country.id)));
     }
     getDescription() {
         return 'Country is one of the allowed countries for discipline and country pages';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "9.0.1-4",
+	"version": "9.0.1-6",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"
@@ -94,7 +94,7 @@
 		"@studyportals/ranking-api-interface": "^2.4.0",
 		"@studyportals/search-api-interface": "5.9.3-0",
 		"@studyportals/search-filters": "^6.3.1",
-		"@studyportals/static-domain-data": "^6.1.0"
+		"@studyportals/static-domain-data": "^7.2.0"
 	},
 	"optionalDependencies": {
 		"@rollup/rollup-linux-x64-gnu": "4.24.0"