refactor: refactor the stuff, update database

Author: ilyaskarim

changelog.md

@@ -1,3 +1,4 @@
 ### 1.0.0
+
 - Initial project structure and repo setup
-- Initial API's for User, Wallet, and Transaction management
+- Initial API's for User, Wallet, and Transaction management

prisma/schema.prisma

@@ -7,35 +7,33 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
-model User {
+model Wallet {
   id                  Int           @id @default(autoincrement())
   username            String        @unique
   email               String        @unique
   application_user_id String        @unique
-  Wallet              Wallet[]
-  Transaction         Transaction[]
   created_at          DateTime      @default(now())
   updated_at          DateTime      @updatedAt
+  Transaction         Transaction[]
 }
 
-model Wallet {
+model Coin {
   id          Int           @id @default(autoincrement())
-  user_id     Int
-  user        User          @relation(fields: [user_id], references: [id])
-  balance     Int
-  Transaction Transaction[]
+  name        String
+  symbol      String
   created_at  DateTime      @default(now())
   updated_at  DateTime      @updatedAt
+  Transaction Transaction[]
 }
 
 model Transaction {
   id               Int      @id @default(autoincrement())
   transaction_type String
-  user_id          Int
-  user             User     @relation(fields: [user_id], references: [id])
   wallet_id        Int
-  wallet           Wallet   @relation(fields: [wallet_id], references: [id])
+  coin_id          Int
   amount           Int
   created_at       DateTime @default(now())
   updated_at       DateTime @updatedAt
+  wallet           Wallet   @relation(fields: [wallet_id], references: [id])
+  coin             Coin     @relation(fields: [coin_id], references: [id])
 }

src/v1/routes.ts

@@ -1,6 +1,6 @@
 import { middlewareValidateYupSchemaAgainstReqBody, validateUserExistsSentThroughReqBody } from "../utils/middlewares";
-import { createUserSchema, updateUserSchema } from "./user.validation";
-import { createUser, getUserBalance, updateUser } from "./user";
+import { createWalletSchema, updateWalletSchema } from "./wallet/wallet.validation";
+import { createWallet, updateWallet, getWalletBalance } from "./wallet/wallet";
 
 import express from "express";
 import {
@@ -10,11 +10,32 @@ import {
   getTransactions,
   getTransactionsByUser,
   updateTransaction,
-} from "./transaction";
-import { createTransactionSchema, updateTransactionSchema } from "./transaction.validation";
+} from "./transactions/transaction";
+import { createTransactionSchema, updateTransactionSchema } from "./transactions/transaction.validation";
 
 const v1Routes = express.Router();
 
+/**
+ * Wallet Apis Start
+ */
+
+v1Routes.post("/createWallet", middlewareValidateYupSchemaAgainstReqBody(createWalletSchema), createWallet);
+v1Routes.put(
+  "/updateWallet",
+  validateUserExistsSentThroughReqBody("body.id"),
+  middlewareValidateYupSchemaAgainstReqBody(updateWalletSchema),
+  updateWallet,
+);
+v1Routes.get("/getWalletBalance", validateUserExistsSentThroughReqBody("body.input.id"), getWalletBalance);
+
+/**
+ * Wallet Apis End
+ */
+
+/**
+ * Transaction Apis Start
+ * */
+
 v1Routes.post(
   "/createTransaction",
   validateUserExistsSentThroughReqBody("body.user_id"),
@@ -40,19 +61,8 @@ v1Routes.get(
   validateUserExistsSentThroughReqBody("params.userId"),
   getTransactionsByUser,
 );
+/**
+ * Transaction Apis End
+ */
 
-v1Routes.post("/createWallet", function (req, res) {
-  res.status(200).json({
-    message: "createWallet",
-  });
-});
-
-v1Routes.post("/createUser", middlewareValidateYupSchemaAgainstReqBody(createUserSchema), createUser);
-v1Routes.put(
-  "/updateUser",
-  validateUserExistsSentThroughReqBody("body.id"),
-  middlewareValidateYupSchemaAgainstReqBody(updateUserSchema),
-  updateUser,
-);
-v1Routes.get("/getUserBalance", validateUserExistsSentThroughReqBody("body.input.id"), getUserBalance);
 export default v1Routes;

src/v1/transaction.ts renamed to src/v1/transactions/transaction.ts

@@ -1,6 +1,6 @@
-import prisma from "./../database/prisma";
+import prisma from "../../database/prisma";
 import { Response, Request } from "express";
-import { generateError } from "../utils/errors";
+import { generateError } from "../../utils/errors";
 
 export const createTransaction = async (req: Request, res: Response) => {
   try {
@@ -14,12 +14,7 @@ export const createTransaction = async (req: Request, res: Response) => {
 
     // Create transaction
     let response = await prisma.transaction.create({
-      data: {
-        transaction_type: req.body.input.transaction_type,
-        user_id: req.body.input.user_id,
-        wallet_id: req.body.input.wallet_id,
-        amount: req.body.input.amount,
-      },
+      data: req.body.input,
     });
 
     res.status(200).json({

src/v1/transaction.validation.ts renamed to src/v1/transactions/transaction.validation.ts

@@ -4,10 +4,6 @@ export const createTransactionSchema = object({
   transaction_type: string()
     .required("Transaction type is required")
     .oneOf(["credit", "debit"], "Transaction type must be either credit or debit"),
-  user_id: number()
-    .required("User ID is required")
-    .positive("User ID must be a positive integer")
-    .integer("User ID must be an integer"),
   wallet_id: number()
     .required("Wallet ID is required")
     .positive("Wallet ID must be a positive integer")
@@ -26,8 +22,8 @@ export const createTransactionSchema = object({
 export type CreateTransactionSchema = InferType<typeof createTransactionSchema>;
 
 export const updateTransactionSchema = object({
+  id: number().required("ID is required"),
   transaction_type: string().optional().oneOf(["credit", "debit"], "Transaction type must be either credit or debit"),
-  user_id: number().optional().positive("User ID must be a positive integer").integer("User ID must be an integer"),
   amount: number().optional().positive("Amount must be a positive integer").integer("Amount must be an integer"),
 });
 export type UpdateTransactionSchema = InferType<typeof updateTransactionSchema>;

src/v1/wallet.ts

@@ -1,15 +1,11 @@
-import prisma from "./../database/prisma";
+import prisma from "../../database/prisma";
 import { Response, Request } from "express";
-import { generateError } from "../utils/errors";
+import { generateError } from "../../utils/errors";
 
-export const createUser = async (req: Request, res: Response) => {
+export const createWallet = async (req: Request, res: Response) => {
   try {
     let response = await prisma.user.create({
-      data: {
-        email: req.body.email,
-        username: req.body.username,
-        application_user_id: req.body.application_user_id,
-      },
+      data: req.body.input,
     });
     res.status(200).json({
       message: "User created successfully",
@@ -20,7 +16,7 @@ export const createUser = async (req: Request, res: Response) => {
   }
 };
 
-export const updateUser = async (req: Request, res: Response) => {
+export const updateWallet = async (req: Request, res: Response) => {
   try {
     const user = req.CurrentRequestUser;
     const update = await prisma.user.update({
@@ -38,8 +34,8 @@ export const updateUser = async (req: Request, res: Response) => {
   }
 };
 
-export const getUserBalance = (req: Request, res: Response) => {
+export const getWalletBalance = (req: Request, res: Response) => {
   res.status(200).json({
-    message: "getUserBalance",
+    message: "getWalletBalance",
   });
 };

src/v1/user.ts renamed to src/v1/wallet/wallet.ts

@@ -1,16 +1,16 @@
 import { object, string, number, InferType } from "yup";
 
-export const createUserSchema = object({
+export const createWalletSchema = object({
   username: string().required("Username is required"),
   application_user_id: string().required("Application User ID is required"),
   email: string().email().required("Email is required"),
 });
-export type CreateUserSchema = InferType<typeof createUserSchema>;
+export type CreateWalletSchema = InferType<typeof createWalletSchema>;
 
-export const updateUserSchema = object({
+export const updateWalletSchema = object({
   id: number().required("ID is required"),
   username: string().required("Username is required"),
   application_user_id: string().required("Application User ID is required"),
   email: string().email().required("Email is required"),
 });
-export type UpdateUserSchema = InferType<typeof updateUserSchema>;
+export type UpdateWalletSchema = InferType<typeof updateWalletSchema>;