fix: obsolete experimental-use-server-side-upsert option (#1125)

Author: nameless-mc

features/record/import.feature

@@ -123,12 +123,12 @@ Feature: record import
     And The output error message should match with the pattern: "\[403] \[GAIA_NO01] Using this API token, you cannot run the specified API."
 
   Scenario: API token does not have privilege to view and edit records
-    Given The CSV file "CliKintoneTest-29.csv" with content as below:
-      | Text  | Number |
-      | Alice | 11     |
-    And The app "app_for_import" has some records as below:
+    Given The app "app_for_import" has some records as below:
       | Text  | Number |
       | Alice | 10     |
+    And The CSV file "CliKintoneTest-29.csv" with content as below:
+      | Record_number | Text  | Number |
+      |               | Alice | 11     |
     And Load app ID of the app "app_for_import" as env var: "APP_ID"
     And Load app token of the app "app_for_import" with exact permissions "add" as env var: "API_TOKEN_IMPORT"
     When I run the command with args "record import --base-url $$TEST_KINTONE_BASE_URL --app $APP_ID --api-token $API_TOKEN_IMPORT --file-path CliKintoneTest-29.csv --update-key Record_number"

src/cli/record/import.ts

@@ -45,12 +45,6 @@ const builder = (args: yargs.Argv) =>
       describe: "The fields to be imported in comma-separated",
       type: "string",
       requiresArg: true,
-    })
-    .option("experimental-use-server-side-upsert", {
-      describe:
-        "Use server-side upsert. This option is under early development.",
-      type: "boolean",
-      default: false,
     });
 
 type Args = yargs.Arguments<
