@studyportals/fawkes 8.2.4-12 → 8.2.4-13

package/dist/src/organisations/policies/our-picks/CountryAreaCity.js

@@ -20,10 +20,17 @@ export class CountryAreaCity extends OrganisationsSeoIndexabilityPolicy {
             .getInstance(this.dependencies.searchApiClient)
             .getFragments();
         const paths = [];
-        for (const city of cityFragments) {
+        const filteredFragmentsForCountryAreaCity = cityFragments.filter(city => city.areaId !== null && city.areaId !== undefined);
+        console.warn(`Filtered down to ${filteredFragmentsForCountryAreaCity.length} city fragments for CountryAreaCity policy.`);
+        console.warn('Filtered city fragments for CountryAreaCity policy:', JSON.stringify(filteredFragmentsForCountryAreaCity));
+        for (const city of filteredFragmentsForCountryAreaCity) {
+            const areaId = city.areaId?.toString() || '';
+            if (areaId === '') {
+                continue;
+            }
             const filterKeyValues = new Map([
                 [FilterKey.CITY, [city.id]],
-                [FilterKey.AREA, [city.areaId]],
+                [FilterKey.AREA, [areaId]],
                 [FilterKey.COUNTRY, [city.countryId]]
             ]);
             const result = await this.checkRulesForSitemap(filterKeyValues);

package/dist/src/organisations/policies/our-picks/CountryCity.js

@@ -19,7 +19,10 @@ export class CountryCity extends OrganisationsSeoIndexabilityPolicy {
             .getInstance(this.dependencies.searchApiClient)
             .getFragments();
         const paths = [];
-        for (const city of cityFragments) {
+        const filteredFragmentsForCountryCity = cityFragments.filter(city => city.areaId === null || city.areaId === undefined);
+        console.warn(`Filtered down to ${filteredFragmentsForCountryCity.length} city fragments for CountryCity policy.`);
+        console.warn('Filtered city fragments for CountryCity policy:', JSON.stringify(filteredFragmentsForCountryCity));
+        for (const city of filteredFragmentsForCountryCity) {
             const filterKeyValues = new Map([
                 [FilterKey.CITY, [city.id]],
                 [FilterKey.COUNTRY, [city.countryId]]

package/dist/src/presenters/CityPresenter.d.ts

@@ -10,4 +10,5 @@ export declare class CityPresenter {
     static getInstance(searchApiClient: ISearchApiClient): CityPresenter;
     getFragments(): Promise<ICityFragment[]>;
     private fetchCities;
+    private processCity;
 }

package/dist/src/presenters/CityPresenter.js

@@ -28,35 +28,8 @@ export class CityPresenter {
                 console.error('searchApiClient.getCities is not found');
                 throw new Error('searchApiClient.getCities is not found');
             }
-            const data = await this.searchApiClient.getCities();
-            console.warn(`Fetched ${data.length} cities from search API.`);
-            console.warn('cities', JSON.stringify(data));
-            const cityFragments = data.map(city => {
-                const country = countriesExtendedAll.find(item => item.iso?.toLowerCase() === city.countryIsoCode?.toLowerCase());
-                let cityPath = ``;
-                const countryPath = countryGetIsoCodePath(country?.iso || '');
-                if (city.areaId === null || city.areaId === undefined) {
-                    cityPath += `${countryPath}/`;
-                }
-                else {
-                    const area = areaGetPath(city.areaId?.toString() || '');
-                    if (area && area !== '') {
-                        cityPath += `${area}/`;
-                    }
-                    else {
-                        cityPath += `${countryPath}/`;
-                    }
-                }
-                cityPath += `${city.virtualPath}`;
-                return {
-                    id: city.id.toString(),
-                    path: cityPath,
-                    areaId: city.areaId?.toString(),
-                    countryId: country ? country.id.toString() : '',
-                };
-            });
-            console.warn(`Processed ${cityFragments.length} city fragments.`);
-            console.warn('cityFragments', JSON.stringify(cityFragments));
+            const cities = await this.searchApiClient.getCities();
+            const cityFragments = cities.map(city => this.processCity(city));
             return cityFragments;
         }
         catch (error) {
@@ -64,4 +37,18 @@ export class CityPresenter {
             throw error;
         }
     }
+    processCity(city) {
+        const country = countriesExtendedAll.find(item => item.iso?.toLowerCase() === city.countryIsoCode?.toLowerCase());
+        const countryPath = countryGetIsoCodePath(country?.iso || '');
+        const areaPath = city.areaId != null ? areaGetPath(city.areaId.toString()) : '';
+        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}`;
+        return {
+            id: city.id.toString(),
+            path: cityPath,
+            areaId: useAreaPath ? city.areaId?.toString() : null,
+            countryId: country ? country.id.toString() : '',
+        };
+    }
 }

package/dist/src/presenters/fragments/ICityFragment.d.ts

@@ -1,5 +1,5 @@
 import { IFragment } from './IFragment';
 export interface ICityFragment extends IFragment {
-    areaId: string;
+    areaId?: string | null;
     countryId: string;
 }

package/dist/src/sitemap-generator/ICity.d.ts

@@ -0,0 +1,7 @@
+export interface ICity {
+    id: number;
+    name: string;
+    virtualPath: string;
+    areaId: number | null;
+    countryIsoCode: string;
+}

package/dist/src/sitemap-generator/ICity.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "8.2.4-12",
+	"version": "8.2.4-13",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"