full CRUD functionality complete

Author: Jason

README.md

@@ -47,7 +47,7 @@ Data stored in MongoDB using Mongoose.
 | Task     | Status |
 | -------- | ------ |
 | Client side interface | 100%
-| Node CRUD API | 80%
+| Node CRUD API | 100%
 | Pi Connection to Arduino | 0%
 | Arduino Program | 0%
 | Circuit prototype | 0%

client/src/app/app.service.ts

@@ -36,13 +36,13 @@ export class AppService {
   }
 
   /**
-   * Update gardens
-   * @param {Array<Garden>} gardens
-   * @returns {Array<Garden>} the saved gardens in the database.
+   * Update garden
+   * @param {Garden} garden
+   * @returns {number} Amount of gardens updated
    */
-  putGardens(gardens: Array<Garden>): Observable<Array<Garden>> {
+  putGarden(garden: Garden): Observable<number> {
     return this.http
-      .put('/api/gardens', { gardens })
+      .put('/api/gardens', { garden })
       .map(extractData)
       .catch(handleError);
   }

client/src/app/pages/home/home.component.html

@@ -123,7 +123,7 @@ <h4 class="card-title d-flex align-items-center">
                     <span [textContent]="garden.light?.toFixed(2)" [hidden]="edit"></span>
                     <input type="number" class="form-control form-control-sm" [(ngModel)]="garden.light" [hidden]="!edit" />
                   </td>
-                  <td class="text-right" [hidden]="!edit"><i class="fa fa-times danger hand" (click)="deleteGardens([garden._id])"></i></td>
+                  <td class="text-right" [hidden]="!edit"><i class="fa fa-times danger hand" (click)="tempDeleteGarden(garden._id)"></i></td>
                 </tr>
               </tbody>
             </table>
@@ -132,8 +132,8 @@ <h4 class="card-title d-flex align-items-center">
           <div class="d-flex">
             <div class="ml-auto">
               <button class="btn btn-success hand" (click)="newGarden()">New</button>
-              <button class="btn btn-primary hand" [hidden]="!edit" (click)="edit = !edit; putGardens()">Save</button>
-              <button class="btn btn-secondary hand" [hidden]="!edit" (click)="edit = !edit; getGardens()">Cancel</button>
+              <button class="btn btn-primary hand" [hidden]="!edit" (click)="edit = !edit; saveGardens()">Save</button>
+              <button class="btn btn-secondary hand" [hidden]="!edit" (click)="edit = !edit; getGardens(); resetGardensToDelete()">Cancel</button>
               <button *ngIf="gardens?.length > 0" class="btn btn-primary hand" (click)="edit = !edit" [hidden]="edit">Edit <i class="fa fa-edit"></i></button>
             </div>
           </div>

client/src/app/pages/home/home.component.ts

@@ -26,6 +26,7 @@ export class HomePageComponent implements OnInit {
   loading = false;
   gardens: Array<Garden>;
   params: Params;
+  gardensToDelete: Array<string> = [];
 
   constructor(
     public appService: AppService,
@@ -36,8 +37,7 @@ export class HomePageComponent implements OnInit {
     this.route.queryParams
       .mergeMap((params: Params) => {
         this.params = params;
-        const date = moment(params.date).toDate().toISOString();
-        return this.getGardens$(date);
+        return this.getGardens$(params.date || new Date().toISOString());
       })
       .subscribe(gardens => {
         console.log(gardens)
@@ -53,26 +53,35 @@ export class HomePageComponent implements OnInit {
       .first()
   }
 
-  putGardens(gardens = this.gardens): void {
+  /**
+   * Update a garden
+   * @param {Garden} garden The garden to update
+   */
+  putGarden(garden: Garden): void {
     this.loading = true;
     this.appService
-      .putGardens(this.gardens)
+      .putGarden(garden)
       .first()
-      .subscribe(gardens => {
-        console.log(gardens);
+      .subscribe(modifedCount => {
         this.loading = false;
-        this.gardens = gardens;
       });
   }
 
+  /**
+   * Get gardens
+   */
   getGardens(): void {
-    this.getGardens$(this.params.date)
+    this.getGardens$(this.params.date || new Date().toISOString())
       .subscribe(gardens => {
         this.loading = false;
         this.gardens = gardens;
       });
   }
 
+  /**
+   * Delete gardens
+   * @param {Array<string>} ids The array of ids to delete
+   */
   deleteGardens(ids: Array<string>): void {
     this.loading = true;
     this.appService
@@ -87,6 +96,10 @@ export class HomePageComponent implements OnInit {
       });
   }
 
+  /**
+   * Insert new gardens
+   * @param {Array<Garden>} gardens The array of Garden objects to insert
+   */
   postGardens(gardens: Array<Garden>): void {
     this.loading = true;
     this.appService
@@ -104,7 +117,36 @@ export class HomePageComponent implements OnInit {
 
   newGarden(): void {
     const garden = new Garden();
-    garden.date = moment(this.params.date || new Date()).toDate().toISOString();
+
+    if (this.params.date) {
+      const now = new Date();
+      const date = moment(this.params.date)
+        .hours(now.getHours())
+        .minutes(now.getMinutes())
+        .seconds(now.getSeconds())
+        .milliseconds(now.getMilliseconds());
+      garden.date = date.toISOString();
+    } else {
+      garden.date = new Date().toISOString();
+    }
     this.postGardens([garden]);
   }
+
+  saveGardens(): void {
+    if (this.gardensToDelete.length > 0) {
+      this.deleteGardens(this.gardensToDelete);
+      this.resetGardensToDelete();
+    }
+    this.gardens.forEach(garden => this.putGarden(garden));
+  }
+
+  // Remove garden from local array.
+  tempDeleteGarden(id: string): void {
+    this.gardensToDelete.push(id);
+    this.gardens = this.gardens.filter(g => g._id !== id);
+  }
+
+  resetGardensToDelete(): void {
+    this.gardensToDelete = [];
+  }
 }

client/src/app/pages/settings/settings.component.html

@@ -3,36 +3,7 @@
 		<div class="col-lg-12" [style.marginTop]="'1em'">
 			<h2>Settings</h2>
 
-			<div class="col-lg-4 col-md-6 col-sm-12">
-				<form [formGroup]="manualForm" novalidate (ngSubmit)="submitManualForm()">
-					<div class="form-group row">
-						<label class="col-3 col-form-label">Temperature</label>
-						<div class="col-9">
-							<input class="form-control" type="number" placeholder="0" formControlName="temperature">
-						</div>
-					</div>
-					<div class="form-group row">
-						<label class="col-3 col-form-label">Moisture</label>
-						<div class="col-9">
-							<input class="form-control" type="number" placeholder="0" formControlName="moisture">
-						</div>
-					</div>
-					<div class="form-group row">
-						<label class="col-3 col-form-label">Humidity</label>
-						<div class="col-9">
-							<input class="form-control" type="number" placeholder="0" formControlName="humidity">
-						</div>
-					</div>
-					<div class="form-group row">
-						<label class="col-3 col-form-label">Light Level</label>
-						<div class="col-9">
-							<input class="form-control" type="number" placeholder="0" formControlName="light">
-						</div>
-					</div>
-
-					<button class="btn btn-danger" type="submit">Insert Manual Data</button>
-				</form>
-			</div>
+      There are no settings here yet. Come back soon
 
 		</div>
 	</div>

logs/logs.txt

@@ -1 +1 @@
-All logs will be written to here.
+All logs will be written to this folder.

server.js

@@ -8,8 +8,10 @@ const moment = require('moment');
 const ObjectId = mongoose.Types.ObjectId;
 //const Garden = require('./models/garden');
 
-const today = moment().format('YYYYMMDD')
-winston.add(winston.transports.File, { filename: `./logs/${today}.log` });
+winston.add(winston.transports.File, {
+  filename: `./logs/${moment().format('YYYYMMDDHHmmSS')}.log`
+});
+
 const DB_CONNECTION = 'mongodb://localhost/garden_db';
 let Garden;
 
@@ -71,14 +73,20 @@ router
         {
           type: 'POST',
           route: `${BASE}/api/gardens`,
-          params: `garden`,
-          returns: '{Array<Garden>} An array of garden objects modified/inserted'
+          params: `{Array<Garden>} gardens`,
+          returns: '{Array<Garden>} An array of garden objects inserted'
+        },
+        {
+          type: 'PUT',
+          route: `${BASE}/api/gardens`,
+          params: `{Garden} garden`,
+          returns: '{number} Number of gardens updated'
         },
         {
           type: 'DELETE',
           route: `${BASE}/api/gardens`,
-          params: `id`,
-          returns: '{number} Documents deleted'
+          params: `{Array<string>} ids`,
+          returns: '{number} Number of gardens removed'
         }
       ]
     });
@@ -92,6 +100,25 @@ router.route('/gardens')
    * @return {Array<Garden>}
    */
   .get((req, res) => {
+
+    // If no date, return all gardens
+    if (!req.query.date) {
+      db.gardens
+        .find({})
+        .toArray()
+        .then(val => {
+          winston.info(`Found ${val.length} garden(s)`);
+          res.json(val)
+        })
+        .catch(err => {
+          winston.error(err);
+          res.json(err);
+        })
+      
+      return;
+    }
+
+    // Filter by request date
     const date = moment(req.query.date);
     const day = date.date();
     const month = date.month();
@@ -104,7 +131,7 @@ router.route('/gardens')
       .toArray()
       .then(val => {
         winston.info(`Found ${val.length} garden(s)`);
-        res.json(val) 
+        res.json(val)
       })
       .catch(err => {
         winston.error(err);
@@ -137,29 +164,29 @@ router.route('/gardens')
   })
 
   /**
-   * Update gardens
-   * @param {Array<Garden>} gardens
-   * @return {Array<Garden>}
+   * Update garden
+   * @param {Garden} garden
+   * @return {number} Modifeid count
    */
   .put((req, res) => {
-    const gardens = req.body.gardens.map(g => {
-      const garden = new Garden();
-      garden.date = g.date;
-      return garden;
-    });
+    const { garden } = req.body;
+    const { temperature, moisture, humidity, light } = garden;
 
     db.gardens
-      .updateMany(gardens, gardens)
+      .updateOne({ _id: ObjectId(garden._id) }, { $set: {
+        temperature,
+        moisture,
+        humidity,
+        light
+      }})
       .then(val => {
         winston.info(`Updated ${val.modifiedCount} garden(s)`);
-        res.json(val.ops)
+        res.json(val.modifiedCount)
       })
       .catch(err => {
         winston.error(err);
         res.json(err);
       });
-
-    res.json(gardens);
   })
 
   /**