Merge pull request #71 from cuappdev/tony/blocking3

Blocking Users
cuappdev · Feb 28, 2024 · 41ce7e7 · 41ce7e7
2 parents 6fba8c7 + f4df8e4
commit 41ce7e7
Show file tree

Hide file tree

Showing 17 changed files with 316 additions and 127 deletions.
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "start": "ts-node src/app.ts",
     "test": "jest",
     "db:migrate:create": "ts-node ./node_modules/typeorm/cli.js migration:create -n",
+    "db:migrate:generate": "ts-node ./node_modules/typeorm/cli.js migration:generate -n",
     "db:migrate": "ts-node ./node_modules/typeorm/cli.js migration:run",
     "db:revert": "ts-node ./node_modules/typeorm/cli.js migration:revert"
   },

diff --git a/src/api/controllers/UserController.ts b/src/api/controllers/UserController.ts
@@ -2,7 +2,7 @@ import { Body, CurrentUser, Get, JsonController, Param, Params, Post } from 'rou
 
 import { UserModel } from '../../models/UserModel';
 import { UserService } from '../../services/UserService';
-import { EditProfileRequest, GetUserByEmailRequest, GetUserResponse, GetUsersResponse, SaveTokenRequest, SetAdminByEmailRequest } from '../../types';
+import { BlockUserRequest, EditProfileRequest, GetUserByEmailRequest, GetUserResponse, GetUsersResponse, SaveTokenRequest, SetAdminByEmailRequest } from '../../types';
 import { UuidParam } from '../validators/GenericRequests';
 
 @JsonController('user/')
@@ -48,4 +48,14 @@ export class UserController {
   async setAdmin(@Body() setAdminByEmailRequest: SetAdminByEmailRequest, @CurrentUser() superAdmin: UserModel): Promise<GetUserResponse> {
     return { user: await this.userService.setAdmin(superAdmin, setAdminByEmailRequest) };
   }
+
+  @Post('block/')
+  async blockUser(@Body() blockUserRequest: BlockUserRequest, @CurrentUser() user: UserModel): Promise<GetUserResponse> {
+    return { user: await this.userService.blockUser(user, blockUserRequest) }
+  }
+
+  @Post('unblock/')
+  async unblockUser(@Body() blockUserRequest: BlockUserRequest, @CurrentUser() user: UserModel): Promise<GetUserResponse> {
+    return { user: await this.userService.unblockUser(user, blockUserRequest) }
+  }
 }
