vtb-appit 0.0.37 → 0.0.40

package/appit-base-transformer.js

@@ -9,7 +9,12 @@ class AppitBaseTransformer {
         const data = JSON.parse(fs.readFileSync(pth.join(__dirname, '../../assets/travelplan.json'), {encoding: 'utf8' }));
         this.travelplan = JSON.parse(JSON.stringify(data));
 
-        this.token = fs.readFileSync(pth.join(__dirname, '../../assets/token.jwt'), {encoding: 'utf8' });
+        try {
+            this.token = fs.readFileSync(pth.join(__dirname, '../../assets/token.jwt'), {encoding: 'utf8' });
+        } catch(e) {
+            this.token = false;
+        }
+        
     }
 
     labels()

package/appit.js

@@ -108,16 +108,15 @@ class Appit {
     {
         const places = this.transformer.places();
         if(places && places.length) {
-            const formattedPlaces = await this.formatPlaces(places);
-            for(let i = 0; i < formattedPlaces.length; i++) {
-                let formattedPlace = this.clean(JSON.parse(JSON.stringify(formattedPlaces[i])));
+            for(let i = 0; i < places.length; i++) {
+                let place = this.clean(JSON.parse(JSON.stringify(places[i])));
 
-                let id = this.findId('places', formattedPlaces[i].object_id);
+                let id = this.findId('places', places[i].object_id);
                 if(!id) {
-                    let model = await this.createPlace({...formattedPlace, excursion_id: this.history.excursionId});
-                    this.history.places[formattedPlaces[i].object_id] = model.data.id;
+                    let model = await this.createPlace({...place, excursion_id: this.history.excursionId});
+                    this.history.places[places[i].object_id] = model.data.id;
                 } else {
-                    await this.updatePlace(id, {...formattedPlace, excursion_id: this.history.excursionId});
+                    await this.updatePlace(id, {...place, excursion_id: this.history.excursionId});
                 }
             }
         }
@@ -207,12 +206,15 @@ class Appit {
                 let destination = this.clean(JSON.parse(JSON.stringify(destinations[i])));
                 let labels = this.getLabels(destinations[i]);
 
+                const images = (destination.images && destination.images.length) ? await this.getImages(destination.images, 'original/lg') : {};
+                delete destination.images;
+
                 let id = this.findId('destinations', destinations[i].object_id);
                 if(!id) {
-                    let model = await this.createDestination({...destination, labels: labels, excursion_id: this.history.excursionId});
+                    let model = await this.createDestination({...destination, ...images, labels: labels, excursion_id: this.history.excursionId});
                     this.history.destinations[destinations[i].object_id] = model.data.id;
                 } else {
-                    await this.updateDestination(id, {...destination, labels: labels, excursion_id: this.history.excursionId});
+                    await this.updateDestination(id, {...destination, ...images, labels: labels, excursion_id: this.history.excursionId});
                 }
             }
         }
@@ -246,32 +248,6 @@ class Appit {
         return [];
     }
 
-    async formatPlaces(places)
-    {
-        let result = [];
-
-        for(let i = 0; i < places.length; i++) {
-            let images = {};
-
-            if(places[i].media.length)
-                images = await this.getImages(places[i].media, 'original/lg');
-
-            result.push({
-                title : places[i].title,
-                content : places[i].additionalText,
-                category_id : places[i].category_id,
-                object_id : (places[i].TSOrderline && places[i].TSOrderline.id) ? places[i].TSOrderline.id : places[i].vtbObjectId,
-                lat: (places[i].maps && places[i].maps.latitude) ? places[i].maps.latitude : null,
-                lng: (places[i].maps && places[i].maps.longitude) ? places[i].maps.longitude : null,
-                address: (places[i].maps && places[i].maps.searchPlace) ? places[i].maps.searchPlace : null,
-                labels: this.getLabels(places[i]),
-                ...images
-            });
-        };
-
-        return result;
-    }
-
     getImages(media, crop)
     {
         const result = {
@@ -285,7 +261,7 @@ class Appit {
         
         return new Promise((resolve, reject) => {
             media.forEach(image => {
-                const regex = (image.url.match(/amazonaws\.com/)) ? /\.com\/(.*?)\/((?:.*?)\/(?:.*?))\//g : /\.(?:nl|com|travel|io)\.?\/((?:.*?)\/(?:.*?))\//g;
+                const regex = (image.url.match(/amazonaws\.com/)) ? /\.com\/(.*?)\/((?:.*?)\/(?:.*?))\//g : /\.(?:nl|com|travel|io|be)\.?\/((?:.*?)\/(?:.*?))\//g;
                 const match = regex.exec(image.url);
     
                 if(match) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vtb-appit",
-    "version": "0.0.37",
+    "version": "0.0.40",
     "description": "",
     "main": "index.js",
     "scripts": {