Create mongo service: Contains all mongo logic and methods

ktchn/src/mongo.ts

@@ -1,13 +1,19 @@
-import { Db, connect, MongoClient, InsertOneWriteOpResult, Collection } from 'mongodb';
-import { Request, Response, NextFunction } from 'express';
+import { Db, connect, MongoClient, InsertOneWriteOpResult, Collection, ObjectID } from 'mongodb';
 
-export default (db: Db) => (col: string) => {
+export interface IDBObject<T extends {}> {
+  _id: ObjectID
+}
+
+export interface IMongoService {
+  insertOne<T>(data: T): Promise<IDBObject<T>>,
+}
+
+export const mongoService = (db: Db) => (col: string) => {
   const collection:Collection = db.collection(col);
 
   return {
-    insertOne: (data: any):Promise<InsertOneWriteOpResult> => {
-      return collection.insertOne(data);
-    }
+    insertOne: <T>(data: T): Promise<IDBObject<T>> => collection.insertOne(data).then(insertOneResult => insertOneResult.ops[0])
   }
 };
 
+export default mongoService;

ktchn/src/recipes/controller.ts

@@ -1,21 +1,22 @@
 import { Request, Response, NextFunction } from 'express'
 import { Recipe } from './model';
+import { IMongoService } from '../mongo';
 
 function isValidRecipe(data: any): data is Recipe {
   return data.name !== undefined;
 }
 
-function validateRecipe({ body }:Request, res:Response, next:NextFunction) {
+const saveRecipe = (db: IMongoService) => ({ body }: Request, res: Response, next: NextFunction): void => {
   if (isValidRecipe(body)) {
-    res.locals = {
-      data: body as Recipe
-    };
-    next();
+    db.insertOne(body).then(DBRecipe => {
+      res.json(DBRecipe);
+      next();
+    })
   } else {
-    next(new Error('Missing recipe information: name'));
+    next(new Error('Missing recipe information'));
   }
 }
 
 export {
-  validateRecipe,
+  saveRecipe,
 }

ktchn/src/recipes/routes.ts

@@ -1,25 +1,27 @@
 import { Request, Response, Router, NextFunction } from "express";
 import Scrape from "./scrape";
 import { Recipe } from './model';
-import { validateRecipe } from './controller';
-import { storeRecipe } from './data';
+import { saveRecipe } from './controller';
 import MongoClient from 'mongodb';
+import { mongoService, IMongoService } from '../mongo';
 
 class RecipeRoutes {
   public router: Router;
+  private RecipeDB: IMongoService;
 
   public constructor(db: MongoClient.Db) {
     this.router = Router();
-    this.init(db);
+    this.RecipeDB = mongoService(db)('recipes');
+    this.init();
   }
 
-  private init(db: MongoClient.Db) {
+  private init() {
     this.router.get("/", (req, res, next) => {
       res.json({
         message: 'hey recipes bb'
       });
     })
-    this.router.post("/", validateRecipe, storeRecipe(db), this.logData)
+    this.router.post("/", saveRecipe(this.RecipeDB))
     this.router.post("/scrape", (req, res, next) => {
        return Scrape(req.body.url).then((x)=>{
          res.json(x)