Merge pull request #58 from CMU-17-356/integration

add integration tests for user and employee

.github/workflows/eslint.yml → .github/workflows/eslint-backend.yml

@@ -1,23 +1,26 @@
 # Run eslint
-name: Run Eslint
+name: Run Eslint in backend
 
 on:
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
 jobs:
-  run-lint:
+  run-lint-backend:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./backend
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-      
+
       - name: Install Node
         uses: actions/setup-node@v1
         with:
           node-version: 16
-        
+
       - name: Install Packages
         run: npm ci
 

.github/workflows/eslint-frontend.yml

@@ -0,0 +1,28 @@
+# Run eslint
+name: Run Eslint in frontend
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  run-lint-frontend:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./frontend
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+
+      - name: Install Packages
+        run: npm ci
+
+      - name: Lint Code Base
+        run: npm run lint

.github/workflows/npm-check.yml

@@ -9,6 +9,9 @@ on:
 jobs:
   run-check:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./backend
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

.github/workflows/tests.yml → .github/workflows/tests-backend.yml

@@ -1,14 +1,17 @@
 # Run all tests
-name: Run Tests
+name: Run Tests on backend
 
 on:
   push:
     branches: [ master ]
   pull_request:
     branches: [ master ]
 jobs:
-  run-tests:
+  run-tests-backend:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./backend
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

.github/workflows/tests-frontend.yml

@@ -0,0 +1,28 @@
+# Run all tests
+name: Run Tests on frontend
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  run-tests-frontend:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./frontend
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16
+
+      - name: Install Packages
+        run: npm ci
+
+      - name: Run all tests
+        run: npm run test

backend/.eslintrc.js

@@ -0,0 +1,24 @@
+module.exports = {
+  'env': {
+    'browser': true,
+    'es2021': true,
+  },
+  'extends': [
+    'google',
+  ],
+  'parser': '@typescript-eslint/parser',
+  'parserOptions': {
+    'ecmaFeatures': {
+      'jsx': true,
+    },
+    'ecmaVersion': 'latest',
+    'sourceType': 'module',
+  },
+  'plugins': [
+    '@typescript-eslint',
+  ],
+  'rules': {
+    'linebreak-style': 0,
+    'object-curly-spacing': ['error', 'always'],
+  },
+};

backend/jest.config.ts

@@ -10,6 +10,5 @@ const config: Config.InitialOptions = {
       'jest-transform-stub',
   },
   testEnvironment: 'node',
-  projects: ['./database', './src'],
 };
 export default config;

backend/package.json

