Campos faltantes

apps/api/src/database/migrations/0009_eminent_ares.sql

@@ -0,0 +1,7 @@
+ALTER TABLE "training_surveys" ADD COLUMN "state" integer;--> statement-breakpoint
+ALTER TABLE "training_surveys" ADD COLUMN "municipality" integer;--> statement-breakpoint
+ALTER TABLE "training_surveys" ADD COLUMN "parish" integer;--> statement-breakpoint
+ALTER TABLE "training_surveys" ADD COLUMN "osp_responsible_email" text NOT NULL;--> statement-breakpoint
+ALTER TABLE "training_surveys" ADD CONSTRAINT "training_surveys_state_states_id_fk" FOREIGN KEY ("state") REFERENCES "public"."states"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "training_surveys" ADD CONSTRAINT "training_surveys_municipality_municipalities_id_fk" FOREIGN KEY ("municipality") REFERENCES "public"."municipalities"("id") ON DELETE set null ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "training_surveys" ADD CONSTRAINT "training_surveys_parish_parishes_id_fk" FOREIGN KEY ("parish") REFERENCES "public"."parishes"("id") ON DELETE set null ON UPDATE no action;

apps/api/src/database/migrations/meta/_journal.json

@@ -64,6 +64,13 @@
       "when": 1764623430844,
       "tag": "0008_plain_scream",
       "breakpoints": true
+    },
+    {
+      "idx": 9,
+      "version": "7",
+      "when": 1764883378610,
+      "tag": "0009_eminent_ares",
+      "breakpoints": true
     }
   ]
 }

apps/api/src/database/schema/surveys.ts

@@ -2,6 +2,7 @@ import * as t from 'drizzle-orm/pg-core';
 import { eq, lt, gte, ne, sql } from 'drizzle-orm';
 import { timestamps } from '../timestamps';
 import { users } from './auth';
+import { states, municipalities, parishes } from './general';
 
 
 // Tabla surveys
@@ -48,37 +49,47 @@ export const answersSurveys = t.pgTable(
 export const trainingSurveys = t.pgTable(
   'training_surveys',
   {
+    // Datos basicos
     id: t.serial('id').primaryKey(),
     firstname: t.text('firstname').notNull(),
     lastname: t.text('lastname').notNull(),
     visitDate: t.timestamp('visit_date').notNull(),
-    productiveActivity: t.text('productive_activity').notNull(),
-    financialRequirementDescription: t.text('financial_requirement_description').notNull(),
+    // ubicacion
+    state: t.integer('state').references(() => states.id, { onDelete: 'set null' }),
+    municipality: t.integer('municipality').references(() => municipalities.id, { onDelete: 'set null' }),
+    parish: t.integer('parish').references(() => parishes.id, { onDelete: 'set null' }),
     siturCodeCommune: t.text('situr_code_commune').notNull(),
     communalCouncil: t.text('communal_council').notNull(),
     siturCodeCommunalCouncil: t.text('situr_code_communal_council').notNull(),
+    // datos del OSP (ORGANIZACIÓN SOCIOPRODUCTIVA)
     ospName: t.text('osp_name').notNull(),
     ospAddress: t.text('osp_address').notNull(),
     ospRif: t.text('osp_rif').notNull(),
     ospType: t.text('osp_type').notNull(),
+    productiveActivity: t.text('productive_activity').notNull(),
+    financialRequirementDescription: t.text('financial_requirement_description').notNull(),
     currentStatus: t.text('current_status').notNull(),
     companyConstitutionYear: t.integer('company_constitution_year').notNull(),
     producerCount: t.integer('producer_count').notNull(),
     productDescription: t.text('product_description').notNull(),
     installedCapacity: t.text('installed_capacity').notNull(),
     operationalCapacity: t.text('operational_capacity').notNull(),
+    // datos del responsable
     ospResponsibleFullname: t.text('osp_responsible_fullname').notNull(),
     ospResponsibleCedula: t.text('osp_responsible_cedula').notNull(),
     ospResponsibleRif: t.text('osp_responsible_rif').notNull(),
     ospResponsiblePhone: t.text('osp_responsible_phone').notNull(),
+    ospResponsibleEmail: t.text('osp_responsible_email').notNull(),
     civilState: t.text('civil_state').notNull(),
     familyBurden: t.integer('family_burden').notNull(),
     numberOfChildren: t.integer('number_of_children').notNull(),
+    // datos adicionales
     generalObservations: t.text('general_observations').notNull(),
+    paralysisReason: t.text('paralysis_reason').notNull(),
+    // fotos
     photo1: t.text('photo1').notNull(),
     photo2: t.text('photo2').notNull(),
     photo3: t.text('photo3').notNull(),
-    paralysisReason: t.text('paralysis_reason').notNull(),
     ...timestamps,
   },
   (trainingSurveys) => ({

apps/api/src/features/training/dto/create-training.dto.ts

@@ -22,6 +22,18 @@ export class CreateTrainingDto {
     @IsString()
     financialRequirementDescription: string;
 
+    @ApiProperty()
+    @IsInt()
+    state: number;
+
+    @ApiProperty()
+    @IsInt()
+    municipality: number;
+
+    @ApiProperty()
+    @IsInt()
+    parish: number;
+
     @ApiProperty()
     @IsString()
     siturCodeCommune: string;
@@ -90,6 +102,10 @@ export class CreateTrainingDto {
     @IsString()
     ospResponsiblePhone: string;
 
+    @ApiProperty()
+    @IsString()
+    ospResponsibleEmail: string;
+
     @ApiProperty()
     @IsString()
     civilState: string;