vtb-appit 0.0.60 → 0.0.62

package/appit.js

@@ -137,6 +137,7 @@ class Appit {
 
     async places()
     {
+        let placesHistory = {};
         const places = this.transformer.places();
         if(places && places.length) {
             for(let i = 0; i < places.length; i++) {
@@ -152,14 +153,26 @@ class Appit {
                 let id = this.findId('places', places[i].object_id);
                 if(!id) {
                     let model = await this.createPlace({...place, ...images, excursion_id: this.history.excursionId});
-                    this.history.places[places[i].object_id] = model.data.id;
+                    placesHistory[places[i].object_id] = model.data.id;
                 } else {
-                    await this.updatePlace(id, {...place, ...images, excursion_id: this.history.excursionId});
+                    let model = await this.updatePlace(id, {...place, ...images, excursion_id: this.history.excursionId});
+                    placesHistory[places[i].object_id] = model.data.id;
                 }
             }
         }
+        console.log(Object.values(this.history.places));
+        console.log(Object.values(placesHistory));
+        let nonExisting = this.difference(Object.values(this.history.places), Object.values(placesHistory));
+        console.log(nonExisting);
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deletePlace(nonExisting[i]);
+        }
+
+        this.history.places = placesHistory;
     }
 
+   
+
     async findOrCreateCategory(title)
     {
         let category_id = null;
@@ -219,6 +232,7 @@ class Appit {
 
     async organizations()
     {
+        let organizationsHistory = {};
         const organizations = this.transformer.organizations();
         if(organizations) {
             for(let i = 0; i < organizations.length; i++) {
@@ -226,12 +240,20 @@ class Appit {
                 let id = this.findId('organizations', organizations[i].object_id);
                 if(!id) {
                     let model = await this.createOrganization(organizations[i]);
-                    this.history.organizations[organizations[i].object_id] = model.data.id;
+                    organizationsHistory[organizations[i].object_id] = model.data.id;
                 } else {
-                    await this.updateOrganization(id, organizations[i]);
+                    let model = await this.updateOrganization(id, organizations[i]);
+                    organizationsHistory[organizations[i].object_id] = model.data.id;
                 }
             }
         }
+
+        let nonExisting = this.difference(Object.values(this.history.organizations), Object.values(organizationsHistory));
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deleteOrganization(nonExisting[i]);
+        }
+
+        this.history.organizations = organizationsHistory;
     }
 
     async notifications()
@@ -256,6 +278,7 @@ class Appit {
 
     async members()
     {
+        let memberHistory = {};
         const participants = this.transformer.participants();
         if(participants && participants.length) {
             for(let i = 0; i < participants.length; i++) {
@@ -264,34 +287,57 @@ class Appit {
                 let id = this.findId('members', participants[i].id);
                 if(!id) {
                     let model = await this.createMember({...participant, excursion_id: this.history.excursionId});
-                    this.history.members[participants[i].id] = model.data.id;
+                    memberHistory[participants[i].id] = model.data.id;
                 } else {
-                    await this.updateMember(id, {...participant, excursion_id: this.history.excursionId});
+                    let model = await this.updateMember(id, {...participant, excursion_id: this.history.excursionId});
+                    memberHistory[participants[i].id] = model.data.id;
                 }
             }
         }
+
+        let nonExisting = this.difference(Object.values(this.history.members), Object.values(memberHistory));
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deleteMember(nonExisting[i]);
+        }
+
+        this.history.members = memberHistory;
     }
 
     async travelInfo()
     {
+        let travelInfoHistory = {};
         const travelInfo = this.transformer.travelInfo();
         if(travelInfo && travelInfo.length) {
             for(let i = 0; i < travelInfo.length; i++) {
                 let info = this.clean(JSON.parse(JSON.stringify(travelInfo[i])));
 
                 let id = this.findId('travels', travelInfo[i].object_id);
+                
+                if(info.category_id && typeof info.category_id === 'string') {
+                    info.category_id = await this.findOrCreateCategory(info.category_id);
+                }
+
                 if(!id) {
                     let model = await this.createTravel({...info, excursion_id: this.history.excursionId});
-                    this.history.travels[travelInfo[i].object_id] = model.data.id;
+                    travelInfoHistory[travelInfo[i].object_id] = model.data.id;
                 } else {
-                    await this.updateTravel(id, {...info, excursion_id: this.history.excursionId});
+                    let model = await this.updateTravel(id, {...info, excursion_id: this.history.excursionId});
+                    travelInfoHistory[travelInfo[i].object_id] = model.data.id;
                 }
             }
         }
+
+        let nonExisting = this.difference(Object.values(this.history.travels), Object.values(travelInfoHistory));
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deleteTravel(nonExisting[i]);
+        }
+
+        this.history.travels = travelInfoHistory;
     }
 
     async accommodations()
     {
+        let accommodationHistory = {};
         const accommodations = this.transformer.accommodations();
         if(accommodations && accommodations.length) {
             for(let i = 0; i < accommodations.length; i++) {
@@ -304,16 +350,25 @@ class Appit {
                 let id = this.findId('accommodations', accommodations[i].object_id);
                 if(!id) {
                     let model = await this.createAccommodation({...accommodation, ...images, labels: labels, excursion_id: this.history.excursionId});
-                    this.history.accommodations[accommodations[i].object_id] = model.data.id;
+                    accommodationHistory[accommodations[i].object_id] = model.data.id;
                 } else {
-                    await this.updateAccommodation(id, {...accommodation, ...images, labels: labels, excursion_id: this.history.excursionId});
+                    let model = await this.updateAccommodation(id, {...accommodation, ...images, labels: labels, excursion_id: this.history.excursionId});
+                    accommodationHistory[accommodations[i].object_id] = model.data.id;
                 }
             }
         }
+
+        let nonExisting = this.difference(Object.values(this.history.accommodations), Object.values(accommodationHistory));
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deleteAccommodation(nonExisting[i]);
+        }
+
+        this.history.accommodations = accommodationHistory;
     }
 
     async destinations()
     {
+        let destinationHistory = {};
         const destinations = await this.transformer.destinations();
         if(destinations && destinations.length) {
             for(let i = 0; i < destinations.length; i++) {
@@ -326,16 +381,25 @@ class Appit {
                 let id = this.findId('destinations', destinations[i].object_id);
                 if(!id) {
                     let model = await this.createDestination({...destination, ...images, labels: labels, excursion_id: this.history.excursionId});
-                    this.history.destinations[destinations[i].object_id] = model.data.id;
+                    destinationHistory[destinations[i].object_id] = model.data.id;
                 } else {
-                    await this.updateDestination(id, {...destination, ...images, labels: labels, excursion_id: this.history.excursionId});
+                    let model = await this.updateDestination(id, {...destination, ...images, labels: labels, excursion_id: this.history.excursionId});
+                    destinationHistory[destinations[i].object_id] = model.data.id;
                 }
             }
         }
+
+        let nonExisting = this.difference(Object.values(this.history.destinations), Object.values(destinationHistory));
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deleteDestination(nonExisting[i]);
+        }
+
+        this.history.destinations = destinationHistory;
     }
 
     async schemes()
     {
+        const schemeHistory = {};
         const schemes = this.transformer.schemes(this.history);
         if(schemes && schemes.length) {
             for(let i = 0; i < schemes.length; i++) {
@@ -345,16 +409,25 @@ class Appit {
                 let id = this.findId('schemes', schemes[i].object_id);
                 if(!id) {
                     let model = await this.createScheme({...scheme, labels: labels, excursion_id: this.history.excursionId});
-                    this.history.schemes[schemes[i].object_id] = model.data.id;
+                    schemeHistory[schemes[i].object_id] = model.data.id;
                 } else {
-                    await this.updateScheme(id, {...scheme, labels: labels, excursion_id: this.history.excursionId});
+                    let model = await this.updateScheme(id, {...scheme, labels: labels, excursion_id: this.history.excursionId});
+                    schemeHistory[schemes[i].object_id] = model.data.id;
                 }
             }
         }
+
+        let nonExisting = this.difference(Object.values(this.history.schemes), Object.values(schemeHistory));
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deleteScheme(nonExisting[i]);
+        }
+
+        this.history.schemes = schemeHistory;
     }
 
     async contacts()
     {
+        let contactHistory = {};
         const contacts = this.transformer.contacts();
         if(contacts && contacts.length) {
             for(let i = 0; i < contacts.length; i++) {
@@ -363,12 +436,20 @@ class Appit {
                 let id = this.findId('contacts', contacts[i].object_id);
                 if(!id) {
                     let model = await this.createContact({...contact, excursion_id: this.history.excursionId});
-                    this.history.contacts[contacts[i].object_id] = model.data.id;
+                    contactHistory[contacts[i].object_id] = model.data.id;
                 } else {
-                    await this.updateContact(id, {...contact, excursion_id: this.history.excursionId});
+                    let model = await this.updateContact(id, {...contact, excursion_id: this.history.excursionId});
+                    contactHistory[contacts[i].object_id] = model.data.id;
                 }
             }
         }
+
+        let nonExisting = this.difference(Object.values(this.history.contacts), Object.values(contactHistory));
+        for(let i = 0; i < nonExisting.length; i++) {
+            await this.deleteContact(nonExisting[i]);
+        }
+
+        this.history.contacts = contactHistory;
     }
 
     getLabels(object)
@@ -586,6 +667,16 @@ class Appit {
         return true;
     }
 
+    difference(original, current)
+    {
+        let difference = [];
+        original.forEach(id => {
+            if(current.indexOf(id) === -1)
+                difference.push(id);
+        });
+        return difference;
+    }
+
     async createDestination(data)
     {
         return await this.request('POST', `destinations`, data);
@@ -596,6 +687,11 @@ class Appit {
         return await this.request('PUT', `destinations/${id}`, data);
     }
 
+    async updateDestination(id)
+    {
+        return await this.request('DELETE', `destinations/${id}`);
+    }
+
     async createOrganization(data)
     {
         return await this.request('POST', `organizations`, data);
@@ -606,6 +702,15 @@ class Appit {
         return await this.request('PUT', `organizations/${id}`, data);
     }
 
+    async deleteOrganization(id)
+    {
+        try {
+            return await this.request('DELETE', `organizations/${id}`);    
+        } catch {
+            console.log(`deleteOrganization failed: ${id}`);
+        }
+    }
+
     async createNotification(data)
     {
         return await this.request('POST', `notifications`, data);
@@ -626,6 +731,15 @@ class Appit {
         return await this.request('PUT', `members/${id}`, data);
     }
 
+    async deleteMember(id)
+    {
+        try {
+            return await this.request('DELETE', `members/${id}`);    
+        } catch {
+            console.log(`deleteMember failed: ${id}`);
+        }
+    }
+
     async createExcursion(data)
     {
         return await this.request('POST', `excursions`, data);
@@ -650,6 +764,15 @@ class Appit {
         }
     }
 
+    async deleteTravel(id)
+    {
+        try {
+            return await this.request('DELETE', `travels/${id}`);    
+        } catch {
+            console.log(`deleteTravel failed: ${id}`);
+        }
+    }
+
     async createScheme(data)
     {
         return await this.request('POST', `schemes`, data);
@@ -664,6 +787,15 @@ class Appit {
         }
     }
 
+    async deleteScheme(id)
+    {
+        try {
+            return await this.request('DELETE', `schemes/${id}`);    
+        } catch {
+            console.log(`deleteScheme failed: ${id}`);
+        }
+    }
+
     async createContact(data)
     {
         return await this.request('POST', `contacts`, data);
@@ -678,6 +810,15 @@ class Appit {
         }
     }
 
+    async deleteContact(id)
+    {
+        try {
+            return await this.request('DELETE', `contacts/${id}`);    
+        } catch {
+            console.log(`deleteContact failed: ${id}`);
+        }
+    }
+
     async createAccommodation(data)
     {
         return await this.request('POST', `accommodations`, data);
@@ -692,6 +833,15 @@ class Appit {
         }
     }
 
+    async deleteAccommodation(id)
+    {
+        try {
+            return await this.request('DELETE', `accommodations/${id}`);    
+        } catch {
+            console.log(`deleteAccommodation failed: ${id}`);
+        }
+    }
+
     async createPlace(data)
     {
         return await this.request('POST', `places`, data);
@@ -706,6 +856,15 @@ class Appit {
         }
     }
 
+    async deletePlace(id)
+    {
+        try {
+            return await this.request('DELETE', `places/${id}`);    
+        } catch {
+            console.log(`deletePlace failed: ${id}`);
+        }
+    }
+
     async createFlight(data)
     {
         return await this.request('POST', `flights`, data);

package/package.json

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