@@ -12,12 +12,6 @@
     "type": "git",
     "url": "git+https://github.com/CMU-17-356/dronuts2022-group2.git"
   },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
   "author": "",
   "license": "MIT",
   "bugs": {
@@ -39,7 +33,7 @@
     "babel-jest": "^27.5.1",
     "eslint": "^8.9.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react": "^7.29.4",
     "jest": "^27.5.1",
     "jest-transform-stub": "^2.0.0",
     "react-test-renderer": "^17.0.2",

backend/src/database/schemas/address_schema.ts

@@ -9,12 +9,12 @@ export interface Address {
 }
 
 const addressSchema = new Schema<Address>({
-  street: {type: String, required: true },
-  city: {type: String },
-  state: {type: String },
-  zip: {type: String },
+  street: { type: String, required: true },
+  city: { type: String },
+  state: { type: String },
+  zip: { type: String },
 });
 
 const AddressModel = mongoose.model<Address>('Address', addressSchema);
 
-export { addressSchema, AddressModel};
+export { addressSchema, AddressModel };

backend/src/database/schemas/donut_schema.ts

@@ -1,17 +1,17 @@
 import mongoose, { Schema } from 'mongoose';
 
 export interface Donut {
-  "name" : string, // Unique doughnut name
-  "price" : number, // Price in donutbucks (or whatever the world uses these days)
-  "description": string, // Longer description of doughnut
-  "imageurl": string, // Path to an image of the donut
+  'name' : string, // Unique doughnut name
+  'price' : number, // Price in donutbucks
+  'description': string, // Longer description of doughnut
+  'imageurl': string, // Path to an image of the donut
 }
 
 const donutSchema = new Schema<Donut>({
   name: { type: String, required: true },
   price: { type: Number, min: 0 },
   description: { type: String },
-  imageurl: {type: String }
+  imageurl: { type: String },
 });
 const DonutModel = mongoose.model<Donut>('Donut', donutSchema);
 

backend/src/database/schemas/drone_schema.ts

@@ -2,15 +2,15 @@ import mongoose, { Schema } from 'mongoose';
 
 
 export interface Drone {
-  "id" : number, // Unique drone ID
-  "charge" : number, // Remaining charge % [0,100]
-  "destinations": string[] // Drone's current route
+  'id' : number, // Unique drone ID
+  'charge' : number, // Remaining charge % [0,100]
+  'destinations': string[] // Drone's current route
 }
 
 const droneSchema = new Schema<Drone>({
   id: { type: Number, required: true },
   charge: { type: Number, min: 0, max: 1 },
-  destinations: { type: [String]},
+  destinations: { type: [String] },
 });
 
 const DroneModel = mongoose.model<Drone>('Drone', droneSchema);

backend/src/database/schemas/order_schema.ts

@@ -4,12 +4,12 @@ import { User, userSchema } from './user_schema';
 import { Address, addressSchema } from './address_schema';
 
 export interface Order {
-  "order_id" : number, // Unique identifier for this order.
-  "user" : User, // User
-  "price" : number, // Price of all donuts, ±tax.
-  "donuts": Donut[], // List of ordered doughnuts
-  "quantities": number[], // Parallel list to doughnuts with the number of doughnuts being bought.
-  "destination": Address, // Location that the order is being sent to.
+  'order_id' : number, // Unique identifier for this order.
+  'user' : User, // User
+  'price' : number, // Price of all donuts, ±tax.
+  'donuts': Donut[], // List of ordered doughnuts
+  'quantities': number[], // Parallel list to doughnuts with number of donuts.
+  'destination': Address, // Location that the order is being sent to.
 }
 
 const orderSchema = new Schema<Order>({
@@ -18,8 +18,8 @@ const orderSchema = new Schema<Order>({
   user: { type: userSchema, required: true },
   // Total price of order.
   price: { type: Number, min: 0 },
-  donuts: { type: [donutSchema], required:true },
-  quantities: { type: [Number], required:true },
+  donuts: { type: [donutSchema], required: true },
+  quantities: { type: [Number], required: true },
   // Address that order will be delivered to.
   destination: { type: addressSchema },
 });

backend/src/database/schemas/user_schema.ts

@@ -2,11 +2,11 @@ import mongoose, { Schema } from 'mongoose';
 import { Donut, donutSchema } from './donut_schema';
 
 export interface User {
-  "username" : string, // Unique
-  "password" : string, // Hashed password
-  "employee": boolean, // boolean for whether user is an employee
+  'username' : string, // Unique
+  'password' : string, // Hashed password
+  'employee': boolean, // boolean for whether user is an employee
   // list of previous orders
-  "previous_orders": Donut[], 
+  'previous_orders': Donut[],
 }
 
 const userSchema = new Schema<User>({
@@ -15,7 +15,7 @@ const userSchema = new Schema<User>({
   // Hashed password
   password: { type: String, required: true },
   employee: { type: Boolean, required: true },
-  previous_orders: {type: [donutSchema]}
+  previous_orders: { type: [donutSchema] },
 });
 
 const UserModel = mongoose.model<User>('User', userSchema);

backend/src/index.ts

@@ -124,5 +124,5 @@ app.get('/donuts', (req: express.Request, res: express.Response) => {
 });
 
 app.listen(port, () => {
-    console.log(`Example app listening on port ${port}`);
+  console.log(`Example app listening on port ${port}`);
 });

.eslintrc.js → frontend/.eslintrc.js

@@ -5,7 +5,7 @@ module.exports = {
   },
   'extends': [
     'plugin:react/recommended',
-    'google',
+    // 'google',
   ],
   'parser': '@typescript-eslint/parser',
   'parserOptions': {

frontend/database/schemas/address_schema.ts

@@ -9,12 +9,12 @@ export interface Address {
 }
 
 const addressSchema = new Schema<Address>({
-  street: {type: String, required: true },
-  city: {type: String },
-  state: {type: String },
-  zip: {type: String },
+  street: { type: String, required: true },
+  city: { type: String },
+  state: { type: String },
+  zip: { type: String },
 });
 
 const AddressModel = mongoose.model<Address>('Address', addressSchema);
 
-export { addressSchema, AddressModel};
+export { addressSchema, AddressModel };

frontend/database/schemas/donut_schema.ts

@@ -1,17 +1,17 @@
 import mongoose, { Schema } from 'mongoose';
 
 export interface Donut {
-  "name" : string, // Unique doughnut name
-  "price" : number, // Price in donutbucks (or whatever the world uses these days)
-  "description": string, // Longer description of doughnut
-  "imageurl": string, // Path to an image of the donut
+  'name' : string, // Unique doughnut name
+  'price' : number, // Price in donutbucks (or whatever the world uses these days)
+  'description': string, // Longer description of doughnut
+  'imageurl': string, // Path to an image of the donut
 }
 
 const donutSchema = new Schema<Donut>({
   name: { type: String, required: true },
   price: { type: Number, min: 0 },
   description: { type: String },
-  imageurl: {type: String }
+  imageurl: { type: String },
 });
 const DonutModel = mongoose.model<Donut>('Donut', donutSchema);
 

frontend/database/schemas/drone_schema.ts

@@ -2,9 +2,9 @@ import mongoose, { Schema } from 'mongoose';
 
 
 export interface Drone {
-  "id" : number, // Unique drone ID
-  "charge" : number, // Remaining charge % [0,100]
-  "position": string // Drone's current position
+  'id' : number, // Unique drone ID
+  'charge' : number, // Remaining charge % [0,100]
+  'position': string // Drone's current position
 }
 
 const droneSchema = new Schema<Drone>({