Patrick-HongYun-Project3-Backend by patrickkok · Pull Request #52 · rocketacademy/project3-backend-bootcamp

patrickkok · 2024-04-25T15:20:47Z

No description provided.

…migration, model, seeder. also added auth0 initial setup before controllers and routers

…nd models

…l as well. created primary seed data

… and ter seeds

…Name and amended createdAt to created_at and updatedAts. rewrote router and controller classes. added scripts in packagejson.

… building and room data to frontend

Building

Created add items controller and routes

Add controller method to add new building and associated rooms.

Added logic for adding new items and also auth backend

added new logic to add new items if it exist already

…en_name

…tive cart

…emoved consumed column and adjusted the Cart_Line_Items table to below Room_Items table

…ow par items

…me an optional field in user model

…ry as sequelize cannot handle complex equations

Add route and controller method to get room items

Add user logic to backend

…a user is a part of, create buildingUser row when creating new building

No conflicting files, to remove commented code before presentation.

…rinfo after logging in

Show only relevant buildings to current user

amended the usercontroller migrations and seeder for retreival of use…

…rEmail

Main building

…he user has access to

…access to

Only show items that is in the user's building

Update readme

Deployconfig

Flashrob · 2024-04-28T16:12:36Z

README.md

@@ -1,3 +1,5 @@
 # Rocket Academy Coding Bootcamp: Project 3 Backend


Could really provide a bit more info here guys. How about what the BE really does, and what about setting up the local db for dev environment, including environment variables necessary etc?

Flashrob · 2024-04-28T16:13:34Z

Dockerfile

+ENV PATH=/usr/local/node/bin:$PATH
+ARG NODE_VERSION=16.15.1
+
+RUN apt-get update; apt install -y curl python-is-python3 pkg-config build-essential && \


Do we really need python to build a node project? Seems a bit overkill. I am pretty sure there must be an easier way

Flashrob · 2024-04-28T16:14:14Z

config/database.js

@@ -0,0 +1,18 @@
+require("dotenv").config();


Do we need this file if we got the .ts file?

Flashrob · 2024-04-28T16:15:24Z

tsconfig.json

@@ -0,0 +1,111 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig to read more about this file */


you should clean this file up a bit

Flashrob · 2024-04-28T16:16:02Z

index.ts

+app.use(checkJwt, itemsRouter);
+app.use(checkJwt, buildingsRouter);
+app.use(checkJwt, cartRouter);
+app.use(checkJwt, dashRouter);
+app.use(checkJwt, usersrouter);


if you are using checkJwt on every router, why not just make a generic app.use(checkJwt), just like with cors? That would avoid repetition here

Flashrob · 2024-04-28T16:33:57Z

controllers/usersController.ts

+  async updateUser(req: Request, res: Response) {
+    const { email, name, id, photoUrl } = req.body;
+    try {
+      const output = await User.findOrCreate({
+        where: { email: email },
+        defaults: {
+          auth_id: id,
+          email: email,
+          name: name,
+          profile_img_url: photoUrl,
+        },
+      });
+      return res.json(output);
+    } catch (err) {
+      return res.status(400).json({ error: true, msg: (err as Error).message });
+    }
+  }


Since I only saw you use checkJwt, I almost would assume the following:

I have an account on your app and can authenticate with my token to the BE request

I can copy the token from my browser into postman and make a request to your BE

I don't type in my email into the request body (which I can find by updating my own user profile), but another email

I can update another user's profile

So, even if the user has a token, we should still make sure that the token and the updated User, are the same user. So we need to actually deconstruct the token to extract the email address of the user and compare to the request body. Just a small security loophole I can think of here

Flashrob · 2024-04-28T16:34:38Z

db/migrations/20240325145721-initial-migration.ts

