Merge pull request #16 from oslabs-beta/staging

database testing

Author: StephWood

__tests__/dbTests.js

@@ -0,0 +1,52 @@
+// const collectionsController = require("../src/client/controllers/collectionsController");
+// const historyController = require("../src/client/controllers/historyController");
+
+const Dexie = require("dexie");
+
+// https://stackoverflow.com/questions/47934383/indexeddb-testing-with-jest-enzyme-referenceerror-indexeddb-is-not-defined
+Dexie.dependencies.indexedDB = require("fake-indexeddb");
+Dexie.dependencies.IDBKeyRange = require("fake-indexeddb/lib/FDBKeyRange");
+
+const db = new Dexie("test");
+
+db.version(2).stores({
+  history: "id, created_at",
+  collections: "id, created_at, &name",
+});
+
+db.version(1).stores({
+  history: "id, created_at",
+});
+
+// now we have db.history and db.collections
+
+// for setup and teardown tasks that are asynchronous, take care to RETURN the promise
+describe("db test", () => {
+  beforeEach(() => db.history.clear().catch((err) => console.log(err)));
+  afterEach(() => db.history.clear().catch((err) => console.log(err)));
+  describe("history tests", () => {
+    it("can add history with id", async () => {
+      await db.history.put({ id: 8 });
+      const count = await db.history.count();
+      const arr = await db.history.toArray();
+      expect(count).toEqual(1);
+      expect(arr[0].id).toEqual(8);
+    });
+
+    it("will not add history with an empty object", async () => {
+      db.history.put({}).catch((err) => expect(err.name).toEqual("DataError"));
+      const count = await db.history.count();
+      expect(count).toEqual(0);
+    });
+
+    it("will not add history without an id", async () => {
+      await db.history
+        .put({ created_at: Date.now() })
+        .catch((err) => expect(err.name).toEqual("DataError"));
+      const count = await db.history.count();
+      expect(count).toEqual(0);
+    });
+  });
+});
+// describe("collection tests", () => {});
+// });

main.js

