Continued TS conversion of backend

Author: atvanek

server/controllers/projectController.ts

@@ -1,6 +1,9 @@
 import { Projects } from '../models/reactypeModels';
 import { Request, Response, NextFunction } from 'express';
 
+// array of objects, objects inside
+type Projects = {project: {}}[]
+
 interface ProjectController {
   saveProject: (req: Request, res: Response, next: NextFunction) => void;
   getProjects: (req: Request, res: Response, next: NextFunction) => void;
@@ -43,7 +46,7 @@ saveProject: (req, res, next) => {
 // gets all of current user's projects
 getProjects: (req, res, next) => {
   const { userId } = req.body;
-  Projects.find({ userId }, (err, projects) => {
+  Projects.find({ userId }, (err, projects: Projects) => {
     if (err) {
       return next({
         log: `Error in projectController.getProjects: ${err}`,
@@ -62,7 +65,7 @@ getProjects: (req, res, next) => {
 deleteProject: (req, res, next) => {
   // pull project name and userId from req.body
   const { name, userId } = req.body;
-  Projects.findOneAndDelete({ name, userId }, (err, deleted) => {
+  Projects.findOneAndDelete({ name, userId }, null, (err, deleted) => {
     if (err) {
       return next({
         log: `Error in projectController.deleteProject: ${err}`,

server/controllers/userController.ts

@@ -2,6 +2,14 @@
 import { Users } from '../models/reactypeModels';
 import bcrypt from 'bcryptjs';
 import { Request, Response, NextFunction } from 'express';
+import { NativeError } from 'mongoose';
+
+interface newUserError extends NativeError {
+  keyValue: {
+    email: string;
+    username: string;
+  };
+}
 
 type UserController = {
   createUser: (req: Request, res: Response, next: NextFunction) => void;
@@ -53,33 +61,36 @@ const userController: UserController = {
     }
 
     // create user using username and password
-    Users.create({ username, password, email }, (err:any, newUser) => {
-      // handle error of creating a new user
-      if (err) {
-        if (res.locals.signUpType === 'oauth') {
-          return next();
-        }
-        if (err.keyValue.email) {
-          return res.status(400).json('Email Taken');
-        }
-        if (err.keyValue.username && res.locals.signUpType === 'oauth') {
-          res.locals.githubPassword = password;
-          return next();
-        }
-        if (err.keyValue.username) {
-          return res.status(400).json('Username Taken');
-        }
-        return next({
-          log: `Error in userController.createUser: ${err}`,
-          message: {
-            err: 'Error in userController.createUser. Check server logs for details'
+    Users.create(
+      { username, password, email },
+      (err: newUserError, newUser) => {
+        // handle error of creating a new user
+        if (err) {
+          if (res.locals.signUpType === 'oauth') {
+            return next();
           }
-        });
+          if (err.keyValue.email) {
+            return res.status(400).json('Email Taken');
+          }
+          if (err.keyValue.username && res.locals.signUpType === 'oauth') {
+            res.locals.githubPassword = password;
+            return next();
+          }
+          if (err.keyValue.username) {
+            return res.status(400).json('Username Taken');
+          }
+          return next({
+            log: `Error in userController.createUser: ${err}`,
+            message: {
+              err: 'Error in userController.createUser. Check server logs for details'
+            }
+          });
+        }
+        // if no error found when creating a new user, send back user ID in res.locals
+        res.locals.id = newUser.id;
+        return next();
       }
-      // if no error found when creating a new user, send back user ID in res.locals
-      res.locals.id = newUser.id;
-      return next();
-    });
+    );
   },
 
   // verifyUser - Obtain username and password from the request body, locate

server/controllers/userStylesController.ts

@@ -1,19 +1,21 @@
 import fs from 'fs';
 import path from 'path';
+import { Request, Response, NextFunction } from 'express';
 
-const userStylesController = {};
-// Rewrite file
-userStylesController.saveCssFile = (req, res, next) => {
-  const newText = req.body.data;
-  fs.writeFile(
-    path.join(__dirname, '../assets/renderDemo.css'),
-    newText,
-    'utf-8',
-    (err, data) => {
-      if (err) throw err;
-      next();
-    }
-  );
+const userStylesController = {
+  // Rewrite file
+  saveCssFile: (req: Request, res: Response, next: NextFunction) => {
+    const newText = req.body.data;
+    fs.writeFile(
+      path.join(__dirname, '../assets/renderDemo.css'),
+      newText,
+      'utf-8',
+      (err) => {
+        if (err) throw err;
+        next();
+      }
+    );
+  }
 };
 
 export default userStylesController;

server/graphQL/resolvers/mutation.ts

@@ -1,11 +1,9 @@
-// const { ApolloServerErrorCode.BAD_USER_INPUT } = require('apollo-server-express');
-
-import { ApolloServerErrorCode } from '@apollo/server/errors'; // v4 syntax
-
-//now using ApolloServerErrorCode.BAD_USER_INPUT in place of ApolloServerErrorCode.BAD_USER_INPUT
+const { ApolloServerErrorCode } = require('@apollo/server/errors');
 
 import { Projects, Users, Comments } from '../../models/reactypeModels';
 
+import { Document } from 'mongoose';
+
 /*
  * resolvers are functions that handles graphQL requests. This file defines the logic for graphQL mutation requests
  * Link to Apollo Mutations:

server/graphQL/resolvers/query.ts

@@ -1,6 +1,6 @@
 // const { UserInputError } = require('apollo-server-express');//v3 syntax
-
-import { ApolloServerErrorCode } from '@apollo/server/errors'; // v4 syntax
+const { ApolloServerErrorCode } = require('@apollo/server/errors');
+// import { ApolloServerErrorCode } from '@apollo/server/errors'; // v4 syntax
 // const ApolloServerErrorCode = require('@apollo/server/errors')
 //now using ApolloServerErrorCode.BAD_USER_INPUT in place of UserInputError
 

server/models/reactypeModels.ts

@@ -13,6 +13,11 @@ import dotenv from 'dotenv';
 import bcrypt from 'bcryptjs';
 dotenv.config();
 const Schema = mongoose.Schema;
+import { Document } from 'mongoose';
+
+interface UserDocument extends Document {
+  password: string;
+}
 
 const mongoURI = process.env.MONGO_DB;
 const URI =
@@ -44,16 +49,14 @@ const userSchema = new Schema({
 // collection happens (user gets put into database)
 
 // cannot use arrow function here as context of 'this' is important
-userSchema.pre('save', function cb(next) {
+userSchema.pre<UserDocument>('save', function cb(next) {
   // within this context, 'this' refers to the document (new user) about to be saved,
   // in our case, it should have properties username, password, and projects array
   bcrypt.hash(this.password, SALT_WORK_FACTOR, (err, hash) => {
     if (err) {
       return next({
         log: `bcrypt password hashing error: ${err}`,
-        message: {
-          err: 'bcrypt hash error: check server logs for details.'
-        }
+        message: { err: 'bcrypt hash error: check server logs for details.' }
       });
     }
     this.password = hash;

server/server.ts

@@ -146,7 +146,6 @@ const schema = makeExecutableSchema({ typeDefs, resolvers });
 
 // //v4 syntax
 
-
 // await server.start();
 // app.use(
 //   '/graphql',