fix: applied DB row type / domain type / mapper pattern also to ropa.services.ts

Author: sgort

packages/backend/src/db/mappers.ts

@@ -1,5 +1,6 @@
-import { BpmnRow, FormRow, DocumentRow } from './types';
+import { BpmnRow, FormRow, DocumentRow, RopaRecordRow, RopaFieldRow } from './types';
 import { Bpmn, Form, Document } from '../domain/types';
+import { RopaRecord, RopaPersonalDataField } from '../types/ropa.types';
 
 export function mapBpmn(row: BpmnRow): Bpmn {
   return {
@@ -49,3 +50,46 @@ export function mapDocument(r: DocumentRow): Document {
     readonly: false,
   };
 }
+
+export function mapRopaRecord(
+  row: RopaRecordRow,
+  fields: RopaPersonalDataField[]
+): RopaRecord {
+  return {
+    id:                    row.id,
+    bpmnProcessId:         row.bpmn_process_id,
+    processLevel:          row.process_level as RopaRecord['processLevel'],
+    title:                 row.title,
+    controllerName:        row.controller_name,
+    controllerContact:     row.controller_contact,
+    dpoContact:            row.dpo_contact ?? undefined,
+    purpose:               row.purpose,
+    legalBasisUri:         row.legal_basis_uri,
+    legalBasisLabel:       row.legal_basis_label,
+    gdprArticle:           row.gdpr_article,
+    dataSubjects:          row.data_subjects,
+    recipients:            row.recipients,
+    thirdCountryTransfers: row.third_country_transfers,
+    thirdCountryDetails:   row.third_country_details ?? undefined,
+    retentionPeriod:       row.retention_period,
+    securityMeasures:      row.security_measures,
+    status:                row.status as RopaRecord['status'],
+    schemaVersion:         row.schema_version,
+    personalDataFields:    fields,
+    createdAt:             row.created_at.toISOString(),
+    updatedAt:             row.updated_at.toISOString(),
+  };
+}
+
+export function mapRopaField(row: RopaFieldRow): RopaPersonalDataField {
+  return {
+    id:              row.id,
+    ropaRecordId:    row.ropa_record_id,
+    formId:          row.form_id,
+    fieldKey:        row.field_key,
+    fieldLabel:      row.field_label,
+    dataCategory:    row.data_category,
+    specialCategory: row.special_category,
+    sortOrder:       row.sort_order,
+  };
+}

packages/backend/src/db/types.ts

@@ -38,3 +38,38 @@ export type DocumentRow = {
   created_at: Date;
   updated_at: Date;
 };
+
+export type RopaRecordRow = {
+  id: string;
+  bpmn_process_id: string;
+  process_level: string;
+  title: string;
+  controller_name: string;
+  controller_contact: string;
+  dpo_contact: string | null;
+  purpose: string;
+  legal_basis_uri: string;
+  legal_basis_label: string;
+  gdpr_article: string;
+  data_subjects: string;
+  recipients: string;
+  third_country_transfers: boolean;
+  third_country_details: string | null;
+  retention_period: string;
+  security_measures: string;
+  status: string;
+  schema_version: number;
+  created_at: Date;
+  updated_at: Date;
+};
+
+export type RopaFieldRow = {
+  id: string;
+  ropa_record_id: string;
+  form_id: string;
+  field_key: string;
+  field_label: string;
+  data_category: string;
+  special_category: boolean;
+  sort_order: number;
+};

packages/backend/src/services/ropa.service.ts

@@ -1,81 +1,41 @@
 import pool from '../db/pool';
-import { RopaRecord, RopaPersonalDataField, PublicRopaRecord } from '../types/ropa.types';
-
-// ─── Mapping helpers ──────────────────────────────────────────────────────────
-
-function rowToRecord(r: Record<string, unknown>, fields: RopaPersonalDataField[]): RopaRecord {
-  return {
-    id: r.id as string,
-    bpmnProcessId: r.bpmn_process_id as string,
-    processLevel: r.process_level as RopaRecord['processLevel'],
-    title: r.title as string,
-    controllerName: r.controller_name as string,
-    controllerContact: r.controller_contact as string,
-    dpoContact: (r.dpo_contact as string) ?? undefined,
-    purpose: r.purpose as string,
-    legalBasisUri: r.legal_basis_uri as string,
-    legalBasisLabel: r.legal_basis_label as string,
-    gdprArticle: r.gdpr_article as string,
-    dataSubjects: r.data_subjects as string,
-    recipients: r.recipients as string,
-    thirdCountryTransfers: r.third_country_transfers as boolean,
-    thirdCountryDetails: (r.third_country_details as string) ?? undefined,
-    retentionPeriod: r.retention_period as string,
-    securityMeasures: r.security_measures as string,
-    status: r.status as RopaRecord['status'],
-    schemaVersion: r.schema_version as number,
-    personalDataFields: fields,
-    createdAt: (r.created_at as Date).toISOString(),
-    updatedAt: (r.updated_at as Date).toISOString(),
-  };
-}
-
-function rowToField(r: Record<string, unknown>): RopaPersonalDataField {
-  return {
-    id: r.id as string,
-    ropaRecordId: r.ropa_record_id as string,
-    formId: r.form_id as string,
-    fieldKey: r.field_key as string,
-    fieldLabel: r.field_label as string,
-    dataCategory: r.data_category as string,
-    specialCategory: r.special_category as boolean,
-    sortOrder: r.sort_order as number,
-  };
-}
+import { RopaRecordRow, RopaFieldRow } from '../db/types';
+import { RopaRecord, PublicRopaRecord } from '../types/ropa.types';
+import { mapRopaRecord, mapRopaField } from '../db/mappers';
 
 // ─── CRUD ─────────────────────────────────────────────────────────────────────
 
 export async function listRopa(): Promise<RopaRecord[]> {
   if (!pool) return [];
-  const { rows: recordRows } = await pool.query(
+  const { rows: recordRows } = await pool.query<RopaRecordRow>(
     `SELECT * FROM ropa_records ORDER BY updated_at DESC`
   );
   if (recordRows.length === 0) return [];
   const ids = recordRows.map((r) => r.id);
-  const { rows: fieldRows } = await pool.query(
+  const { rows: fieldRows } = await pool.query<RopaFieldRow>(
     `SELECT * FROM ropa_personal_data_fields
      WHERE ropa_record_id = ANY($1) ORDER BY sort_order ASC`,
     [ids]
   );
   return recordRows.map((r) =>
-    rowToRecord(r, fieldRows.filter((f) => f.ropa_record_id === r.id).map(rowToField))
+    mapRopaRecord(r, fieldRows.filter((f) => f.ropa_record_id === r.id).map(mapRopaField))
   );
 }
 
 export async function getRopaById(id: string): Promise<RopaRecord | null> {
   if (!pool) return null;
-  const { rows } = await pool.query(`SELECT * FROM ropa_records WHERE id = $1`, [id]);
+  const { rows } = await pool.query<RopaRecordRow>(`SELECT * FROM ropa_records WHERE id = $1`, [id]);
   if (rows.length === 0) return null;
-  const { rows: fieldRows } = await pool.query(
+  const { rows: fieldRows } = await pool.query<RopaFieldRow>(
     `SELECT * FROM ropa_personal_data_fields WHERE ropa_record_id = $1 ORDER BY sort_order ASC`,
     [id]
   );
-  return rowToRecord(rows[0], fieldRows.map(rowToField));
+  return mapRopaRecord(rows[0], fieldRows.map(mapRopaField));
 }
 
 export async function getRopaByBpmnProcessId(bpmnProcessId: string): Promise<RopaRecord | null> {
   if (!pool) return null;
-  const { rows } = await pool.query(
+  const { rows } = await pool.query<RopaRecordRow>(
     `SELECT * FROM ropa_records WHERE bpmn_process_id = $1 ORDER BY updated_at DESC LIMIT 1`,
     [bpmnProcessId]
   );
@@ -187,18 +147,18 @@ export async function listPublicRopa(organisation?: string): Promise<PublicRopaR
     params.push(`%${organisation}%`);
     where += ` AND r.controller_name ILIKE $${params.length}`;
   }
-  const { rows: recordRows } = await pool.query(
+  const { rows: recordRows } = await pool.query<RopaRecordRow>(
     `SELECT * FROM ropa_records r ${where} ORDER BY r.updated_at DESC`,
     params
   );
   if (recordRows.length === 0) return [];
   const ids = recordRows.map((r) => r.id);
-  const { rows: fieldRows } = await pool.query(
+  const { rows: fieldRows } = await pool.query<RopaFieldRow>(
     `SELECT * FROM ropa_personal_data_fields WHERE ropa_record_id = ANY($1) ORDER BY sort_order ASC`,
     [ids]
   );
   return recordRows.map((r) => {
-    const full = rowToRecord(r, fieldRows.filter((f) => f.ropa_record_id === r.id).map(rowToField));
+    const full = mapRopaRecord(r, fieldRows.filter((f) => f.ropa_record_id === r.id).map(mapRopaField));
     // Strip internal fields before exposing publicly
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { schemaVersion, controllerContact, dpoContact, ...pub } = full;