Remove unused code bump to 0.4.0

rodekruis · Oct 14, 2024 · c776062 · c776062
1 parent 411c932
commit c776062
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 103 deletions.
diff --git a/PWA/package-lock.json b/PWA/package-lock.json
diff --git a/PWA/package.json b/PWA/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ReliefBox",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A tool for managing the distribution of relief items during humanitarian emergencies.",
   "main": "index.js",
   "scripts": {

diff --git a/PWA/public/Services/Database.js b/PWA/public/Services/Database.js
@@ -5,13 +5,11 @@ export var ObjectStoreName;
     ObjectStoreName["distribution"] = "Distributions";
     ObjectStoreName["beneficiary"] = "Beneficiaries";
     ObjectStoreName["distributionBeneficiaries"] = "DistributionBeneficiary";
-    ObjectStoreName["activeDistribution"] = "activeDistribution";
 })(ObjectStoreName || (ObjectStoreName = {}));
 const allObjectStoreNames = [
     ObjectStoreName.beneficiary,
     ObjectStoreName.distribution,
     ObjectStoreName.distributionBeneficiaries,
-    ObjectStoreName.activeDistribution,
 ];
 function columnsForObjectStore(objectStore) {
     switch (objectStore) {
@@ -35,13 +33,6 @@ function columnsForObjectStore(objectStore) {
                 { name: "hasBeenMarkedAsReceived", isUnique: false },
                 { name: "dateReceived", isUnique: false }
             ];
-        case ObjectStoreName.activeDistribution:
-            return [
-                { name: "distrib_name", isUnique: false },
-                { name: "distrib_place", isUnique: false },
-                { name: "distrib_date", isUnique: false },
-                { name: "distrib_items", isUnique: false },
-            ];
     }
 }
 export class Database {
@@ -122,21 +113,6 @@ export class Database {
     async addBeneficiary(beneficiary) {
         return this.addElement(ObjectStoreName.beneficiary, beneficiary);
     }
-    async setActiveDistribution(activeDistribution) {
-        return this.addElement(ObjectStoreName.activeDistribution, activeDistribution);
-    }
-    async getActiveDistributions() {
-        return this.getElement(ObjectStoreName.activeDistribution);
-    }
-    async getActiveDistribution() {
-        const distributions = await this.getActiveDistributions();
-        if (distributions.length > 0) {
-            return distributions[distributions.length - 1];
-        }
-        else {
-            throw Error("No active distribution found");
-        }
-    }
     async addBeneficiaryToDistribution(beneficiary, distribution) {
         const existing = await this.readDistributionBeneficiaries();
         existing.forEach((curent) => {

diff --git a/PWA/public/Services/Database.test.js b/PWA/public/Services/Database.test.js
@@ -61,27 +61,4 @@ describe('Database', () => {
         expect(receivedBeneficiaries[0].hasBeenMarkedAsReceived).toEqual(true);
         expect(receivedBeneficiaries[1].hasBeenMarkedAsReceived).toEqual(true);
     });
-    test("When setting an active distribution, they can be retrieved", async () => {
-        const distribution = new Distribution("12", "123", "Arnhem", "Name");
-        try {
-            await sut.setActiveDistribution(distribution);
-            const result = await sut.getActiveDistributions();
-            expect(result[0].distrib_name).toBe(distribution.distrib_name);
-            expect(result.length).toBe(1);
-        }
-        catch (error) {
-            expect(error.message).toBe("Empty");
-        }
-    });
-    test("When setting an active distribution, it can be retrieved", async () => {
-        const distribution = new Distribution("12", "123", "Arnhem", "Name");
-        try {
-            await sut.setActiveDistribution(distribution);
-            const result = await sut.getActiveDistribution();
-            expect(result.distrib_name).toBe(distribution.distrib_name);
-        }
-        catch (error) {
-            expect(error.message).toBe("Empty");
-        }
-    });
 });
diff --git a/PWA/public/index.html b/PWA/public/index.html
@@ -39,7 +39,7 @@
       <!--    <a class="navbar-item">-->
       <img src="images/ReliefBox-horizontal-nobackground.png" width="220" height="30">
       <!--    </a>-->
-      <div class="navbar-item">Alpha 0.3.0</div>
+      <div class="navbar-item">Alpha 0.4.0</div>
       <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
         <span aria-hidden="true"></span>
         <span aria-hidden="true"></span>

diff --git a/PWA/src/Services/Database.test.ts b/PWA/src/Services/Database.test.ts
@@ -1,10 +1,9 @@
-import {describe, test, expect, it} from '@jest/globals'
+import {describe, test, expect } from '@jest/globals'
 import { Database } from "./Database";
 import { Distribution } from '../Models/Distribution';
 import { indexedDB } from "fake-indexeddb"
 import { Beneficiary } from '../Models/Beneficiary';
 import { DistributionBeneficiary } from '../Models/DistributionBeneficiary';
-import { beforeEach } from 'node:test';
 
 describe('Database', () => {
     const sut = new Database(indexedDB)
@@ -99,27 +98,4 @@ describe('Database', () => {
             receivedBeneficiaries[1].hasBeenMarkedAsReceived
         ).toEqual(true)
     })
-
-    test("When setting an active distribution, they can be retrieved", async () => {
-        const distribution = new Distribution("12", "123", "Arnhem", "Name")
-        try {
-            await sut.setActiveDistribution(distribution)
-            const result = await sut.getActiveDistributions()
-            expect(result[0].distrib_name).toBe(distribution.distrib_name)
-            expect(result.length).toBe(1)
-        } catch(error: any) {
-            expect(error.message).toBe("Empty")
-        }
-    })
-
-    test("When setting an active distribution, it can be retrieved", async () => {
-        const distribution = new Distribution("12", "123", "Arnhem", "Name")
-        try {
-            await sut.setActiveDistribution(distribution)
-            const result = await sut.getActiveDistribution()
-            expect(result.distrib_name).toBe(distribution.distrib_name)
-        } catch(error: any) {
-            expect(error.message).toBe("Empty")
-        }
-    })
  });
diff --git a/PWA/src/Services/Database.ts b/PWA/src/Services/Database.ts
@@ -10,13 +10,11 @@ export enum ObjectStoreName {
   distribution = "Distributions",
   beneficiary = "Beneficiaries",
   distributionBeneficiaries = "DistributionBeneficiary",
-  activeDistribution = "activeDistribution",
 }
 const allObjectStoreNames = [
   ObjectStoreName.beneficiary,
   ObjectStoreName.distribution,
   ObjectStoreName.distributionBeneficiaries,
-  ObjectStoreName.activeDistribution,
 ];
 
 type DatabaseColumn = {
@@ -46,13 +44,6 @@ function columnsForObjectStore(objectStore: ObjectStoreName): DatabaseColumn[] {
         { name: "hasBeenMarkedAsReceived", isUnique: false },
         { name: "dateReceived", isUnique: false }
       ];
-    case ObjectStoreName.activeDistribution:
-      return [
-        { name: "distrib_name", isUnique: false },
-        { name: "distrib_place", isUnique: false },
-        { name: "distrib_date", isUnique: false },
-        { name: "distrib_items", isUnique: false },
-      ];
   }
 }
 
@@ -160,23 +151,6 @@ export class Database {
     return this.addElement(ObjectStoreName.beneficiary, beneficiary);
   }
 
-  async setActiveDistribution(activeDistribution: Distribution): Promise<void> {
-    return this.addElement(ObjectStoreName.activeDistribution, activeDistribution);
-  }
-
-  async getActiveDistributions(): Promise<Distribution[]> {
-    return this.getElement(ObjectStoreName.activeDistribution)
-  }
-
-  async getActiveDistribution(): Promise<Distribution> {
-    const distributions = await this.getActiveDistributions()
-    if(distributions.length > 0) {
-      return distributions[distributions.length - 1]
-    } else {
-      throw Error("No active distribution found")
-    }
-  }
-
   async addBeneficiaryToDistribution(
     beneficiary: Beneficiary,
     distribution: Distribution