revert: "adds equipment assets that have no parents" (#52)

Reverts #51

Forgot to commit the `fd2.sample.tar.gz` compressed database file.

Author: braughtg

src/sampleDB/addEquipment.js

@@ -3,7 +3,7 @@ import * as farmosUtil from "../library/farmosUtil/farmosUtil.js";
 
 import { basename, dirname } from "path";
 import { fileURLToPath } from "url";
-import { LocalStorage } from "node-localstorage";
+import { LocalStorage } from 'node-localstorage';
 
 /*
  * Set the name of the CSV file to be processed and the
@@ -28,7 +28,7 @@ const pass = "admin";
  * Get a local storage object that we'll use to simulate the
  * browser's localStorage and sessionStorage when running in node.
  */
-let ls = new LocalStorage("scratch");
+let ls = new LocalStorage('scratch');
 
 /*
  * Get a fully initialized and logged in instance of the farmOS.js
@@ -61,55 +61,27 @@ let categoryName = null;
  */
 async function processRow(row) {
   if (row[0] != "") {
-    if (row.length == 1) {
-      console.log("  Adding equipment " + row[0] + ", which has no parents...");
-      const equipment = farm.asset.create({
-        type: "asset--equipment",
-        attributes: {
-          name: row[0],
-        },
-      });
-    } else if (row.length == 4) {
-      console.log("  Adding equipment " + row[0] + ", which has no parents...");
-      const equipment = farm.asset.create({
-        type: "asset--equipment",
-        attributes: {
-          name: row[0],
-          manufacturer: row[1],
-          model: row[2],
-          notes: row[3],
-        },
-      });
-    } else {
-      console.log("  Adding " + row[0] + "...");
-      const equipment = farm.asset.create({
-        type: "asset--equipment",
-        attributes: {
-          name: row[0],
-          notes: row[1],
-        },
-      });
-      categoryParentId = equipment.id;
-      categoryParentName = row[0];
-    }
+    console.log("  Adding " + row[0] + "...");
+    const categoryParent = farm.asset.create({
+      type: "asset--equipment",
+      attributes: {
+        name: row[0],
+        notes: row[1],
+      },
+    });
 
     try {
-      const result = await farm.asset.send(equipment);
+      const result = await farm.asset.send(categoryParent);
+      categoryParentId = result.id;
+      categoryParentName = row[0];
     } catch (e) {
       console.log("API error sending " + row[0]);
       console.log(e);
       process.exit(1);
     }
     console.log("  Added.");
-    
   } else if (row[1] != "") {
-    console.log(
-      "  Adding equipment category " +
-        row[1] +
-        " to category " +
-        categoryParentName +
-        "..."
-    );
+    console.log("  Adding equipment category " + row[1] + " to category " + categoryParentName  + "...");
     const category = farm.asset.create({
       type: "asset--equipment",
       attributes: {

src/sampleDB/sampleData/equipment.csv

@@ -1,35 +1,22 @@
 # Sample Data for the equipment assets
 #
-# Each line represents either a category of equipment or 
-# any equipment asset.
-#
 # Format:
 #
-# A left justified line creates an equipment asset with no parent 
-# (e.g. Rake or Shovel) or it creates 'Category' which is the parent 
-# of all categories of equipment
-#
-# A line beginning with a single comma:
-#   Creates an equipment category with its parent being 'Category' that it 
-#   appears under.
-#
-# A line beginning with two commas:
-#   Creates an equipment asset and sets its parent to the equipment 
-#   category that it appears under (i.e. General is the parent of Tractor)
+# Each line represents either a category of equipment or 
+# any equipment asset.
 #
 # Equipment categories have the format:
 #   category name,category description.
 #
-# Equipment assets have the following comma delimited information:
-#   name,manufacturer,model,description
+# Equipment within a category are listed immediately following its category
+# and have the following comma delimited information:
+#   ,name,manufacturer,model,description
 #
 # Anything following a # on a line is a considered a comment.
 # Thus, names and descriptions cannot contain #
 # Blank Lines are ignored.
 
-Rake,Company A,9871,A garden rake.
-Shovel,
-Category,Parent of all categories
+Category, Parent of all categories
 ,General,Equipment used for a variety of operations.
 ,,Tractor,Company G,468,A standard tractor.
 ,,Small Tractor,Company I,987,A compact tractor.