@@ -71,7 +65,6 @@ const handler = (args: Args) => {
     filePath: args["file-path"],
     updateKey: args["update-key"],
     fields: args.fields?.split(","),
-    useServerSideUpsert: args["experimental-use-server-side-upsert"],
     encoding: args.encoding,
     pfxFilePath: args["pfx-file-path"],
     pfxFilePassword: args["pfx-file-password"],

src/record/import/index.ts

@@ -4,15 +4,13 @@ import type { SupportedImportEncoding } from "../../utils/file";
 import { extractFileFormat, openFsStreamWithEncode } from "../../utils/file";
 import { addRecords } from "./usecases/add";
 import { upsertRecords } from "./usecases/upsert";
-import { upsertRecords as upsertRecordsServerSide } from "./usecases/upsertServerSide";
 import { createSchema } from "./schema";
 import { noop as defaultTransformer } from "./schema/transformers/noop";
 import { userSelected } from "./schema/transformers/userSelected";
 import { logger } from "../../utils/log";
 import { LocalRecordRepositoryFromStream } from "./repositories/localRecordRepositoryFromStream";
 import { RunError } from "../error";
 import { isMismatchEncoding } from "../../utils/encoding";
-import { emitExperimentalWarning } from "../../utils/stability";
 
 export type Options = {
   app: string;
@@ -21,7 +19,6 @@ export type Options = {
   updateKey?: string;
   encoding?: SupportedImportEncoding;
   fields?: string[];
-  useServerSideUpsert?: boolean;
 };
 
 export const run: (
@@ -35,7 +32,6 @@ export const run: (
       attachmentsDir,
       updateKey,
       fields,
-      useServerSideUpsert,
       ...restApiClientOptions
     } = argv;
 
@@ -64,35 +60,17 @@ export const run: (
 
     const skipMissingFields = !fields;
     if (updateKey) {
-      if (useServerSideUpsert) {
-        emitExperimentalWarning(
-          "Use server-side upsert. This option is under early development.",
-          logger,
-        );
-        await upsertRecordsServerSide(
-          apiClient,
-          app,
-          localRecordRepository,
-          schema,
-          updateKey,
-          {
-            attachmentsDir,
-            skipMissingFields,
-          },
-        );
-      } else {
-        await upsertRecords(
-          apiClient,
-          app,
-          localRecordRepository,
-          schema,
-          updateKey,
-          {
-            attachmentsDir,
-            skipMissingFields,
-          },
-        );
-      }
+      await upsertRecords(
+        apiClient,
+        app,
+        localRecordRepository,
+        schema,
+        updateKey,
+        {
+          attachmentsDir,
+          skipMissingFields,
+        },
+      );
     } else {
       await addRecords(apiClient, app, localRecordRepository, schema, {
         attachmentsDir,

src/record/import/usecases/__tests__/upsert/fixtures/upsertByNumber/expected.ts

@@ -7,6 +7,7 @@ export const expected: TestPattern["expected"] = {
         type: "update",
         payload: {
           app: "1",
+          upsert: true,
           records: [
             {
               updateKey: {
@@ -25,26 +26,21 @@ export const expected: TestPattern["expected"] = {
                 },
               },
             },
-          ],
-        },
-      },
-      {
-        type: "add",
-        payload: {
-          app: "1",
-          records: [
             {
-              singleLineText: {
-                value: "value3",
-              },
-              number: {
+              updateKey: {
+                field: "number",
                 value: "3",
               },
-              date: {
-                value: "2022-04-01",
-              },
-              singleLineText_nonUnique: {
-                value: "value1",
+              record: {
+                singleLineText: {
+                  value: "value3",
+                },
+                date: {
+                  value: "2022-04-01",
+                },
+                singleLineText_nonUnique: {
+                  value: "value1",
+                },
               },
             },
           ],

src/record/import/usecases/__tests__/upsert/fixtures/upsertByRecordNumber/expected.ts

@@ -7,6 +7,7 @@ export const expected: TestPattern["expected"] = {
         type: "update",
         payload: {
           app: "1",
+          upsert: true,
           records: [
             {
               id: "1",
@@ -19,20 +20,15 @@ export const expected: TestPattern["expected"] = {
                 },
               },
             },
-          ],
-        },
-      },
-      {
-        type: "add",
-        payload: {
-          app: "1",
-          records: [
             {
-              singleLineText: {
-                value: "value3",
-              },
-              number: {
-                value: "3",
+              id: "3",
+              record: {
+                number: {
+                  value: "3",
+                },
+                singleLineText: {
+                  value: "value3",
+                },
               },
             },
           ],

src/record/import/usecases/__tests__/upsert/fixtures/upsertByRecordNumberWithAppCode/expected.ts

@@ -7,6 +7,7 @@ export const expected: TestPattern["expected"] = {
         type: "update",
         payload: {
           app: "1",
+          upsert: true,
           records: [
             {
               id: "1",
@@ -19,20 +20,15 @@ export const expected: TestPattern["expected"] = {
                 },
               },
             },
-          ],
-        },
-      },
-      {
-        type: "add",
-        payload: {
-          app: "1",
-          records: [
             {
-              singleLineText: {
-                value: "value3",
-              },
-              number: {
-                value: "3",
+              id: "3",
+              record: {
+                number: {
+                  value: "3",
+                },
+                singleLineText: {
+                  value: "value3",
+                },
               },
             },
           ],

src/record/import/usecases/__tests__/upsert/fixtures/upsertByRecordNumberWithAppCodeOnKintone/expected.ts

@@ -7,6 +7,7 @@ export const expected: TestPattern["expected"] = {
         type: "update",
         payload: {
           app: "1",
+          upsert: true,
           records: [
             {
               id: "1",
@@ -19,20 +20,15 @@ export const expected: TestPattern["expected"] = {
                 },
               },
             },
-          ],
-        },
-      },
-      {
-        type: "add",
-        payload: {
-          app: "1",
-          records: [
             {
-              singleLineText: {
-                value: "value3",
-              },
-              number: {
-                value: "3",
+              id: "3",
+              record: {
+                number: {
+                  value: "3",
+                },
+                singleLineText: {
+                  value: "value3",
+                },
               },
             },
           ],

src/record/import/usecases/__tests__/upsert/fixtures/upsertBySingleLineText/expected.ts

@@ -7,6 +7,7 @@ export const expected: TestPattern["expected"] = {
         type: "update",
         payload: {
           app: "1",
+          upsert: true,
           records: [
             {
               updateKey: {
@@ -25,26 +26,21 @@ export const expected: TestPattern["expected"] = {
                 },
               },
             },
-          ],
-        },
-      },
-      {
-        type: "add",
-        payload: {
-          app: "1",
-          records: [
             {
-              singleLineText: {
+              updateKey: {
+                field: "singleLineText",
                 value: "value3",
               },
-              number: {
-                value: "3",
-              },
-              date: {
-                value: "2022-04-01",
-              },
-              singleLineText_nonUnique: {
-                value: "value1",
+              record: {
+                number: {
+                  value: "3",
+                },
+                date: {
+                  value: "2022-04-01",
+                },
+                singleLineText_nonUnique: {
+                  value: "value1",
+                },
               },
             },
           ],