@stamhoofd/models 2.39.0 → 2.40.0

package/src/migrations/1605262045-import-postcodes.ts

@@ -1,36 +1,35 @@
 import { Migration } from '@simonbackx/simple-database';
-import { column,Model } from '@simonbackx/simple-database';
+import { column, Model } from '@simonbackx/simple-database';
 import { StringCompare } from '@stamhoofd/utility';
-import { v4 as uuidv4 } from "uuid";
-import { Country } from "@stamhoofd/structures";
+import { v4 as uuidv4 } from 'uuid';
+import { Country } from '@stamhoofd/structures';
 import { City } from '../models/addresses/City';
 import { PostalCode } from '../models/addresses/PostalCode';
 import { Province } from '../models/addresses/Province';
 
-
 export class Gemeente extends Model {
-    static table = "gemeenten"
+    static table = 'gemeenten';
 
     @column({
-        primary: true, type: "string", beforeSave(value) {
+        primary: true, type: 'string', beforeSave(value) {
             return value ?? uuidv4();
-        }
+        },
     })
     id!: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     postcode: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     gemeente: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     postcode_hoofdgemeente: string; // not relevant anymore
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     hoofdgemeente: string;
 
-    @column({ type: "string" })
+    @column({ type: 'string' })
     provincie: string;
 
     /// Tmp mapped
@@ -38,63 +37,63 @@ export class Gemeente extends Model {
 }
 
 async function getProvince(name: string, provinces: Province[]): Promise<Province> {
-    const p = provinces.find(p => StringCompare.typoCount(p.name, name) < 2 && p.country == Country.Belgium)
+    const p = provinces.find(p => StringCompare.typoCount(p.name, name) < 2 && p.country == Country.Belgium);
     if (p) {
-        return p
+        return p;
     }
-    const province = new Province()
-    province.country = Country.Belgium
-    province.name = name.trim()
-    await province.save()
-    provinces.push(province)
-    return province
+    const province = new Province();
+    province.country = Country.Belgium;
+    province.name = name.trim();
+    await province.save();
+    provinces.push(province);
+    return province;
 }
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
     // Loop all gemeenten
     const provinces = await Province.all();
     const gemeenten = await Gemeente.all();
-    const cities: City[] = []
+    const cities: City[] = [];
 
     for (const gemeente of gemeenten) {
-        const province = await getProvince(gemeente.provincie, provinces)
-        
+        const province = await getProvince(gemeente.provincie, provinces);
+
         // Some cities have the same name
-        const found = cities.find(c => c.name.trim() == gemeente.gemeente.trim() && c.provinceId == province.id)
+        const found = cities.find(c => c.name.trim() == gemeente.gemeente.trim() && c.provinceId == province.id);
 
         if (!found) {
             // Create the city
-            const city = new City()
-            city.name = gemeente.gemeente.trim()
-            city.country = Country.Belgium
-            city.provinceId = province.id
+            const city = new City();
+            city.name = gemeente.gemeente.trim();
+            city.country = Country.Belgium;
+            city.provinceId = province.id;
 
-            await city.save()
+            await city.save();
 
             // Also add postal code already
-            const postalCode = new PostalCode()
-            postalCode.postalCode = gemeente.postcode
-            postalCode.cityId = city.id
-            postalCode.country = Country.Belgium
+            const postalCode = new PostalCode();
+            postalCode.postalCode = gemeente.postcode;
+            postalCode.cityId = city.id;
+            postalCode.country = Country.Belgium;
             await postalCode.save();
 
-            gemeente.city = city
-            cities.push(city)
-        } else {
+            gemeente.city = city;
+            cities.push(city);
+        }
+        else {
             gemeente.city = found;
 
-             // Also add postal code already
-            const postalCode = new PostalCode()
-            postalCode.postalCode = gemeente.postcode
-            postalCode.cityId = found.id
-            postalCode.country = Country.Belgium
+            // Also add postal code already
+            const postalCode = new PostalCode();
+            postalCode.postalCode = gemeente.postcode;
+            postalCode.cityId = found.id;
+            postalCode.country = Country.Belgium;
             await postalCode.save();
         }
-        
     }
 
     for (const gemeente of gemeenten) {
@@ -102,31 +101,28 @@ export default new Migration(async () => {
             continue;
         }
 
-        const hoofd = cities.find(c => c.name.trim() == gemeente.hoofdgemeente.trim() && c.provinceId == gemeente.city.provinceId)
+        const hoofd = cities.find(c => c.name.trim() == gemeente.hoofdgemeente.trim() && c.provinceId == gemeente.city.provinceId);
         if (!hoofd) {
             // Create the city
-            const city = new City()
-            city.name = gemeente.hoofdgemeente.trim()
-            city.country = Country.Belgium
+            const city = new City();
+            city.name = gemeente.hoofdgemeente.trim();
+            city.country = Country.Belgium;
 
-            const province = await getProvince(gemeente.provincie, provinces)
-            city.provinceId = province.id
-            await city.save()
+            const province = await getProvince(gemeente.provincie, provinces);
+            city.provinceId = province.id;
+            await city.save();
 
-            cities.push(city)
+            cities.push(city);
             // do not create a postal code here, these don't have one
 
-            console.log("Assigning "+gemeente.gemeente+" to "+city.name)
-            gemeente.city.parentCityId = city.id
-            await gemeente.city.save()
-        } else {
-            console.log("Assigning "+gemeente.gemeente+" to "+hoofd.name)
-            gemeente.city.parentCityId = hoofd.id
-            await gemeente.city.save()
+            console.log('Assigning ' + gemeente.gemeente + ' to ' + city.name);
+            gemeente.city.parentCityId = city.id;
+            await gemeente.city.save();
+        }
+        else {
+            console.log('Assigning ' + gemeente.gemeente + ' to ' + hoofd.name);
+            gemeente.city.parentCityId = hoofd.id;
+            await gemeente.city.save();
         }
-
-        
     }
 });
