add recurrence enum

backend/typescript/prisma/migrations/20240324164213_/migration.sql → backend/typescript/prisma/migrations/20240328014614_/migration.sql

@@ -1,6 +1,9 @@
 -- CreateEnum
 CREATE TYPE "RoleType" AS ENUM ('Admin', 'User');
 
+-- CreateEnum
+CREATE TYPE "Recurrence" AS ENUM ('None', 'Weekly', 'Monthly', 'Annually');
+
 -- CreateTable
 CREATE TABLE "User" (
     "id" TEXT NOT NULL,
@@ -23,20 +26,13 @@ CREATE TABLE "Donation" (
     "user_id" TEXT NOT NULL,
     "amount" DOUBLE PRECISION NOT NULL,
     "donation_date" TIMESTAMP(3) NOT NULL,
-    "is_recurring" BOOLEAN NOT NULL,
+    "cause_id" INTEGER NOT NULL,
+    "is_recurring" "Recurrence" NOT NULL,
     "confirmation_email_sent" BOOLEAN NOT NULL,
 
     CONSTRAINT "Donation_pkey" PRIMARY KEY ("id")
 );
 
--- CreateTable
-CREATE TABLE "CauseDonation" (
-    "donation_id" INTEGER NOT NULL,
-    "cause_id" INTEGER NOT NULL,
-
-    CONSTRAINT "CauseDonation_pkey" PRIMARY KEY ("donation_id","cause_id")
-);
-
 -- CreateTable
 CREATE TABLE "Cause" (
     "id" SERIAL NOT NULL,
@@ -67,9 +63,6 @@ CREATE TABLE "Item" (
     CONSTRAINT "Item_pkey" PRIMARY KEY ("id")
 );
 
--- CreateIndex
-CREATE UNIQUE INDEX "Donation_user_id_key" ON "Donation"("user_id");
-
 -- CreateIndex
 CREATE UNIQUE INDEX "NPO_item_id_key" ON "NPO"("item_id");
 

backend/typescript/prisma/schema.prisma

@@ -37,10 +37,17 @@ model Donation {
   donation_date           DateTime
   cause                   Cause           @relation(fields: [cause_id], references: [id])
   cause_id                Int
-  is_recurring            Boolean
+  is_recurring            Recurrence
   confirmation_email_sent Boolean
 }
 
+enum Recurrence {
+  None
+  Weekly
+  Monthly
+  Annually
+}
+
 // Cause and NPO: One-to-Many: A single cause can be associated with many NPOs, and each NPO is linked to one cause
 model Cause {
   id          Int             @id @default(autoincrement())

backend/typescript/services/implementations/donationService.ts

@@ -1,5 +1,5 @@
 import IDonationService from "../interfaces/donationService";
-import { DonationDTO } from "../../types"
+import { DonationDTO, Recurrence } from "../../types"
 import prisma from "../../prisma";
 import logger from "../../utilities/logger";
 import { getErrorMessage } from "../../utilities/errorUtils";
@@ -33,7 +33,7 @@ class DonationService implements IDonationService {
         }
     }
 
-    async createDonation(user_id: string, amount: number, cause_id: number, is_recurring: boolean, confirmation_email_sent: boolean): Promise<DonationDTO> {
+    async createDonation(user_id: string, amount: number, cause_id: number, is_recurring: string, confirmation_email_sent: boolean): Promise<DonationDTO> {
         {
           try {
             const newDonation = await prisma.donation.create({
@@ -42,13 +42,13 @@ class DonationService implements IDonationService {
                 amount,
                 donation_date: new Date(),
                 cause_id: cause_id,
-                is_recurring,
+                is_recurring: is_recurring as Recurrence,
                 confirmation_email_sent
               },
             });
             return newDonation;
           } catch (error) {
-
+            Logger.error(`Error creating donation for user ${user_id} = ${error}`);
             throw error;
           }
         }

backend/typescript/services/interfaces/donationService.ts

@@ -1,5 +1,4 @@
-import { DateDataType, FloatDataType, IntegerDataType } from "sequelize";
-import { DonationDTO } from "../../types";
+import { DonationDTO, Recurrence } from "../../types";
 
 interface IDonationService {
     /**
@@ -31,7 +30,7 @@ interface IDonationService {
         user_id: string, 
         amount: number, 
         cause_id: number, 
-        is_recurring: boolean, 
+        is_recurring: string, 
         confirmation_email_sent: boolean
     ): Promise<DonationDTO>;
 }

backend/typescript/types.ts

@@ -39,12 +39,14 @@ export type NodemailerConfig = {
 
 export type SignUpMethod = "PASSWORD" | "GOOGLE";
 
+export type Recurrence = "None" | "Weekly" | "Monthly" | "Annually";
+
 export type DonationDTO = {
   user_id: string;
   amount: number;
   donation_date: Date;
   cause_id: number;
-  is_recurring: boolean;
+  is_recurring: Recurrence;
   confirmation_email_sent: boolean;
 }