@futdevpro/fsm-dynamo 1.5.44 → 1.5.45

package/src/_collections/_tools/dynamo-regions.ts

@@ -1,28 +1,36 @@
 
 import * as ISOs from '../_constants/country-codes-ISO-3166.json';
 import * as PhoneCodes from '../_constants/country-phone-codes.json';
-import * as Subdivisions from '../_constants/country-sub-divisions-ISO-3166.json';
+import * as Divisions from '../_constants/country-divisions-ISO-3166-all-list.json';
 import { Region } from '../../_enums/region.enum';
 import { Dynamo_Error } from '../../_models';
 import { CountryPhoneCode } from '../../_models/control-models/country-phone-code';
 import { JSONListify } from './utilities';
 import { CountryISO } from '../../_models/control-models/country-iso';
-import { SubdivisionCollection } from '../../_models/control-models/subdivision-collection';
+import { CountryDivision } from '../../_models/control-models/country-division';
 
 export class Dynamo_Regions {
-
-  static ISOs: CountryISO[] = Dynamo_Regions.getAllCountryISO();
+  /* static divisions: DivisionCollection = Dynamo_Regions.getSubdivisionCollection(); */
+  static divisions: CountryDivision[] = Dynamo_Regions.getAllDivisions();
   static phoneCodes: CountryPhoneCode[] = Dynamo_Regions.getAllPhoneCodes();
-  static subdivisions: SubdivisionCollection = Dynamo_Regions.getSubdivisionCollection();
+  static ISOs: CountryISO[] = Dynamo_Regions.getAllCountryISO();
 
-  private static getAllCountryISO(): CountryISO[] {
-    return JSONListify(ISOs);
+  private static getAllDivisions(): CountryDivision[] {
+    return JSONListify(Divisions);
   }
   private static getAllPhoneCodes(): CountryPhoneCode[] {
     return JSONListify(PhoneCodes);
   }
-  private static getSubdivisionCollection(): SubdivisionCollection {
-    return Subdivisions as SubdivisionCollection;
+ /*  private static getSubdivisionCollection(): DivisionCollection {
+    return Divisions as DivisionCollection;
+  } */
+  private static getAllCountryISO(): CountryISO[] {
+    const result: CountryISO[] = JSONListify(ISOs);
+    result.forEach((iso: CountryISO) => {
+      iso.phoneCode = this.phoneCodes.find((pc: CountryPhoneCode) => pc.iso === iso.iso2)?.code;
+      iso.divisions = this.divisions.filter((d: CountryDivision) => d.iso === iso.iso2);
+    });
+    return 
   }
 
   static iso1ToCountryIso(iso1: string): CountryISO {

package/src/_models/control-models/country-division.ts

@@ -0,0 +1,7 @@
+
+
+export interface CountryDivision {
+  iso: string;
+  code: string;
+  name: string;
+}

package/src/_models/control-models/country-iso.ts

@@ -1,5 +1,6 @@
 import { Region } from '../../_enums/region.enum';
 import { SubRegion } from '../../_enums/sub-region.enum';
+import { CountryDivision } from './country-division';
 
 export interface CountryISO {
   name: string;
@@ -13,4 +14,6 @@ export interface CountryISO {
   subRegionCode: string;
   subdivisionRegion: string;
   subdivisionRegionCode: string;
+  phoneCode?: string;
+  divisions?: CountryDivision[];
 }

package/src/_models/control-models/country-phone-code.ts

@@ -1,7 +1,7 @@
 
 export interface CountryPhoneCode {
+  iso: string;
   country: string;
   code: string;
-  iso: string;
 }
 

package/src/_models/control-models/division-collection.ts

@@ -0,0 +1,10 @@
+
+export interface DivisionCollection {
+  [iso2: string]: {
+    name: string;
+    divisions: {
+      [divisionCode: string]: string
+    }
+  }
+}
+

package/src/_models/index.ts

@@ -14,8 +14,8 @@ export * from './control-models/dynamo-usage-data';
 export * from './control-models/geo-ip-location';
 export * from './control-models/location-coordinates';
 export * from './control-models/random-weight';
-export * from './control-models/subdivision-collection';
-export * from './control-models/subdivision-region-data';
+export * from './control-models/division-collection';
+export * from './control-models/division-region-data';
   // Data models
 export * from './data-models/dynamo-custom-data';
 export * from './data-models/dynamo-metadata';

package/src/_models/control-models/subdivision-collection.ts

@@ -1,10 +0,0 @@
-
-export interface SubdivisionCollection {
-  [iso2: string]: {
-    name: string;
-    divisions: {
-      [subDivisionCode: string]: string
-    }
-  }
-}
-