feat(utils/coda): Replace updateOrInsertRow with upsertRow

Author: monyarm

packages/mcl/src/src/mcl/commands/host_info.d

@@ -113,7 +113,7 @@ Info getInfo(Params params)
             CodaCell("JSON", info.toJSON(true).toPrettyString(JSONOptions.doNotEscapeSlashes))
         ]);
 
-        coda.updateOrInsertRow(docId, hostTableId, hostValues);
+        coda.upsertRow(docId, hostTableId, hostValues);
 
         auto cpuValues = RowValues([
             CodaCell("Host Name", info.softwareInfo.hostname),
@@ -122,7 +122,7 @@ Info getInfo(Params params)
             CodaCell("Architecture", info.hardwareInfo.processorInfo.architectureInfo.architecture),
             CodaCell("Flags", info.hardwareInfo.processorInfo.architectureInfo.flags),
         ]);
-        coda.updateOrInsertRow(docId, cpuTableId, cpuValues);
+        coda.upsertRow(docId, cpuTableId, cpuValues);
 
         auto memoryValues = RowValues([
             CodaCell("Host Name", info.softwareInfo.hostname),
@@ -134,7 +134,7 @@ Info getInfo(Params params)
             CodaCell("Total", info.hardwareInfo.memoryInfo.total),
             CodaCell("Speed", info.hardwareInfo.memoryInfo.speed),
         ]);
-        coda.updateOrInsertRow(docId, memoryTableId, memoryValues);
+        coda.upsertRow(docId, memoryTableId, memoryValues);
 
         auto motherboardValues = RowValues([
             CodaCell("Host Name", info.softwareInfo.hostname),
@@ -147,15 +147,15 @@ Info getInfo(Params params)
             CodaCell("BIOS Release", info.hardwareInfo.motherboardInfo.biosInfo.release),
             CodaCell("BIOS Date", info.hardwareInfo.motherboardInfo.biosInfo.date)
         ]);
-        coda.updateOrInsertRow(docId, motherboardTableId, motherboardValues);
+        coda.upsertRow(docId, motherboardTableId, motherboardValues);
 
         auto gpuValues = RowValues([
             CodaCell("Host Name", info.softwareInfo.hostname),
             CodaCell("Vendor", info.hardwareInfo.graphicsProcessorInfo.vendor),
             CodaCell("Model", info.hardwareInfo.graphicsProcessorInfo.model),
             CodaCell("VRam", info.hardwareInfo.graphicsProcessorInfo.vram)
         ]);
-        coda.updateOrInsertRow(docId, gpuTableId, gpuValues);
+        coda.upsertRow(docId, gpuTableId, gpuValues);
 
         auto osValues = RowValues([
             CodaCell("Host Name", info.softwareInfo.hostname),
@@ -164,15 +164,15 @@ Info getInfo(Params params)
             CodaCell("Kernel", info.softwareInfo.operatingSystemInfo.kernel),
             CodaCell("Kernel Version", info.softwareInfo.operatingSystemInfo.kernelVersion)
         ]);
-        coda.updateOrInsertRow(docId, osTableId, osValues);
+        coda.upsertRow(docId, osTableId, osValues);
 
         auto storageValues = RowValues([
             CodaCell("Host Name", info.softwareInfo.hostname),
             CodaCell("Count", info.hardwareInfo.storageInfo.devices.length.to!string),
             CodaCell("Total", info.hardwareInfo.storageInfo.total),
             CodaCell("JSON", info.hardwareInfo.storageInfo.toJSON(true).toPrettyString(JSONOptions.doNotEscapeSlashes))
         ]);
-        coda.updateOrInsertRow(docId, storageTableId, storageValues);
+        coda.upsertRow(docId, storageTableId, storageValues);
     }
     else
         writeln("No Coda API token specified -> not uploading");

packages/mcl/src/src/mcl/utils/coda.d

@@ -34,6 +34,7 @@ import std.stdio : writeln, writefln;
 import std.algorithm : map, filter, find;
 import std.exception : assertThrown;
 import std.sumtype : SumType;
+import std.array : join;
 import core.thread;
 
 struct CodaApiClient
@@ -438,8 +439,6 @@ struct CodaApiClient
             req["keyColumns"] = JSONValue(keyColumns.toJSON);
         return post!InsertRowsReturn(url, req, false).addedRowIds;
     }
-    alias upsertRows = insertRows;
-
 
     // Can't be implemented because of the lack of support for a body in DELETE requests
     // void deleteRows(string documentId, string tableId, string[] rowIds)
@@ -496,7 +495,7 @@ struct CodaApiClient
         string id;
     }
 
-    string updateRow(string documentId, string tableId, string rowId, RowValues row)
+    string updateRow(string documentId, string tableId, string rowId, RowValues row, string[] keyColumns = [])
     {
         string url = "/docs/%s/tables/%s/rows/%s".format(documentId, tableId, rowId);
         JSONValue req = JSONValue(
@@ -527,15 +526,11 @@ struct CodaApiClient
         coda.deleteRow("dEJJPwdxcw", tables[0].id, resp[0]);
     }
 
-    void updateOrInsertRow(string docId, string tableId, RowValues values) {
-        auto table = listRows(docId, tableId);
-        auto rows = find!(row => row.name == values.cells[0].value)(table);
-        if (rows.length > 0) {
-            updateRow(docId, tableId, rows[0].id, values);
-        }
-        else {
-            insertRows(docId, tableId, [values]);
-        }
+    void upsertRow(string docId, string tableId, RowValues values, string[] keyColumns = ["name"]) {
+        insertRows(docId, tableId, [values], keyColumns);
+    }
+    void upsertRows(string docId, string tableId, RowValues[] values, string[] keyColumns = ["name"]) {
+        insertRows(docId, tableId, values, keyColumns);
     }
     struct PushButtonResponse {
         string requestId;