diff --git a/src/migrations/0000_AddAlteredPrice.ts b/src/migrations/0000_AddAlteredPrice.ts
diff --git a/src/migrations/0001_AddDeviceTokenForUser.ts b/src/migrations/0001_AddDeviceTokenForUser.ts
diff --git a/src/migrations/0002_AddStarsAndNumReviewsToUser.ts b/src/migrations/0002_AddStarsAndNumReviewsToUser.ts
diff --git a/src/migrations/0003_AddDeviceTokenToSession.ts b/src/migrations/0003_AddDeviceTokenToSession.ts
diff --git a/src/migrations/0004_RemoveDeviceTokenForUser.ts b/src/migrations/0004_RemoveDeviceTokenForUser.ts
diff --git a/src/migrations/1707427884517-init.ts b/src/migrations/1707427884517-init.ts
@@ -0,0 +1,56 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class init1707427884517 implements MigrationInterface {
+    name = 'init1707427884517'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "Request" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying NOT NULL, "description" character varying NOT NULL, "user" uuid, CONSTRAINT "PK_23de24dc477765bcc099feae8e5" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "Post" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" character varying NOT NULL, "description" character varying NOT NULL, "categories" text array NOT NULL, "original_price" numeric NOT NULL, "altered_price" numeric NOT NULL DEFAULT '-1', "images" text array NOT NULL, "created" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "location" character varying, "archive" boolean NOT NULL DEFAULT false, "user" uuid, CONSTRAINT "PK_c4d3b3dcd73db0b0129ea829f9f" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "UserSession" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "access_token" character varying NOT NULL, "expires_at" TIMESTAMP WITH TIME ZONE NOT NULL, "refresh_token" character varying NOT NULL, "device_token" text NOT NULL DEFAULT '', "user_id" character varying NOT NULL, "user" uuid, CONSTRAINT "PK_44f848faf1dd3898e9de61dc18b" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "UserReview" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "fulfilled" boolean NOT NULL, "stars" integer NOT NULL, "comments" character varying NOT NULL, "date" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "buyer" uuid, "seller" uuid, CONSTRAINT "PK_91b62f63709469ae812a3519dd1" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "User" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "username" character varying NOT NULL, "netid" character varying NOT NULL, "given_name" character varying NOT NULL, "family_name" character varying NOT NULL, "admin" boolean NOT NULL, "stars" numeric NOT NULL DEFAULT '0', "num_reviews" integer NOT NULL DEFAULT '0', "photo_url" character varying, "venmo_handle" character varying, "email" character varying NOT NULL, "google_id" character varying NOT NULL, "bio" text NOT NULL DEFAULT '', CONSTRAINT "UQ_29a05908a0fa0728526d2833657" UNIQUE ("username"), CONSTRAINT "UQ_ec60b02aab67f0f99f6f88797ed" UNIQUE ("netid"), CONSTRAINT "UQ_4a257d2c9837248d70640b3e36e" UNIQUE ("email"), CONSTRAINT "UQ_a4f1fbe21cff2f5860ffa7a3cb6" UNIQUE ("google_id"), CONSTRAINT "PK_9862f679340fb2388436a5ab3e4" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "Feedback" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "description" character varying NOT NULL, "images" text array NOT NULL, "user" uuid, CONSTRAINT "PK_7ffea537e9c56670b65c2d62316" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE TABLE "user_saved_posts" ("saved" uuid NOT NULL, "savers" uuid NOT NULL, CONSTRAINT "PK_11901fe92c42b2d2a71ca74021a" PRIMARY KEY ("saved", "savers"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_ce8de5293eff7bd649291c7445" ON "user_saved_posts" ("saved") `);
+        await queryRunner.query(`CREATE INDEX "IDX_1da3c41687f5a8934c7808ef24" ON "user_saved_posts" ("savers") `);
+        await queryRunner.query(`CREATE TABLE "request_matches_posts" ("matches" uuid NOT NULL, "matched" uuid NOT NULL, CONSTRAINT "PK_7f4c04956dd4e84a3437b2a8018" PRIMARY KEY ("matches", "matched"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_bfa8c41d1cbae1a3faf7916693" ON "request_matches_posts" ("matches") `);
+        await queryRunner.query(`CREATE INDEX "IDX_dcf9a982f720a85b68bc354b9f" ON "request_matches_posts" ("matched") `);
+        await queryRunner.query(`ALTER TABLE "Request" ADD CONSTRAINT "FK_db281bd2822e1938f5072960173" FOREIGN KEY ("user") REFERENCES "User"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "Post" ADD CONSTRAINT "FK_2067452f95b084577dae22e17e2" FOREIGN KEY ("user") REFERENCES "User"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD CONSTRAINT "FK_a93dfba9168e8addd8a53b9a6c4" FOREIGN KEY ("user") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "UserReview" ADD CONSTRAINT "FK_003e3b33806e21e65f3fb0b87e6" FOREIGN KEY ("buyer") REFERENCES "User"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "UserReview" ADD CONSTRAINT "FK_1d721b09d28cb397b9b2edf76f7" FOREIGN KEY ("seller") REFERENCES "User"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "Feedback" ADD CONSTRAINT "FK_e1ca1a1706e36874b6adfaab662" FOREIGN KEY ("user") REFERENCES "User"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "user_saved_posts" ADD CONSTRAINT "FK_ce8de5293eff7bd649291c74452" FOREIGN KEY ("saved") REFERENCES "Post"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "user_saved_posts" ADD CONSTRAINT "FK_1da3c41687f5a8934c7808ef24d" FOREIGN KEY ("savers") REFERENCES "User"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "request_matches_posts" ADD CONSTRAINT "FK_bfa8c41d1cbae1a3faf79166936" FOREIGN KEY ("matches") REFERENCES "Post"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "request_matches_posts" ADD CONSTRAINT "FK_dcf9a982f720a85b68bc354b9f8" FOREIGN KEY ("matched") REFERENCES "Request"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "request_matches_posts" DROP CONSTRAINT "FK_dcf9a982f720a85b68bc354b9f8"`);
+        await queryRunner.query(`ALTER TABLE "request_matches_posts" DROP CONSTRAINT "FK_bfa8c41d1cbae1a3faf79166936"`);
+        await queryRunner.query(`ALTER TABLE "user_saved_posts" DROP CONSTRAINT "FK_1da3c41687f5a8934c7808ef24d"`);
+        await queryRunner.query(`ALTER TABLE "user_saved_posts" DROP CONSTRAINT "FK_ce8de5293eff7bd649291c74452"`);
+        await queryRunner.query(`ALTER TABLE "Feedback" DROP CONSTRAINT "FK_e1ca1a1706e36874b6adfaab662"`);
+        await queryRunner.query(`ALTER TABLE "UserReview" DROP CONSTRAINT "FK_1d721b09d28cb397b9b2edf76f7"`);
+        await queryRunner.query(`ALTER TABLE "UserReview" DROP CONSTRAINT "FK_003e3b33806e21e65f3fb0b87e6"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP CONSTRAINT "FK_a93dfba9168e8addd8a53b9a6c4"`);
+        await queryRunner.query(`ALTER TABLE "Post" DROP CONSTRAINT "FK_2067452f95b084577dae22e17e2"`);
+        await queryRunner.query(`ALTER TABLE "Request" DROP CONSTRAINT "FK_db281bd2822e1938f5072960173"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_dcf9a982f720a85b68bc354b9f"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_bfa8c41d1cbae1a3faf7916693"`);
+        await queryRunner.query(`DROP TABLE "request_matches_posts"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_1da3c41687f5a8934c7808ef24"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_ce8de5293eff7bd649291c7445"`);
+        await queryRunner.query(`DROP TABLE "user_saved_posts"`);
+        await queryRunner.query(`DROP TABLE "Feedback"`);
+        await queryRunner.query(`DROP TABLE "User"`);
+        await queryRunner.query(`DROP TABLE "UserReview"`);
+        await queryRunner.query(`DROP TABLE "UserSession"`);
+        await queryRunner.query(`DROP TABLE "Post"`);
+        await queryRunner.query(`DROP TABLE "Request"`);
+    }
+
+}
diff --git a/src/migrations/1707428741047-blocking.ts b/src/migrations/1707428741047-blocking.ts
@@ -0,0 +1,74 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class blocking1707428741047 implements MigrationInterface {
+    name = 'blocking1707428741047'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`CREATE TABLE "user_blocking_users" ("blockers" uuid NOT NULL, "blocking" uuid NOT NULL, CONSTRAINT "PK_8db623e58cc4bce5fbcc252c66b" PRIMARY KEY ("blockers", "blocking"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_fab66ba7c0e58e67b0d67f1c23" ON "user_blocking_users" ("blockers") `);
+        await queryRunner.query(`CREATE INDEX "IDX_b5c7223aa162c5ccd1867056f7" ON "user_blocking_users" ("blocking") `);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "accessToken"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "expiresAt"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "refreshToken"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "deviceToken"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "userId"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "givenName"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "familyName"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "numReviews"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "photoUrl"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "venmoHandle"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP CONSTRAINT "UQ_02dec29f4ca814ab6efa2d4f0c4"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "googleId"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "access_token" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "expires_at" TIMESTAMP WITH TIME ZONE NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "refresh_token" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "device_token" text NOT NULL DEFAULT ''`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "user_id" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "given_name" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "family_name" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "num_reviews" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "photo_url" character varying`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "venmo_handle" character varying`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "google_id" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "User" ADD CONSTRAINT "UQ_a4f1fbe21cff2f5860ffa7a3cb6" UNIQUE ("google_id")`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "original_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "altered_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "user_blocking_users" ADD CONSTRAINT "FK_fab66ba7c0e58e67b0d67f1c232" FOREIGN KEY ("blockers") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "user_blocking_users" ADD CONSTRAINT "FK_b5c7223aa162c5ccd1867056f73" FOREIGN KEY ("blocking") REFERENCES "User"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "user_blocking_users" DROP CONSTRAINT "FK_b5c7223aa162c5ccd1867056f73"`);
+        await queryRunner.query(`ALTER TABLE "user_blocking_users" DROP CONSTRAINT "FK_fab66ba7c0e58e67b0d67f1c232"`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "altered_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "Post" ALTER COLUMN "original_price" TYPE numeric`);
+        await queryRunner.query(`ALTER TABLE "User" DROP CONSTRAINT "UQ_a4f1fbe21cff2f5860ffa7a3cb6"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "google_id"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "venmo_handle"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "photo_url"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "num_reviews"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "family_name"`);
+        await queryRunner.query(`ALTER TABLE "User" DROP COLUMN "given_name"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "user_id"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "device_token"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "refresh_token"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "expires_at"`);
+        await queryRunner.query(`ALTER TABLE "UserSession" DROP COLUMN "access_token"`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "googleId" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "User" ADD CONSTRAINT "UQ_02dec29f4ca814ab6efa2d4f0c4" UNIQUE ("googleId")`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "venmoHandle" character varying`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "photoUrl" character varying`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "numReviews" integer NOT NULL DEFAULT '0'`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "familyName" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "User" ADD "givenName" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "userId" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "deviceToken" text NOT NULL DEFAULT ''`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "refreshToken" character varying NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "expiresAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "UserSession" ADD "accessToken" character varying NOT NULL`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_b5c7223aa162c5ccd1867056f7"`);
+        await queryRunner.query(`DROP INDEX "public"."IDX_fab66ba7c0e58e67b0d67f1c23"`);
+        await queryRunner.query(`DROP TABLE "user_blocking_users"`);
+    }
+
+}