-
-

package/src/migrations/1605262046-import-postcodes-nl.ts

@@ -1,74 +1,74 @@
 import { Migration } from '@simonbackx/simple-database';
 import { Country } from '@stamhoofd/structures';
 import { StringCompare } from '@stamhoofd/utility';
-import fs from "fs";
-import readline from "readline";
+import fs from 'fs';
+import readline from 'readline';
 
 import { City } from '../models/addresses/City';
 import { PostalCode } from '../models/addresses/PostalCode';
 import { Province } from '../models/addresses/Province';
 
 async function getProvince(name: string, provinces: Province[]): Promise<Province> {
-    const p = provinces.find(p => StringCompare.typoCount(p.name, name) == 0 && p.country == Country.Netherlands)
+    const p = provinces.find(p => StringCompare.typoCount(p.name, name) == 0 && p.country == Country.Netherlands);
     if (p) {
-        return p
+        return p;
     }
-    const province = new Province()
-    province.country = Country.Netherlands
-    province.name = name
-    await province.save()
+    const province = new Province();
+    province.country = Country.Netherlands;
+    province.name = name;
+    await province.save();
 
-    provinces.push(province)
-    return province
+    provinces.push(province);
+    return province;
 }
 
 async function getCity(name: string, provinceId: string, cities: City[]): Promise<City> {
-    const p = cities.find(p => StringCompare.typoCount(p.name, name) == 0 && p.country == Country.Netherlands)
+    const p = cities.find(p => StringCompare.typoCount(p.name, name) == 0 && p.country == Country.Netherlands);
     if (p) {
-        return p
+        return p;
     }
-    const city = new City()
-    city.name = name
-    city.country = Country.Netherlands
-    city.provinceId = provinceId
-    await city.save()
-
-    cities.push(city)
-    return city
+    const city = new City();
+    city.name = name;
+    city.country = Country.Netherlands;
+    city.provinceId = provinceId;
+    await city.save();
+
+    cities.push(city);
+    return city;
 }
 
 export default new Migration(async () => {
-    if (STAMHOOFD.environment == "test") {
-        console.log("skipped in tests")
+    if (STAMHOOFD.environment == 'test') {
+        console.log('skipped in tests');
         return;
     }
 
     // We start by looping all provinces in the files
-    const folder = __dirname+"/data/postcodes/nl"
+    const folder = __dirname + '/data/postcodes/nl';
     const provinces = (await fs.promises.readdir(folder, { withFileTypes: true }))
-            .filter((dirent) => !dirent.isDirectory())
-            .map((dirent) => {
-                return { path: folder + "/" + dirent.name, name: dirent.name }
-            });
+        .filter(dirent => !dirent.isDirectory())
+        .map((dirent) => {
+            return { path: folder + '/' + dirent.name, name: dirent.name };
+        });
 
-    const allProvinces = await Province.where({ country: Country.Netherlands})
+    const allProvinces = await Province.where({ country: Country.Netherlands });
 
     for (const p of provinces) {
         console.log(p.name);
 
-        const province = await getProvince(p.name.trim(), allProvinces)
+        const province = await getProvince(p.name.trim(), allProvinces);
 
-        //const cities = await fs.readFile(p.path, { encoding: "utf-8" });
+        // const cities = await fs.readFile(p.path, { encoding: "utf-8" });
 
         const lineReader = readline.createInterface({
-            input: fs.createReadStream(p.path, { encoding: "utf-8" })
+            input: fs.createReadStream(p.path, { encoding: 'utf-8' }),
         });
 
-        const cities: City[] = []
+        const cities: City[] = [];
 
         for await (const line of lineReader) {
-            const splitted = line.split("\t")
-            if (splitted.length != 3) {
+            const splitted = line.split('\t');
+            if (splitted.length !== 3) {
                 console.error(`Failed to parse line: ${line}`);
                 continue;
             }
@@ -79,19 +79,17 @@ export default new Migration(async () => {
             // Check plaats and gemeente
             const city = await getCity(plaats, province.id, cities);
             const city2 = await getCity(gemeente, province.id, cities); // might be the same as city
-            if (city2.id != city.id && city.parentCityId === null) {
-                city.parentCityId = city2.id
-                await city.save()
+            if (city2.id !== city.id && city.parentCityId === null) {
+                city.parentCityId = city2.id;
+                await city.save();
             }
 
             // Also add postal code already
-            const postalCode = new PostalCode()
-            postalCode.postalCode = postcode
-            postalCode.cityId = city.id
-            postalCode.country = Country.Netherlands
+            const postalCode = new PostalCode();
+            postalCode.postalCode = postcode;
+            postalCode.cityId = city.id;
+            postalCode.country = Country.Netherlands;
             await postalCode.save();
         }
     }
 });
-
-