@@ -407,6 +407,9 @@ ipcMain.on("import-collection", (event, args) => {
       return;
     }
 
+    // names is the list of existing collection names in state
+    const collectionNames = args.map((obj) => obj.name);
+
     fs.readFile(filepath, "utf-8", (err, data) => {
       if (err) {
         alert("An error ocurred reading the file :", err.message);
@@ -415,6 +418,7 @@ ipcMain.on("import-collection", (event, args) => {
 
       // parse data, will throw error if not parsable
       let parsed;
+      // parsed.name already exists
       try {
         parsed = JSON.parse(data);
       } catch {
@@ -438,6 +442,13 @@ ipcMain.on("import-collection", (event, args) => {
           dialog.showMessageBox(null, options);
           return;
         }
+        // duplicate collection exists already
+        if (collectionNames.includes(parsed.name)) {
+          options.message = "That collection already exists in the app";
+          options.detail = "Please rename file to something else";
+          dialog.showMessageBox(null, options);
+          return;
+        }
       }
 
       // send data to chromium for state update

package-lock.json

@@ -23,7 +23,8 @@
     "email": "swell@getswell.io",
     "url": "http://www.getswell.io"
   },
-  "contributors": [{
+  "contributors": [
+    {
       "name": "Kyle Combs",
       "email": "combskyle@gmail.com",
       "url": "https://github.com/texpatnyc"
@@ -129,7 +130,8 @@
       "createDesktopShortcut": "always"
     },
     "dmg": {
-      "contents": [{
+      "contents": [
+        {
           "x": 130,
           "y": 220
         },
@@ -255,6 +257,7 @@
     "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-react": "^7.20.0",
     "eslint-plugin-react-hooks": "^4.0.4",
+    "fake-indexeddb": "^3.0.2",
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
     "jest": "^24.9.0",

package.json

@@ -1,46 +1,62 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import * as actions from '../../actions/actions';
-import Collection from '../display/Collection.jsx'
-import collectionsController from '../../controllers/collectionsController';
+import React, { Component } from "react";
+import { connect } from "react-redux";
+import * as actions from "../../actions/actions";
+import Collection from "../display/Collection.jsx";
+import collectionsController from "../../controllers/collectionsController";
 
-const mapStateToProps = store => ({
+const mapStateToProps = (store) => ({
   collections: store.business.collections,
 });
 
-const mapDispatchToProps = dispatch => ({
-  deleteFromCollection: (collection) => { dispatch(actions.deleteFromCollection(collection)) },
-  collectionToReqRes: (reqResArray) => { dispatch(actions.collectionToReqRes(reqResArray)) },
+const mapDispatchToProps = (dispatch) => ({
+  deleteFromCollection: (collection) => {
+    dispatch(actions.deleteFromCollection(collection));
+  },
+  collectionToReqRes: (reqResArray) => {
+    dispatch(actions.collectionToReqRes(reqResArray));
+  },
 });
 
 class CollectionsContainer extends Component {
   constructor(props) {
     super(props);
+    this.handleClick = this.handleClick.bind(this);
   }
 
-  render() {
+  handleClick() {
+    // console.log("props ->", this.props.collections);
+    collectionsController.importCollection(this.props.collections);
+  }
 
-    let collectionComponents = this.props.collections.map((collection, idx) => {
-      return <Collection
-        content={collection} key={idx}
-        deleteFromCollection={this.props.deleteFromCollection}
-        collectionToReqRes={this.props.collectionToReqRes}
-      />
-    })
+  render() {
+    const collectionComponents = this.props.collections.map(
+      (collection, idx) => {
+        return (
+          <Collection
+            content={collection}
+            key={idx}
+            deleteFromCollection={this.props.deleteFromCollection}
+            collectionToReqRes={this.props.collectionToReqRes}
+          />
+        );
+      }
+    );
 
     return (
-      <div className={'collections-container'}>
+      <div className="collections-container">
         <h1>Collections</h1>
         <div className="collection-import-container">
-          <button className="import-collections" onClick={collectionsController.importCollection}>Import Collection</button>
+          <button className="import-collections" onClick={this.handleClick}>
+            Import Collection
+          </button>
         </div>
         {collectionComponents}
       </div>
-    )
+    );
   }
 }
 
 export default connect(
   mapStateToProps,
-  mapDispatchToProps,
-)(CollectionsContainer);
+  mapDispatchToProps
+)(CollectionsContainer);

src/client/components/containers/CollectionsContainer.jsx

@@ -1,41 +1,48 @@
-import * as store from '../store';
-import * as actions from '../actions/actions';
-import db from '../db';
-import { ipcRenderer } from 'electron';
-import uuid from 'uuid/v4';
+import { ipcRenderer } from "electron";
+import uuid from "uuid/v4";
+import db from "../db";
+import * as store from "../store";
+import * as actions from "../actions/actions";
 
-ipcRenderer.on('add-collection', (event, args) => {
+ipcRenderer.on("add-collection", (event, args) => {
   collectionsController.addCollectionToIndexedDb(JSON.parse(args.data));
   collectionsController.getCollections();
 });
 
 const collectionsController = {
-
   addCollectionToIndexedDb(collection) {
-    db.collections.put({ ...collection })
-      .catch(err => console.log('Error in addToCollection', err));
+    db.collections
+      .put({ ...collection })
+      .catch((err) => console.log("Error in addToCollection", err));
   },
 
   deleteCollectionFromIndexedDb(id) {
-    db.collections.delete(id)
-      .catch(err => console.log('Error in deleteFromCollection', err));
+    db.collections
+      .delete(id)
+      .catch((err) => console.log("Error in deleteFromCollection", err));
   },
 
   getCollections() {
-    db.table('collections')
+    db.table("collections")
       .toArray()
       .then((collections) => {
-        const collectionsArr = collections.sort((a, b) => b.created_at - a.created_at);
+        const collectionsArr = collections.sort(
+          (a, b) => b.created_at - a.created_at
+        );
         store.default.dispatch(actions.getCollections(collectionsArr));
       })
-      .catch(err => console.log('Error in getCollections', err));
+      .catch((err) => console.log("Error in getCollections", err));
   },
 
   collectionNameExists(obj) {
     const { name } = obj;
-    return new Promise((resolve, reject) => { // resolve and reject are functions!
-      db.collections.where('name').equalsIgnoreCase(name).first(foundCollection => !!foundCollection)
-        .then(found => resolve(found))
+    return new Promise((resolve, reject) => {
+      // resolve and reject are functions!
+      db.collections
+        .where("name")
+        .equalsIgnoreCase(name)
+        .first((foundCollection) => !!foundCollection)
+        .then((found) => resolve(found))
         .catch((error) => {
           console.error(error.stack || error);
           reject(error);
@@ -44,22 +51,25 @@ const collectionsController = {
   },
 
   exportCollection(id) {
-    db.collections.where('id').equals(id).first(foundCollection => {
-      // change name and id of collection to satisfy uniqueness requirements of db
-      foundCollection.name = foundCollection.name + " import";
-      foundCollection.id = uuid();
+    db.collections
+      .where("id")
+      .equals(id)
+      .first((foundCollection) => {
+        // change name and id of collection to satisfy uniqueness requirements of db
+        foundCollection.name += " import";
+        foundCollection.id = uuid();
 
-      ipcRenderer.send('export-collection', {collection: foundCollection});
-    })
-    .catch((error) => {
-      console.error(error.stack || error);
-      reject(error);
-    });
+        ipcRenderer.send("export-collection", { collection: foundCollection });
+      })
+      .catch((error) => {
+        console.error(error.stack || error);
+        reject(error);
+      });
   },
 
-  importCollection() {
-    ipcRenderer.send('import-collection');
+  importCollection(collection) {
+    ipcRenderer.send("import-collection", collection);
   },
 };
 
-export default collectionsController;
+export default collectionsController;