Commit 56a9668

committed

Update code

1 parent 06bfa7c commit 56a9668Copy full SHA for 56a9668

File tree

8 files changed

+104

-973

lines changed

express-app
- db-adapters
- index.js

8 files changed

+104

-973

lines changed

`‎express-app/db-adapters/demo-surveys.js‎`

Lines changed: 0 additions & 636 deletions

This file was deleted.

`‎express-app/db-adapters/in-memory.js‎`

Lines changed: 0 additions & 121 deletions

This file was deleted.

`‎express-app/db-adapters/mongo.js‎`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`const fs = require("fs");`
`2`	`2`	`const { MongoClient, ObjectId } = require('mongodb');`
`3`		`-const NoSQLCRUDAdapter = require("./nosql-crud-adapter");`
	`3`	`+const NoSqlCrudAdapter = require("./nosql-crud-adapter");`
`4`	`4`	`const SurveyStorage = require("./survey-storage");`
`5`	`5`
`6`	`6`	`const readFileSync = filename => fs.readFileSync(filename).toString("utf8");`
`@@ -16,16 +16,15 @@ const dbConfig = {`
`16`	`16`	`};`
`17`	`17`
`18`	`18`	const url = `mongodb://${dbConfig.user}:${dbConfig.password}@${dbConfig.host}:${dbConfig.port}/`;
`19`		`-// console.log(url);`
`20`	`19`	`const client = new MongoClient(url);`
`21`	`20`
`22`		`-function MongoStorage(session) {`
`23`		`- function dbConnectFunction(dbCallback) {`
	`21`	`+function MongoStorage() {`
	`22`	`+ function dbConnectFunction(dbCallback) {`
`24`	`23`	`client.connect()`
`25`	`24`	`.then(() => {`
`26`	`25`	`const db = client.db(dbConfig.database);`
`27`		`- dbCallback(db, function() {`
`28`		`- if(!!process.env.DATABASE_LOG) {`
	`26`	`+ dbCallback(db, ()=> {`
	`27`	`+ if(!!process.env.DATABASE_LOG) {`
`29`	`28`	`console.log(arguments[0]);`
`30`	`29`	`console.log(arguments[1]);`
`31`	`30`	`}`
`@@ -36,7 +35,7 @@ function MongoStorage(session) {`
`36`	`35`	`console.error(JSON.stringify(arguments));`
`37`	`36`	`});`
`38`	`37`	`}`
`39`		`- const dbQueryAdapter = new NoSQLCRUDAdapter(dbConnectFunction, () => new ObjectId().toString());`
	`38`	`+ const dbQueryAdapter = new NoSqlCrudAdapter(dbConnectFunction, () => new ObjectId().toString());`
`40`	`39`	`return new SurveyStorage(dbQueryAdapter);`
`41`	`40`	`}`
`42`	`41`

`‎express-app/db-adapters/nosql-crud-adapter.js‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-function NoSQLCRUDAdapter(dbConnectFunction, getId) {`
`2`		`- function getObjects(collectionName, filter, callback) {`
	`1`	`+function NoSqlCrudAdapter(dbConnectFunction, getId) {`
	`2`	`+ function getObjects(collectionName, filter, callback) {`
`3`	`3`	`filter = filter \|\| [];`
`4`	`4`	`let query = {};`
`5`	`5`	`filter.forEach(fi => query[fi.name] = fi.value);`
`@@ -16,7 +16,7 @@ function NoSQLCRUDAdapter(dbConnectFunction, getId) {`
`16`	`16`	`);`
`17`	`17`	`}`
`18`	`18`
`19`		`- function deleteObject(collectionName, idValue, callback) {`
	`19`	`+ function deleteObject(collectionName, idValue, callback) {`
`20`	`20`	`dbConnectFunction((db, finalizeCallback) => {`
`21`	`21`	`db.collection(collectionName).deleteMany({ id: idValue })`
`22`	`22`	`.then((results) => {`
`@@ -30,7 +30,7 @@ function NoSQLCRUDAdapter(dbConnectFunction, getId) {`
`30`	`30`	`);`
`31`	`31`	`}`
`32`	`32`
`33`		`- function createObject(collectionName, object, callback) {`
	`33`	`+ function createObject(collectionName, object, callback) {`
`34`	`34`	`object.id = object.id \|\| getId();`
`35`	`35`	`dbConnectFunction((db, finalizeCallback) => {`
`36`	`36`	`db.collection(collectionName).insertOne(object)`
`@@ -45,7 +45,7 @@ function NoSQLCRUDAdapter(dbConnectFunction, getId) {`
`45`	`45`	`);`
`46`	`46`	`}`
`47`	`47`
`48`		`- function updateObject(collectionName, object, callback) {`
	`48`	`+ function updateObject(collectionName, object, callback) {`
`49`	`49`	`dbConnectFunction((db, finalizeCallback) => {`
`50`	`50`	`db.collection(collectionName).updateOne({ id: object.id }, { $set: object })`
`51`	`51`	`.then((results) => {`
`@@ -67,4 +67,4 @@ function NoSQLCRUDAdapter(dbConnectFunction, getId) {`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
`70`		`-module.exports = NoSQLCRUDAdapter;`
	`70`	`+module.exports = NoSqlCrudAdapter;`

`‎express-app/db-adapters/postgres.js‎`

Lines changed: 0 additions & 32 deletions

This file was deleted.

`‎express-app/db-adapters/sql-crud-adapter.js‎`

Lines changed: 0 additions & 75 deletions

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 56a9668

File tree

8 files changed

8 files changed

`‎express-app/db-adapters/demo-surveys.js‎`

`‎express-app/db-adapters/in-memory.js‎`

`‎express-app/db-adapters/mongo.js‎`

`‎express-app/db-adapters/nosql-crud-adapter.js‎`

`‎express-app/db-adapters/postgres.js‎`

`‎express-app/db-adapters/sql-crud-adapter.js‎`

0 commit comments