+
+module.exports = {
+  async up(queryInterface: QueryInterface, Sequelize: typeof DataTypes) {
+    await queryInterface.createTable("Users", {


As previously stated, do multiple files per each database change. Lumping into one file, I would highly discourage

Flashrob · 2024-04-28T16:36:19Z

db/models/Building.ts

+  modelName: "Building",
+  underscored: true,
+})
+export class Building extends Model<BuildingAttributes> {


Where is your PK?

Flashrob · 2024-04-28T16:36:31Z

db/models/Item.ts

+  tableName: "Items",
+  underscored: true,
+})
+export class Item extends Model<ItemAttributes> {


Flashrob · 2024-04-28T16:36:54Z

db/models/Room.ts

+  modelName: "Room",
+  underscored: true,
+})
+export class Room extends Model<RoomAttributes> {


Flashrob · 2024-05-08T14:09:30Z

controllers/buildingController.ts

+          rooms.map(async (obj: RoomAttributes) => {
+            const newRoom = { ...obj };
+            newRoom["building_id"] = newBuilding.id;
+            await Room.create(newRoom, { transaction: t });


you should collect the rooms into an array, and then run bulkCreate

magiicloud and others added 30 commits March 20, 2024 22:00

installed sequelize and did initial setup up to step before creating …

31e76d8

…migration, model, seeder. also added auth0 initial setup before controllers and routers

changed to sequelize-typescript and finished configuring migrations a…

97a3112

…nd models

separated migrations into primary, secondary and tertiary tables

8fa385b

amended migration FK reference names to table names

a7609bd

amended Building migration from item_size to image_size. amended mode…

a53a744

…l as well. created primary seed data

changed image url from int to string

38d5b20

amended the order of async down for primary seed, seeded data for sec…

65046b7

… and ter seeds

amended seed data for carts to add created and updated

6be21fb

installed cors

748c37d

rewrite indexjs of models. rewrote migrations models to include table…

b947cd6

…Name and amended createdAt to created_at and updatedAts. rewrote router and controller classes. added scripts in packagejson.

amended itemsController to show data from RoomItem and Room

9c61c4b

Edit room model params, create building router and controller to send…

8899c38

… building and room data to frontend

Merge pull request #1 from magiicloud/floorplan

7aca78b

Building

added logic to search via serial num or via pk

e9fd0f9

added update item controller and sort get all by id

6b27096

Merge pull request #2 from magiicloud/additems

8b895b0

Created add items controller and routes

added controller and route for adding new items

563b07b

Add controller method to add new building and associated rooms

a10a89c

Merge pull request #3 from magiicloud/new-building

a383643

Add controller method to add new building and associated rooms.

added route protection logic to index.ts

d993e41

Merge pull request #4 from magiicloud/add-new-items

703cb40

Added logic for adding new items and also auth backend

added new logic to add new items if it exist already

b32249c

Merge pull request #5 from magiicloud/add-new-items

d31f33f

added new logic to add new items if it exist already

added logic to delete item in room and entire item set

dde662d

edited create item such that if item exist only update par and not it…

5738602

…en_name

Implement transactions

cf2cd38

added cart router to make cart transactions

f0cab7a

added cart controllers to add item to cart, checkout cart and view ac…

0a026fb

…tive cart

modified migrations, models to associate Rooms and Cart_Line_Items. r…

d177a9a

…emoved consumed column and adjusted the Cart_Line_Items table to below Room_Items table

amended roomId to roomSelect

ac7b536

magiicloud and others added 28 commits April 6, 2024 23:32

added protection to all routes except /

c3c6ddf

added delete item from cart logic

b27630d

added dashboard router and controller to retrieve near expiry and bel…

93d805f

…ow par items

Add route and controller method to get room items

f5289d2

Add user router and controller to findOrCreate user by email, made na…

bf7eea6

…me an optional field in user model

sorted getExpiringItemsCount and modified getParItems by doing rawQue…

8f97736

…ry as sequelize cannot handle complex equations

Merge pull request #8 from magiicloud/room-items

d2e81be

Add route and controller method to get room items

Merge pull request #9 from magiicloud/add-user

b6656eb

Add user logic to backend

Merge branch 'main' into auth

a4ba424

Add building controller methods and routes to only display buildings …

de096c2

…a user is a part of, create buildingUser row when creating new building

Merge pull request #10 from magiicloud/auth

3253889

No conflicting files, to remove commented code before presentation.

amended the usercontroller migrations and seeder for retreival of use…

40852f4

…rinfo after logging in

amended the default userId 1 to accept userId from params or req body

b37e134

Merge pull request #11 from magiicloud/building-users

df929f8

Show only relevant buildings to current user

Merge pull request #12 from magiicloud/auth

390bb10

amended the usercontroller migrations and seeder for retreival of use…

Update building controller and router to accept userId instead of Use…

c45b686

…rEmail

Add logic to add users to buildings

c02bccb

Merge pull request #13 from magiicloud/main-building

02f8b67

Main building

Update getItemsBelowPar and getExpiringItemsCount to only get items t…

34d7477

…he user has access to

Update getAllItems method to only return Items in Rooms the user has …

afd461e

…access to

Update getAllRooms to only show the rooms the user is part of

9ecc8b8

changed back to rawQuery to sum par quantities

fddfe39

Merge pull request #14 from magiicloud/get-items-by-building

3b925b9

Only show items that is in the user's building

Update readme

a06a7b1

Merge pull request #15 from magiicloud/readme-update

dd88dfc

Update readme

added fly io deployment configs

8c36f7c

added code to deploy to fly.io and cleaned up all codes

d5b1f4f

Merge pull request #16 from magiicloud/deployconfig

3cbb33d

Deployconfig

Flashrob reviewed Apr 28, 2024

View reviewed changes

Flashrob reviewed May 8, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Patrick-HongYun-Project3-Backend#52

Patrick-HongYun-Project3-Backend#52
patrickkok wants to merge 61 commits intorocketacademy:mainfrom
magiicloud:main

patrickkok commented Apr 25, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob Apr 28, 2024

Uh oh!

Flashrob May 8, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -1,3 +1,5 @@
		# Rocket Academy Coding Bootcamp: Project 3 Backend

Conversation

patrickkok commented Apr 25, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants