DB: remove locations and add coresponding fields to Venues and Chapters

freeCodeCamp · Zeko369 · Aug 2, 2020 · Aug 2, 2020 · Aug 2, 2020 · Aug 2, 2020
commit 00f4c1b33c1289e47294e4e946a4418ff58721d0
diff --git a/db/generator/factories/chapters.factory.ts b/db/generator/factories/chapters.factory.ts
@@ -1,11 +1,7 @@
-import { company, lorem } from 'faker';
-import { Location, Chapter, User } from '../../../server/models';
-import { randomItem } from '../lib/random';
+import { company, lorem, address } from 'faker';
+import { Chapter, User } from '../../../server/models';
 
-const createChapters = async (
-  locations: Location[],
-  user: User,
-): Promise<Chapter[]> => {
+const createChapters = async (user: User): Promise<Chapter[]> => {
   const chapters: Chapter[] = [];
 
   for (let i = 0; i < 4; i++) {
@@ -20,7 +16,9 @@ const createChapters = async (
       category,
       details: 'random',
       creator: user,
-      location: randomItem(locations),
+      country: address.country(),
+      city: address.city(),
+      region: address.state(),
     });
 
     chapters.push(chapter);

diff --git a/db/generator/factories/locations.factory.ts b/db/generator/factories/locations.factory.ts
diff --git a/db/generator/factories/venues.factory.ts b/db/generator/factories/venues.factory.ts
@@ -1,14 +1,17 @@
-import { company } from 'faker';
-import { Location, Venue } from '../../../server/models';
-import { randomItem } from '../lib/random';
+import { company, address } from 'faker';
+import { Venue } from '../../../server/models';
 
-const createVenues = async (locations: Location[]): Promise<Venue[]> => {
+const createVenues = async (): Promise<Venue[]> => {
   const venues: Venue[] = [];
 
   for (let i = 0; i < 4; i++) {
     const venue = new Venue({
       name: company.companyName(),
-      location: randomItem(locations),
+      city: address.city(),
+      region: address.state(),
+      postal_code: address.zipCode(),
+      country: address.country(),
+      street_address: Math.random() > 0.5 ? address.streetAddress() : undefined,
     });
 
     venues.push(venue);

diff --git a/db/generator/index.ts b/db/generator/index.ts
@@ -2,7 +2,6 @@ import 'reflect-metadata';
 import { createConnection } from 'typeorm';
 
 import createUsers from './factories/user.factory';
-import createLocations from './factories/locations.factory';
 import createChapters from './factories/chapters.factory';
 import createVenues from './factories/venues.factory';
 import createEvents from './factories/events.factory';
@@ -14,11 +13,10 @@ import setupRoles from './setupRoles';
   const connection = await createConnection();
 
   const [user, users] = await createUsers();
-  const locations = await createLocations();
   const sponsors = await createSponsors();
 
-  const chapters = await createChapters(locations, user);
-  const venues = await createVenues(locations);
+  const chapters = await createChapters(user);
+  const venues = await createVenues();
 
   const events = await createEvents(chapters, venues, sponsors);
 

diff --git a/db/migrations/1575816827867-Location.ts b/db/migrations/1575816827867-Location.ts
diff --git a/db/migrations/1575816971375-Venue.ts b/db/migrations/1575816971375-Venue.ts
@@ -8,17 +8,14 @@ export class Venue1575816971375 implements MigrationInterface {
       `CREATE TABLE "venues" (
         "id" SERIAL NOT NULL,
         "name" character varying NOT NULL,
-        "location_id" integer,
         "created_at" TIMESTAMP NOT NULL DEFAULT now(),
         "updated_at" TIMESTAMP NOT NULL DEFAULT now(),
         CONSTRAINT "PK_cb0f885278d12384eb7a81818be" PRIMARY KEY ("id"))`,
       undefined,
     );
-    await queryRunner.query(`ALTER TABLE "venues" ADD CONSTRAINT "FK_937d4cf54512864b1a842482c13" FOREIGN KEY ("location_id") REFERENCES "locations"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`, undefined);
   }
 
   public async down(queryRunner: QueryRunner): Promise<any> {
-    await queryRunner.query(`ALTER TABLE "venues" DROP CONSTRAINT "FK_937d4cf54512864b1a842482c13"`, undefined);
     await queryRunner.query(`DROP TABLE "venues"`, undefined);
   }
 }
diff --git a/db/migrations/1575817780949-Chapter.ts b/db/migrations/1575817780949-Chapter.ts
@@ -11,20 +11,17 @@ export class Chapter1575817780949 implements MigrationInterface {
           "description" character varying NOT NULL,
           "category" character varying NOT NULL,
           "details" json NOT NULL,
-          "location_id" integer,
           "creator_id" integer,
           "created_at" TIMESTAMP NOT NULL DEFAULT now(),
           "updated_at" TIMESTAMP NOT NULL DEFAULT now(),
           CONSTRAINT "PK_a2bbdbb4bdc786fe0cb0fcfc4a0" PRIMARY KEY ("id"))`,
       undefined,
     );
-    await queryRunner.query(`ALTER TABLE "chapters" ADD CONSTRAINT "FK_95d978cb93804fa26283d6741cf" FOREIGN KEY ("location_id") REFERENCES "locations"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`, undefined);
     await queryRunner.query(`ALTER TABLE "chapters" ADD CONSTRAINT "FK_60315cd6f39d467818aa7c60505" FOREIGN KEY ("creator_id") REFERENCES "users"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`, undefined);
   }
 
   public async down(queryRunner: QueryRunner): Promise<any> {
     await queryRunner.query(`ALTER TABLE "chapters" DROP CONSTRAINT "FK_60315cd6f39d467818aa7c60505"`, undefined);
-    await queryRunner.query(`ALTER TABLE "chapters" DROP CONSTRAINT "FK_95d978cb93804fa26283d6741cf"`, undefined);
     await queryRunner.query(`DROP TABLE "chapters"`, undefined);
   }
 }
diff --git a/db/migrations/1581805112048-AddAddressToLocation.ts b/db/migrations/1581805112048-AddAddressToLocation.ts
diff --git a/db/migrations/1584278611086-AddNotNullToVenuesLocationId.ts b/db/migrations/1584278611086-AddNotNullToVenuesLocationId.ts
diff --git a/...grations/1596397477642-RemoveLocations.ts → ...ns/1596398030640-AddLocationFieldsToDB.ts b/...grations/1596397477642-RemoveLocations.ts → ...ns/1596398030640-AddLocationFieldsToDB.ts
@@ -1,17 +1,12 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
 
-export class RemoveLocations1596397477642 implements MigrationInterface {
-  name = 'RemoveLocations1596397477642';
+export class AddLocationFieldsToDB1596398030640 implements MigrationInterface {
+  name = 'AddLocationFieldsToDB1596398030640';
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DROP TABLE "locations"`);
-    await queryRunner.query(`ALTER TABLE "venues" DROP CONSTRAINT "FK_937d4cf54512864b1a842482c13"`);
-    await queryRunner.query(`ALTER TABLE "chapters" DROP CONSTRAINT "FK_95d978cb93804fa26283d6741cf"`);
-    await queryRunner.query(`ALTER TABLE "venues" DROP COLUMN "location_id"`);
-    await queryRunner.query(`ALTER TABLE "chapters" DROP COLUMN "location_id"`);
-    await queryRunner.query(`ALTER TABLE "venues" ADD "street_address" character varying NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "venues" ADD "street_address" character varying`);
     await queryRunner.query(`ALTER TABLE "venues" ADD "city" character varying NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "venues" ADD "postal_code" integer NOT NULL`);
+    await queryRunner.query(`ALTER TABLE "venues" ADD "postal_code" character varying NOT NULL`);
     await queryRunner.query(`ALTER TABLE "venues" ADD "region" character varying NOT NULL`);
     await queryRunner.query(`ALTER TABLE "venues" ADD "country" character varying NOT NULL`);
     await queryRunner.query(`ALTER TABLE "venues" ADD "latitude" double precision`);
@@ -22,18 +17,6 @@ export class RemoveLocations1596397477642 implements MigrationInterface {
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "locations" (
-            "id" SERIAL NOT NULL,
-            "country_code" character varying NOT NULL,
-            "city" character varying NOT NULL,
-            "region" character varying NOT NULL,
-            "postal_code" character varying NOT NULL,
-            "created_at" TIMESTAMP NOT NULL DEFAULT now(),
-            "updated_at" TIMESTAMP NOT NULL DEFAULT now(),
-            CONSTRAINT "PK_7cc1c9e3853b94816c094825e74" PRIMARY KEY ("id"))`,
-      undefined,
-    );
     await queryRunner.query(`ALTER TABLE "chapters" DROP COLUMN "country"`);
     await queryRunner.query(`ALTER TABLE "chapters" DROP COLUMN "region"`);
     await queryRunner.query(`ALTER TABLE "chapters" DROP COLUMN "city"`);
@@ -44,9 +27,5 @@ export class RemoveLocations1596397477642 implements MigrationInterface {
     await queryRunner.query(`ALTER TABLE "venues" DROP COLUMN "postal_code"`);
     await queryRunner.query(`ALTER TABLE "venues" DROP COLUMN "city"`);
     await queryRunner.query(`ALTER TABLE "venues" DROP COLUMN "street_address"`);
-    await queryRunner.query(`ALTER TABLE "chapters" ADD "location_id" integer`);
-    await queryRunner.query(`ALTER TABLE "venues" ADD "location_id" integer NOT NULL`);
-    await queryRunner.query(`ALTER TABLE "chapters" ADD CONSTRAINT "FK_95d978cb93804fa26283d6741cf" FOREIGN KEY ("location_id") REFERENCES "locations"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
-    await queryRunner.query(`ALTER TABLE "venues" ADD CONSTRAINT "FK_937d4cf54512864b1a842482c13" FOREIGN KEY ("location_id") REFERENCES "locations"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
   }
 }
diff --git a/server/models/Venue.ts b/server/models/Venue.ts
@@ -1,14 +1,14 @@
 import { Column, Entity, OneToMany } from 'typeorm';
 import { BaseModel } from './BaseModel';
 import { Event } from './Event';
-import { Field, ObjectType, Float, Int } from 'type-graphql';
+import { Field, ObjectType, Float } from 'type-graphql';
 
 interface IVenueProps {
   name: string;
   events?: Event[];
-  street_address: string;
+  street_address?: string;
   city: string;
-  postal_code: number;
+  postal_code: string;
   region: string;
   country: string;
   latitude?: number;
@@ -29,17 +29,17 @@ export class Venue extends BaseModel {
   )
   events!: Event[];
 
-  @Field(() => String)
-  @Column()
-  street_address: string;
+  @Field(() => String, { nullable: true })
+  @Column({ nullable: true })
+  street_address?: string;
 
   @Field(() => String)
   @Column()
   city: string;
 
-  @Field(() => Int)
+  @Field(() => String)
   @Column()
-  postal_code: number;
+  postal_code: string;
 
   @Field(() => String)
   @Column()