Merge branch 'main' into environment/staging

Author: alexander2001i

packages/core/.gitignore

@@ -2,5 +2,7 @@
 .env.staging
 .env.production
 
+prisma/schema.prisma
+
 **/secrets/*
 

packages/core/package.json

@@ -7,7 +7,9 @@
     "dev": "yarn compile:watch",
     "compile": "tsc -p tsconfig.json && yarn fix:paths",
     "compile:watch": "tsc-watch --onSuccess \"yarn fix:paths\"",
-    "fix:paths": "tscpaths -p tsconfig.json -s ./src -o ./dist"
+    "fix:paths": "tscpaths -p tsconfig.json -s ./src -o ./dist",
+    "create:schema": "find prisma -name '*.prisma' -not -name \"schema.prisma\" -exec cat {} + > prisma/schema.prisma  && prisma format",
+    "create:migration": "yarn create:schema && prisma migrate dev"
   },
   "devDependencies": {
     "@types/request-ip": "^0.0.35",

packages/core/prisma/base.prisma

@@ -0,0 +1,15 @@
+datasource db {
+  provider = "postgresql"
+  url      = env("Database.Url")
+}
+
+generator client {
+  provider = "prisma-client-js"
+}
+
+// ---- Shared
+
+enum FundingType {
+  OneTime
+  Monthly
+}

packages/core/prisma/migrations/20210410091827_initial_discussions_migration/migration.sql

@@ -0,0 +1,55 @@
+-- CreateEnum
+CREATE TYPE "DiscussionType" AS ENUM ('ProposalDiscussion', 'CommonDiscussion');
+
+-- CreateEnum
+CREATE TYPE "DiscussionSubscriptionType" AS ENUM ('AllNotifications', 'OnlyMentions', 'NoNotification');
+
+-- CreateEnum
+CREATE TYPE "DiscussionMessageType" AS ENUM ('Message');
+
+-- CreateTable
+CREATE TABLE "Discussion"
+(
+    "id"            TEXT         NOT NULL,
+    "createdAt"     TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt"     TIMESTAMP(3) NOT NULL,
+    "topic"         TEXT         NOT NULL,
+    "description"   TEXT         NOT NULL,
+    "latestMessage" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "DiscussionSubscription"
+(
+    "id"                TEXT                         NOT NULL,
+    "createdAt"         TIMESTAMP(3)                 NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt"         TIMESTAMP(3)                 NOT NULL,
+    "latestMessageSeen" TIMESTAMP(3)                 NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "type"              "DiscussionSubscriptionType" NOT NULL DEFAULT E'AllNotifications',
+    "discussionId"      TEXT                         NOT NULL,
+
+    PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "DiscussionMessage"
+(
+    "id"           TEXT                    NOT NULL,
+    "createdAt"    TIMESTAMP(3)            NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt"    TIMESTAMP(3)            NOT NULL,
+    "type"         "DiscussionMessageType" NOT NULL DEFAULT E'Message',
+    "message"      TEXT                    NOT NULL,
+    "discussionId" TEXT,
+
+    PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "DiscussionSubscription"
+    ADD FOREIGN KEY ("discussionId") REFERENCES "Discussion" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionMessage"
+    ADD FOREIGN KEY ("discussionId") REFERENCES "Discussion" ("id") ON DELETE SET NULL ON UPDATE CASCADE;

packages/core/prisma/migrations/20210412050840_discussion_links_migration/migration.sql

@@ -0,0 +1,26 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `latestMessageSeen` on the `DiscussionSubscription` table. All the data in the column will be lost.
+  - Added the required column `userId` to the `DiscussionMessage` table without a default value. This is not possible if the table is not empty.
+  - Made the column `discussionId` on table `DiscussionMessage` required. This step will fail if there are existing NULL values in that column.
+  - Added the required column `userId` to the `DiscussionSubscription` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "DiscussionMessage"
+    ADD COLUMN "userId" TEXT NOT NULL,
+    ALTER COLUMN "discussionId" SET NOT NULL;
+
+-- AlterTable
+ALTER TABLE "DiscussionSubscription"
+    DROP COLUMN "latestMessageSeen",
+    ADD COLUMN "userId" TEXT NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionMessage"
+    ADD FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DiscussionSubscription"
+    ADD FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/core/prisma/migrations/20210412051108_proposal_common_discussion/migration.sql

@@ -0,0 +1,18 @@
+/*
+  Warnings:
+
+  - Added the required column `commonId` to the `Discussion` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Discussion"
+    ADD COLUMN "commonId"   TEXT NOT NULL,
+    ADD COLUMN "proposalId" TEXT;
+
+-- AddForeignKey
+ALTER TABLE "Discussion"
+    ADD FOREIGN KEY ("commonId") REFERENCES "Common" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Discussion"
+    ADD FOREIGN KEY ("proposalId") REFERENCES "Proposal" ("id") ON DELETE SET NULL ON UPDATE CASCADE;

packages/core/prisma/migrations/20210412052009_discussion_creator/migration.sql

@@ -0,0 +1,13 @@
+/*
+  Warnings:
+
+  - Added the required column `userId` to the `Discussion` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Discussion"
+    ADD COLUMN "userId" TEXT NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "Discussion"
+    ADD FOREIGN KEY ("userId") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/core/prisma/migrations/20210412052219_discussion_event_types/migration.sql

@@ -0,0 +1,11 @@
+-- AlterEnum
+-- This migration adds more than one value to an enum.
+-- With PostgreSQL versions 11 and earlier, this is not possible
+-- in a single migration. This can be worked around by creating
+-- multiple migrations, each migration adding only one value to
+-- the enum.
+
+
+ALTER TYPE "EventType" ADD VALUE 'DiscussionCreated';
+ALTER TYPE "EventType" ADD VALUE 'DiscussionMessageCreated';
+ALTER TYPE "EventType" ADD VALUE 'DiscussionSubscriptionCreated';

packages/core/prisma/migrations/20210412053758_discussion_type/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `type` to the `Discussion` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Discussion" ADD COLUMN     "type" "DiscussionType" NOT NULL;

packages/core/prisma/migrations/20210413051920_discussion_subscription_type_changed_event_added/migration.sql

@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "EventType" ADD VALUE 'DiscussionSubscriptionTypeChanged';