[questions][chore] update to use company table values (#351)

Co-authored-by: Jeff Sieu <jeffsy00@gmail.com>

apps/portal/prisma/migrations/20221010055218_update_question_encounter_to_use_company_id/migration.sql

@@ -0,0 +1,13 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `company` on the `QuestionsQuestionEncounter` table. All the data in the column will be lost.
+  - Added the required column `companyId` to the `QuestionsQuestionEncounter` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "QuestionsQuestionEncounter" DROP COLUMN "company",
+ADD COLUMN     "companyId" TEXT NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "QuestionsQuestionEncounter" ADD CONSTRAINT "QuestionsQuestionEncounter_companyId_fkey" FOREIGN KEY ("companyId") REFERENCES "Company"("id") ON DELETE SET NULL ON UPDATE CASCADE;

apps/portal/prisma/schema.prisma

@@ -98,6 +98,8 @@ model Company {
     logoUrl     String?
     createdAt   DateTime @default(now())
     updatedAt   DateTime @updatedAt
+
+    questionsQuestionEncounter QuestionsQuestionEncounter[]
     OffersExperience OffersExperience[]
     OffersOffer      OffersOffer[]
 }
@@ -406,14 +408,15 @@ model QuestionsQuestionEncounter {
     id         String   @id @default(cuid())
     questionId String
     userId     String?
-  // TODO: sync with models
+    // TODO: sync with models (location, role)
-  company    String   @db.Text
+    companyId  String
     location   String   @db.Text
     role       String   @db.Text
     seenAt     DateTime
     createdAt  DateTime @default(now())
     updatedAt  DateTime @updatedAt
 
+    company  Company?          @relation(fields: [companyId], references: [id], onDelete: SetNull)
     user     User?             @relation(fields: [userId], references: [id], onDelete: SetNull)
     question QuestionsQuestion @relation(fields: [questionId], references: [id], onDelete: Cascade)
 }

apps/portal/src/components/questions/ContributeQuestionForm.tsx

@@ -84,9 +84,8 @@ export default function ContributeQuestionForm({
             name="company"
             render={({ field }) => (
               <CompaniesTypeahead
-                onSelect={({ label }) => {
+                onSelect={({ id }) => {
-                  // TODO: To change from using company name to company id (i.e., value)
+                  field.onChange(id);
-                  field.onChange(label);
                 }}
               />
             )}

apps/portal/src/pages/questions/index.tsx

@@ -65,7 +65,7 @@ export default function QuestionsHomePage() {
     [
       'questions.questions.getQuestionsByFilter',
       {
-        companies: selectedCompanies,
+        companyNames: selectedCompanies,
         endDate: today,
         locations: selectedLocations,
         questionTypes: selectedQuestionTypes,
@@ -252,7 +252,7 @@ export default function QuestionsHomePage() {
               <ContributeQuestionCard
                 onSubmit={(data) => {
                   createQuestion({
-                    company: data.company,
+                    companyId: data.company,
                     content: data.questionContent,
                     location: data.location,
                     questionType: data.questionType,

apps/portal/src/server/router/questions-question-router.ts

@@ -9,7 +9,7 @@ import type { Question } from '~/types/questions';
 export const questionsQuestionRouter = createProtectedRouter()
   .query('getQuestionsByFilter', {
     input: z.object({
-      companies: z.string().array(),
+      companyNames: z.string().array(),
       endDate: z.date(),
       locations: z.string().array(),
       questionTypes: z.nativeEnum(QuestionsQuestionType).array(),
@@ -53,33 +53,34 @@ export const questionsQuestionRouter = createProtectedRouter()
             : {}),
           encounters: {
             some: {
-              ...(input.companies.length > 0
+              ...(input.companyNames.length > 0
                 ? {
                     company: {
-                      in : input.companies
+                      name: {
-                    }
+                        in: input.companyNames,
+                      },
+                    },
                   }
                 : {}),
               ...(input.locations.length > 0
                 ? {
                     location: {
-                      in: input.locations
+                      in: input.locations,
                     },
                   }
                 : {}),
               ...(input.roles.length > 0
                 ? {
                     role: {
-                      in: input.roles
+                      in: input.roles,
-                    }
+                    },
                   }
                 : {}),
-            }
+            },
-          }
+          },
         },
       });
-      return questionsData
+      return questionsData.map((data) => {
-        .map((data) => {
         const votes: number = data.votes.reduce(
           (previousValue: number, currentValue) => {
             let result: number = previousValue;
@@ -98,7 +99,7 @@ export const questionsQuestionRouter = createProtectedRouter()
         );
 
         const question: Question = {
-            company: data.encounters[0].company,
+          company: data.encounters[0].company!.name ?? 'Unknown company',
           content: data.content,
           id: data.id,
           location: data.encounters[0].location ?? 'Unknown location',
@@ -171,7 +172,7 @@ export const questionsQuestionRouter = createProtectedRouter()
       );
 
       const question: Question = {
-        company: questionData.encounters[0].company,
+        company: questionData.encounters[0].company!.name ?? 'Unknown company',
         content: questionData.content,
         id: questionData.id,
         location: questionData.encounters[0].location ?? 'Unknown location',
@@ -189,7 +190,7 @@ export const questionsQuestionRouter = createProtectedRouter()
   })
   .mutation('create', {
     input: z.object({
-      company: z.string(),
+      companyId: z.string(),
       content: z.string(),
       location: z.string(),
       questionType: z.nativeEnum(QuestionsQuestionType),
@@ -199,17 +200,25 @@ export const questionsQuestionRouter = createProtectedRouter()
     async resolve({ ctx, input }) {
       const userId = ctx.session?.user?.id;
 
-      const question = await ctx.prisma.questionsQuestion.create({
+      return await ctx.prisma.questionsQuestion.create({
         data: {
           content: input.content,
           encounters: {
             create: [
               {
-                company: input.company,
+                company: {
+                  connect: {
+                    id: input.companyId,
+                  },
+                },
                 location: input.location,
                 role: input.role,
                 seenAt: input.seenAt,
-                userId,
+                user: {
+                  connect: {
+                    id: userId,
+                  },
+                },
               },
             ],
           },
@@ -217,20 +226,6 @@ export const questionsQuestionRouter = createProtectedRouter()
           userId,
         },
       });
-
-      // Create question encounter
-      await ctx.prisma.questionsQuestionEncounter.create({
-        data: {
-          company: input.company,
-          location: input.location,
-          questionId: question.id,
-          role: input.role,
-          seenAt: input.seenAt,
-          userId,
-        },
-      });
-
-      return question;
     },
   })
   .mutation('update', {
@@ -259,7 +254,6 @@ export const questionsQuestionRouter = createProtectedRouter()
       const { content, questionType } = input;
 
       return await ctx.prisma.questionsQuestion.update({
-
         data: {
           content,
           questionType,

apps/portal/src/types/questions.d.ts

@@ -1,3 +1,5 @@
+import type { QuestionsQuestionType } from '@prisma/client';
+
 export type Question = {
   // TODO: company, location, role maps
   company: string;
@@ -9,7 +11,7 @@ export type Question = {
   numVotes: number;
   role: string;
   seenAt: Date;
-  type: stringl;
+  type: QuestionsQuestionType;
   updatedAt: Date;
   user: string;
 };