fixed deletion of plants

Project-Plants-App · Apr 25, 2021 · d788f33 · d788f33
1 parent 8c06e81
commit d788f33
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/src/repositories/ImageRepository.ts b/src/repositories/ImageRepository.ts
@@ -10,12 +10,9 @@ class ImageRepository {
             return uri;
         }
 
-        await FileSystem.makeDirectoryAsync(PLANT_AVATARS_DIRECTORY,{intermediates:true});
+        await FileSystem.makeDirectoryAsync(PLANT_AVATARS_DIRECTORY, {intermediates: true});
 
-        const existingImage = (await FileSystem.readDirectoryAsync(PLANT_AVATARS_DIRECTORY)).find(entry => entry.startsWith(`${id}_`));
-        if (ObjectUtils.isDefined(existingImage)) {
-            await FileSystem.deleteAsync(`${PLANT_AVATARS_DIRECTORY}/${existingImage}`)
-        }
+        await this.deleteImageIfExists(id);
 
         const filename = this.createFilename(id, uri);
         const destinationUri = `${PLANT_AVATARS_DIRECTORY}/${filename}`;
@@ -28,6 +25,14 @@ class ImageRepository {
         return destinationUri;
     }
 
+    async deleteImageIfExists(id: number) {
+        await FileSystem.makeDirectoryAsync(PLANT_AVATARS_DIRECTORY, {intermediates: true});
+        const existingImage = (await FileSystem.readDirectoryAsync(PLANT_AVATARS_DIRECTORY)).find(entry => entry.startsWith(`${id}_`));
+        if (ObjectUtils.isDefined(existingImage)) {
+            await FileSystem.deleteAsync(`${PLANT_AVATARS_DIRECTORY}/${existingImage}`)
+        }
+    }
+
     private createFilename(id: number, uri: string) {
         return `${id}_${new Date().getTime()}.${this.getFileExtension(uri)}`;
     }

diff --git a/src/repositories/PlantRepository.ts b/src/repositories/PlantRepository.ts
@@ -33,12 +33,11 @@ const PLANT_BASE_SELECT_STATEMENT = `select id,
                                             last_time_watered,
                                             last_time_fertilised,
                                             last_time_sprayed
-                                     from plants
-                                     where deleted = false`
+                                     from plants`
 
 const PLANT_SELECT_ALL_STATEMENT = `${PLANT_BASE_SELECT_STATEMENT} order by name`
 
-const PLANT_SELECT_STATEMENT = `${PLANT_BASE_SELECT_STATEMENT} and id = ?`
+const PLANT_SELECT_STATEMENT = `${PLANT_BASE_SELECT_STATEMENT} where id = ?`
 
 const PLANT_UPDATE_STATEMENT = `update plants
                                 set name                 = ?,
@@ -56,8 +55,7 @@ const PLANT_UPDATE_STATEMENT = `update plants
                                     last_time_sprayed    = ?
                                 where id = ?`
 
-const PLANT_DELETE_STATEMENT = `update plants
-                                set deleted = true
+const PLANT_DELETE_STATEMENT = `delete from plants
                                 where id = ?`
 
 class PlantRepository {

diff --git a/src/services/PlantService.ts b/src/services/PlantService.ts
@@ -23,7 +23,8 @@ class PlantService {
     }
 
     async deletePlant(plant: Plant): Promise<void> {
-        return PlantRepository.deletePlant(plant);
+        await PlantRepository.deletePlant(plant);
+        await ImageRepository.deleteImageIfExists(plant.id!);
     }
 
 }

diff --git a/src/services/database/GrowBuddyDatabaseService.ts b/src/services/database/GrowBuddyDatabaseService.ts
@@ -33,7 +33,10 @@ const MIGRATIONS = [
     `alter table plants
         add column planted date`,
     `alter table plants
-        add column amount integer`
+        add column amount integer`,
+    `delete
+     from plants
+     where deleted = true`
 ];
 
 class GrowBuddyDatabaseService {

diff --git a/src/stacks/default/tabs/plants/screens/PlantEditScreen.tsx b/src/stacks/default/tabs/plants/screens/PlantEditScreen.tsx
@@ -109,7 +109,7 @@ export default () => {
     }
 
     const deletePlant = async () => {
-        await PlantService.savePlant(plant);
+        await PlantService.deletePlant(plant);
 
         navigation.dispatch(StackActions.popToTop());
     }