fix(eval): revamped sentiment analysis logic

jhdcruz · Nov 14, 2024 · af8ae1f · af8ae1f
1 parent bc64f98
commit af8ae1f
Show file tree

Hide file tree

Showing 8 changed files with 201 additions and 176 deletions.
diff --git a/src/app/eval/_components/Forms/BeneficiariesForm.tsx b/src/app/eval/_components/Forms/BeneficiariesForm.tsx
@@ -27,6 +27,7 @@ import { ThemeSwitcher } from '@/components/Buttons/ThemeSwitcher';
 import { RatingField } from './RatingFields';
 
 export interface BeneficiariesFeedbackProps {
+  idempotencyKey?: string;
   id?: string;
   type?: Enums<'feedback_type'>;
   respondent: {
@@ -74,6 +75,7 @@ const BeneficiariesForm = ({
     validateInputOnChange: true,
 
     initialValues: {
+      idempotencyKey: uuid,
       id: activity.id!,
       type: 'beneficiaries',
       respondent: {
@@ -117,9 +119,9 @@ const BeneficiariesForm = ({
     },
   });
 
-  const handleSubmit = async () => {
+  const handleSubmit = async (values: typeof form.values) => {
     setLoading(true);
-    const result = await submitFeedback(form);
+    const result = await submitFeedback(values);
     setLoading(false);
 
     if (result?.status === 0) {
@@ -180,24 +182,6 @@ const BeneficiariesForm = ({
       </Affix>
 
       <form onSubmit={form.onSubmit(handleSubmit)}>
-        <TextInput
-          key={form.key('idempotencyKey')}
-          type="hidden"
-          value={uuid}
-          {...form.getInputProps('idempotencyKey')}
-        />
-
-        <TextInput
-          key={form.key('id')}
-          type="hidden"
-          {...form.getInputProps('id')}
-        />
-        <TextInput
-          key={form.key('type')}
-          type="hidden"
-          {...form.getInputProps('type')}
-        />
-
         <Fieldset legend="Beneficiary Information (Optional)" my="md">
           <TextInput
             description="First Name, Middle Initial, Last Name, Suffix (if any)"

diff --git a/src/app/eval/_components/Forms/ImplementersForm.tsx b/src/app/eval/_components/Forms/ImplementersForm.tsx
@@ -26,6 +26,7 @@ import { ThemeSwitcher } from '@/components/Buttons/ThemeSwitcher';
 import { RatingField } from './RatingFields';
 
 export interface ImplementerFeedbackProps {
+  idempotencyKey?: string;
   id?: string;
   type?: Enums<'feedback_type'>;
   respondent: {
@@ -93,6 +94,7 @@ const ImplementersForm = ({
     validateInputOnChange: true,
 
     initialValues: {
+      idempotencyKey: uuid,
       id: activity.id!,
       type: 'implementers',
       respondent: {
@@ -171,9 +173,9 @@ const ImplementersForm = ({
     },
   });
 
-  const handleSubmit = async () => {
+  const handleSubmit = async (values: typeof form.values) => {
     setLoading(true);
-    const result = await submitFeedback(form);
+    const result = await submitFeedback(values);
     setLoading(false);
 
     if (result?.status === 0) {
@@ -238,24 +240,6 @@ const ImplementersForm = ({
       </Affix>
 
       <form onSubmit={form.onSubmit(handleSubmit)}>
-        <TextInput
-          key={form.key('idempotencyKey')}
-          type="hidden"
-          value={uuid}
-          {...form.getInputProps('idempotencyKey')}
-        />
-
-        <TextInput
-          key={form.key('id')}
-          type="hidden"
-          {...form.getInputProps('id')}
-        />
-        <TextInput
-          key={form.key('type')}
-          type="hidden"
-          {...form.getInputProps('type')}
-        />
-
         <Fieldset legend="Implementer's Information" my="md">
           <TextInput
             description="First Name, Middle Initial, Last Name, Suffix (if any)"

diff --git a/src/app/eval/_components/Forms/PartnersForm.tsx b/src/app/eval/_components/Forms/PartnersForm.tsx
@@ -22,6 +22,7 @@ import { ThemeSwitcher } from '@/components/Buttons/ThemeSwitcher';
 import { RatingField } from './RatingFields';
 
 export interface PartnersFeedbackProps {
+  idempotencyKey?: string;
   id?: string;
   type?: Enums<'feedback_type'>;
   respondent: {
@@ -67,6 +68,7 @@ const PartnersForm = ({
     validateInputOnChange: true,
 
     initialValues: {
+      idempotencyKey: uuid,
       id: activity.id!,
       type: 'partners',
       respondent: {
@@ -122,9 +124,9 @@ const PartnersForm = ({
     },
   });
 
-  const handleSubmit = async () => {
+  const handleSubmit = async (values: typeof form.values) => {
     setLoading(true);
-    const result = await submitFeedback(form);
+    const result = await submitFeedback(values);
     setLoading(false);
 
     if (result?.status === 0) {
@@ -184,24 +186,6 @@ const PartnersForm = ({
       </Affix>
 
       <form onSubmit={form.onSubmit(handleSubmit)}>
-        <TextInput
-          key={form.key('idempotencyKey')}
-          type="hidden"
-          value={uuid}
-          {...form.getInputProps('idempotencyKey')}
-        />
-
-        <TextInput
-          key={form.key('id')}
-          type="hidden"
-          {...form.getInputProps('id')}
-        />
-        <TextInput
-          key={form.key('type')}
-          type="hidden"
-          {...form.getInputProps('type')}
-        />
-
         <Fieldset legend="Partner's Information" my="md">
           <TextInput
             description="First Name, Middle Initial, Last Name, Suffix (if any)"

diff --git a/src/app/eval/actions.ts b/src/app/eval/actions.ts
@@ -1,13 +1,15 @@
 'use server';
 
 import { cookies } from 'next/headers';
-import { UseFormReturnType } from '@mantine/form';
 import { createServerClient } from '@/libs/supabase/server';
 import {
   analyzePartner,
   analyzeBeneficiary,
   analyzeImplementer,
 } from '@/trigger/analyze-feedback';
+import type { ImplementerFeedbackProps } from './_components/Forms/ImplementersForm';
+import type { PartnersFeedbackProps } from './_components/Forms/PartnersForm';
+import type { BeneficiariesFeedbackProps } from './_components/Forms/BeneficiariesForm';
 import type ApiResponse from '@/utils/response';
 
 /**
@@ -16,14 +18,16 @@ import type ApiResponse from '@/utils/response';
  * @param form - Form data using PartnersFeedbackProps type.
  */
 export async function submitFeedback(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  form: UseFormReturnType<any>,
+  form:
+    | ImplementerFeedbackProps
+    | PartnersFeedbackProps
+    | BeneficiariesFeedbackProps,
 ): Promise<ApiResponse> {
   const cookieStore = cookies();
   const supabase = await createServerClient(cookieStore);
 
   // separate id and type from the rest
-  const { id, idempotencyKey, type, ...feedback } = form.values;
+  const { id, idempotencyKey, type, ...feedback } = form;
 
   const { data, error } = await supabase
     .from('activity_feedback')
@@ -32,7 +36,9 @@ export async function submitFeedback(
       type: type!,
       response: feedback,
     })
-    .select();
+    .select('id')
+    .limit(1)
+    .single();
 
   if (error) {
     return {
@@ -45,33 +51,33 @@ export async function submitFeedback(
   switch (type) {
     case 'beneficiaries':
       // analyze beneficiary feedback
-      analyzeBeneficiary.trigger(
-        { id: id!, form: feedback },
+      await analyzeBeneficiary.trigger(
+        { id: data.id, form: feedback as BeneficiariesFeedbackProps },
         {
           idempotencyKey: idempotencyKey,
-          tags: [`activity_${id}`, 'type_beneficiary'],
+          tags: [`activity_${id}`, `feedback_${data.id}`, 'type_beneficiary'],
         },
       );
       break;
 
     case 'partners':
       // analyze partner feedback
-      analyzePartner.trigger(
-        { id: id!, form: feedback },
+      await analyzePartner.trigger(
+        { id: data.id, form: feedback as PartnersFeedbackProps },
         {
           idempotencyKey: idempotencyKey,
-          tags: [`activity_${id}`, 'type_partner'],
+          tags: [`activity_${id}`, `feedback_${data.id}`, 'type_partner'],
         },
       );
       break;
 
     case 'implementers':
       // analyze implementers feedback
-      analyzeImplementer.trigger(
-        { id: id!, form: feedback },
+      await analyzeImplementer.trigger(
+        { id: data.id, form: feedback as ImplementerFeedbackProps },
         {
           idempotencyKey: idempotencyKey,
-          tags: [`activity_${id}`, 'type_implementer'],
+          tags: [`activity_${id}`, `feedback_${data.id}`, 'type_implementer'],
         },
       );
       break;