Merge branch 'v3/api' of github.com:opensummerofcode/selections into feat/applicant-list

Author: archived-m

common/src/index.ts

@@ -4,5 +4,5 @@ export * from './types/Suggestion';
 export * from './types/User';
 export * from './types/Project';
 export * from './types/Profile';
-
+export * from './types/Skill';
 export * as queries from './graphql/queries';

common/src/types/Skill.ts

@@ -0,0 +1,4 @@
+export interface ISkill {
+  readonly id: number;
+  name: string;
+}

server/package.json

@@ -20,7 +20,9 @@
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
     "prisma:generate": "npx prisma generate",
-    "prisma:migrate": "npx prisma migrate dev"
+    "prisma:migrate": "npx prisma migrate dev",
+    "ts-node": "ts-node --compiler-options \"{\\\"module\\\":\\\"commonjs\\\"}\"",
+    "seed": "npx prisma db seed --preview-feature"
   },
   "dependencies": {
     "@nestjs/cli": "^7.6.0",
@@ -53,6 +55,7 @@
     "eslint": "^7.22.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-prettier": "^3.3.1",
+    "faker": "^5.5.3",
     "jest": "^26.6.3",
     "prettier": "^2.2.1",
     "prisma": "^2.26.0",

server/prisma/migrations/20210719195324_add_unique_constraint/migration.sql

@@ -4,13 +4,19 @@ CREATE TYPE "Role" AS ENUM ('USER', 'COACH', 'ADMIN');
 -- CreateEnum
 CREATE TYPE "Status" AS ENUM ('YES', 'MAYBE', 'NO');
 
+-- CreateEnum
+CREATE TYPE "OAuthProvider" AS ENUM ('GITHUB');
+
 -- CreateTable
 CREATE TABLE "User" (
     "id" SERIAL NOT NULL,
     "uuid" TEXT NOT NULL,
+    "externalId" TEXT,
+    "provider" "OAuthProvider",
     "email" TEXT NOT NULL,
-    "firstname" TEXT NOT NULL,
-    "lastname" TEXT NOT NULL,
+    "displayName" TEXT NOT NULL,
+    "firstname" TEXT,
+    "lastname" TEXT,
     "imageUrl" TEXT,
     "role" "Role" NOT NULL DEFAULT E'USER',
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -26,8 +32,8 @@ CREATE TABLE "Project" (
     "name" TEXT NOT NULL,
     "description" TEXT,
     "client" TEXT,
-    "template_url" TEXT,
-    "leadCoachId" INTEGER NOT NULL,
+    "templateUrl" TEXT,
+    "leadCoachId" INTEGER,
     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
 
@@ -87,7 +93,7 @@ CREATE TABLE "Address" (
 CREATE TABLE "Suggestion" (
     "id" SERIAL NOT NULL,
     "status" "Status" NOT NULL,
-    "Comment" TEXT NOT NULL,
+    "comment" TEXT NOT NULL,
     "applicantId" INTEGER NOT NULL,
     "suggesterId" INTEGER NOT NULL,
 
@@ -98,7 +104,7 @@ CREATE TABLE "Suggestion" (
 CREATE TABLE "Profile" (
     "id" SERIAL NOT NULL,
     "name" TEXT NOT NULL,
-    "image_url" TEXT NOT NULL,
+    "image_url" TEXT,
 
     PRIMARY KEY ("id")
 );
@@ -130,7 +136,7 @@ CREATE TABLE "Skill" (
 -- CreateTable
 CREATE TABLE "SkillLevel" (
     "id" SERIAL NOT NULL,
-    "level" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
 
     PRIMARY KEY ("id")
 );
@@ -141,7 +147,7 @@ CREATE TABLE "ApplicantSkill" (
     "skillId" INTEGER NOT NULL,
     "levelId" INTEGER NOT NULL,
 
-    PRIMARY KEY ("applicantId","skillId","levelId")
+    PRIMARY KEY ("applicantId","skillId")
 );
 
 -- CreateTable
@@ -175,41 +181,53 @@ CREATE TABLE "Question" (
 -- CreateIndex
 CREATE UNIQUE INDEX "User.uuid_unique" ON "User"("uuid");
 
+-- CreateIndex
+CREATE UNIQUE INDEX "User.externalId_unique" ON "User"("externalId");
+
 -- CreateIndex
 CREATE UNIQUE INDEX "User.email_unique" ON "User"("email");
 
+-- CreateIndex
+CREATE UNIQUE INDEX "Project.uuid_unique" ON "Project"("uuid");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Applicant.uuid_unique" ON "Applicant"("uuid");
+
 -- CreateIndex
 CREATE UNIQUE INDEX "Applicant.email_unique" ON "Applicant"("email");
 
 -- CreateIndex
 CREATE UNIQUE INDEX "Applicant.addressId_unique" ON "Applicant"("addressId");
 
 -- CreateIndex
-CREATE UNIQUE INDEX "SkillLevel.level_unique" ON "SkillLevel"("level");
+CREATE UNIQUE INDEX "Skill.name_unique" ON "Skill"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "SkillLevel.name_unique" ON "SkillLevel"("name");
 
 -- AddForeignKey
-ALTER TABLE "Project" ADD FOREIGN KEY ("leadCoachId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "Project" ADD FOREIGN KEY ("leadCoachId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "UsersOnProjects" ADD FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "UsersOnProjects" ADD FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "UsersOnProjects" ADD FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "UsersOnProjects" ADD FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "Applicant" ADD FOREIGN KEY ("addressId") REFERENCES "Address"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "ApplicantsOnProjects" ADD FOREIGN KEY ("applicantId") REFERENCES "Applicant"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "ApplicantsOnProjects" ADD FOREIGN KEY ("applicantId") REFERENCES "Applicant"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "ApplicantsOnProjects" ADD FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "ApplicantsOnProjects" ADD FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "Suggestion" ADD FOREIGN KEY ("applicantId") REFERENCES "Applicant"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "Suggestion" ADD FOREIGN KEY ("applicantId") REFERENCES "Applicant"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "Suggestion" ADD FOREIGN KEY ("suggesterId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "Suggestion" ADD FOREIGN KEY ("suggesterId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "ApplicantProfile" ADD FOREIGN KEY ("applicantId") REFERENCES "Applicant"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

server/prisma/migrations/20210720133549_/migration.sql

@@ -6,7 +6,7 @@ datasource db {
 
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["referentialActions"]
+  previewFeatures = ["referentialActions", "selectRelationCount"]
 }
 
 enum Role {
@@ -150,14 +150,14 @@ model ProjectProfile {
 
 model Skill {
   id         Int              @id @default(autoincrement())
-  name       String
+  name       String           @unique
   applicants ApplicantSkill[]
   projects   ProjectSkill[]
 }
 
 model SkillLevel {
   id             Int              @id @default(autoincrement())
-  level          String           @unique
+  name           String           @unique
   ApplicantSkill ApplicantSkill[]
 }
 
@@ -169,7 +169,7 @@ model ApplicantSkill {
   level       SkillLevel @relation(fields: [levelId], references: [id])
   levelId     Int
 
-  @@id([applicantId, skillId, levelId])
+  @@id([applicantId, skillId])
 }
 
 model ProjectSkill {

server/prisma/migrations/20210720200816_add_ondelete_cascade/migration.sql

@@ -0,0 +1,57 @@
+import { PrismaClient, Role } from '@prisma/client';
+import * as faker from 'faker';
+
+const prisma = new PrismaClient();
+
+async function main() {
+  console.log('seeding...');
+
+  // for (let i = 0; i < 10; i++) {
+  //   await prisma.user.upsert({
+  //     where: { email: faker.internet.email() },
+  //     update: {},
+  //     create: {
+  //       uuid: faker.datatype.uuid(),
+  //       email: faker.internet.email(),
+  //       firstname: faker.name.firstName(),
+  //       lastname: faker.name.lastName(),
+  //       role: Math.random() < 0.5 ? Role.COACH : Role.USER
+  //     }
+  //   });
+
+  //   const genders = ['male', 'female', 'nonbinary'];
+
+  //   await prisma.applicant.upsert({
+  //     where: { email: faker.internet.email() },
+  //     update: {},
+  //     create: {
+  //       uuid: faker.datatype.uuid(),
+  //       email: faker.internet.email(),
+  //       firstname: faker.name.firstName(),
+  //       lastname: faker.name.lastName(),
+  //       gender: genders[Math.floor(Math.random() * genders.length)],
+  //       nationality: 'Belgian',
+  //       phone: faker.phone.phoneNumber(),
+  //       address: {
+  //         create: {
+  //           addressLine: faker.address.streetAddress(),
+  //           city: faker.address.cityName(),
+  //           postalCode: faker.address.zipCode(),
+  //           state: faker.address.state(),
+  //           country: faker.address.country()
+  //         }
+  //       },
+  //       isAlumni: Math.random() < 0.5
+  //     }
+  //   });
+  // }
+}
+
+main()
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
+  });