Fix the import function parameters

Author: e32wong

services/api/src/service/csvImport.ts

@@ -149,15 +149,15 @@ export async function processCsvImport(props: ProcessCsvImportProps) {
         db: props.db,
         voteBuffer: props.voteBuffer,
         importedPolisConversation,
-        polisUrl: "", // Empty for CSV imports
-        polisUrlType: "conversation",
+        importConfig: {
+            method: "csv",
+        },
         proof: props.proof,
         didWrite: props.didWrite,
         authorId: props.authorId,
         postAsOrganization: props.postAsOrganization,
         indexConversationAt: props.indexConversationAt,
         isLoginRequired: props.isLoginRequired,
         isIndexed: props.isIndexed,
-        importMethod: "csv",
     });
 }

services/api/src/service/import.ts

@@ -11,44 +11,51 @@ import {
     MAX_LENGTH_TITLE,
     toUnionUndefined,
 } from "@/shared/shared.js";
-import {
-    conversationTable,
-    conversationUpdateQueueTable,
-} from "@/shared-backend/schema.js";
+import { conversationUpdateQueueTable } from "@/shared-backend/schema.js";
 import { nowZeroMs } from "@/shared/util.js";
-import { eq } from "drizzle-orm";
 import type { VoteBuffer } from "./voteBuffer.js";
 
+// URL import configuration
+export interface UrlImportConfig {
+    method: "url";
+    polisUrl: string;
+    polisUrlType: "report" | "conversation";
+}
+
+// CSV import configuration
+export interface CsvImportConfig {
+    method: "csv";
+}
+
+// Discriminated union for import configuration
+export type ImportConfig = UrlImportConfig | CsvImportConfig;
+
 interface LoadImportedPolisConversationProps {
     db: PostgresDatabase;
     voteBuffer: VoteBuffer;
-    polisUrl: string;
-    polisUrlType: "report" | "conversation";
     importedPolisConversation: ImportPolisResults;
+    importConfig: ImportConfig;
     proof: string;
     didWrite: string;
     authorId: string;
     postAsOrganization: string | undefined;
     indexConversationAt?: string;
     isLoginRequired: boolean;
     isIndexed: boolean;
-    importMethod: "url" | "csv";
 }
 
 export async function loadImportedPolisConversation({
     db,
     voteBuffer,
     importedPolisConversation,
-    polisUrl,
-    polisUrlType,
+    importConfig,
     proof,
     didWrite,
     authorId,
     postAsOrganization,
     indexConversationAt,
     isLoginRequired,
     isIndexed,
-    importMethod,
 }: LoadImportedPolisConversationProps): Promise<ConversationIds> {
     const now = nowZeroMs();
     // create conversation
@@ -74,7 +81,7 @@ export async function loadImportedPolisConversation({
     let conversationBody = `${trimmedBody}<br /><br />--------------`;
 
     // Handle messaging based on import method
-    if (importMethod === "csv") {
+    if (importConfig.method === "csv") {
         // CSV imports
         conversationBody = `${conversationBody}<br />This conversation was imported from Polis CSV files.`;
         // For CSV imports, link_url might be available from summary.csv
@@ -85,8 +92,8 @@ export async function loadImportedPolisConversation({
         }
     } else {
         // URL imports (existing behavior)
-        if (polisUrlType === "conversation") {
-            conversationUrl = polisUrl;
+        if (importConfig.polisUrlType === "conversation") {
+            conversationUrl = importConfig.polisUrl;
             conversationBody = `${conversationBody}<br />This conversation was initially imported from ${conversationUrl}.`;
             reportUrl =
                 importedPolisConversation.report_id !== null
@@ -102,7 +109,7 @@ export async function loadImportedPolisConversation({
                 null
                     ? `https://pol.is/${String(importedPolisConversation.conversation_data.conversation_id)}`
                     : undefined); // should never be undefined, but as we rely on external systems we don't control, better safe than sorry
-            reportUrl = polisUrl;
+            reportUrl = importConfig.polisUrl;
             conversationBody = `${conversationBody}<br />This conversation was initially imported from ${reportUrl}.`;
             if (conversationUrl !== undefined) {
                 conversationBody = `${conversationBody}<br />The original conversation url is ${conversationUrl}.`;
@@ -144,12 +151,15 @@ export async function loadImportedPolisConversation({
             isIndexed: isIndexed,
             isLoginRequired: isLoginRequired,
             seedOpinionList: [],
-            importUrl: importMethod === "csv" ? undefined : polisUrl,
+            importUrl:
+                importConfig.method === "csv"
+                    ? undefined
+                    : importConfig.polisUrl,
             importConversationUrl: conversationUrl,
             importExportUrl: reportUrl,
             importCreatedAt: importCreatedAt,
             importAuthor: toUnionUndefined(ownername),
-            importMethod: importMethod,
+            importMethod: importConfig.method,
         });
     try {
         const {

services/api/src/service/post.ts

@@ -11,7 +11,7 @@ import {
 import { eq, sql, and } from "drizzle-orm";
 import type { ImportConversationResponse } from "@/shared/types/dto.js";
 import { generateRandomSlugId } from "@/crypto.js";
-import { log, config } from "@/app.js";
+import { log } from "@/app.js";
 import { useCommonPost } from "./common.js";
 import { httpErrors } from "@fastify/sensible";
 import type { ExtendedConversation, PolisUrl } from "@/shared/types/zod.js";
@@ -108,16 +108,18 @@ export async function importConversation({
             db,
             voteBuffer,
             importedPolisConversation,
-            polisUrlType,
-            polisUrl,
+            importConfig: {
+                method: "url",
+                polisUrl,
+                polisUrlType,
+            },
             proof: proof,
             didWrite: didWrite,
             authorId: authorId,
             postAsOrganization: postAsOrganization,
             indexConversationAt,
             isLoginRequired,
             isIndexed,
-            importMethod: "url",
         });
     return {
         conversationSlugId: conversationSlugId,