Enhancement: Update rows via import (debug)

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

cypress/e2e/tables-import.cy.js

@@ -61,6 +61,40 @@ describe('Import csv', () => {
 		cy.get('[data-cy="importResultRowErrors"]').should('contain.text', '0')
 	})
 
+	it('Import csv from device with updating of existent files', () => {
+		cy.intercept({ method: 'GET', url: '**/apps/tables/row/table/*' }).as('rowsReq')
+
+		cy.loadTable('Welcome to Nextcloud Tables!')
+
+		cy.wait('@rowsReq').then(({ response }) => {
+			const firstRow = response.body[0]
+			const csv = [
+				['id', 'What', 'How to do'],
+				[firstRow.id, 'What (Updated)', 'How to do (Updated)'],
+			]
+
+			cy.writeFile('cypress/fixtures/test-import-update.csv', csv.map(row => row.join(',')).join('\n'))
+		})
+
+		cy.clickOnTableThreeDotMenu('Import')
+		cy.get('.modal__content button').contains('Upload from device').click()
+		cy.get('input[type="file"]').selectFile('cypress/fixtures/test-import-update.csv', { force: true })
+
+		cy.get('.modal__content button').contains('Preview').click()
+		cy.get('.file_import__preview tbody tr', { timeout: 20000 }).should('have.length', 3)
+
+		cy.intercept({ method: 'POST', url: '**/apps/tables/importupload/table/*'}).as('importUploadReq')
+		cy.get('.modal__content button').contains('Import').click()
+		cy.wait('@importUploadReq')
+		cy.get('[data-cy="importResultColumnsFound"]', { timeout: 20000 }).should('contain.text', '2')
+		cy.get('[data-cy="importResultColumnsMatch"]').should('contain.text', '3')
+		cy.get('[data-cy="importResultColumnsCreated"]').should('contain.text', '0')
+		cy.get('[data-cy="importResultRowsInserted"]').should('contain.text', '0')
+		cy.get('[data-cy="importResultRowsUpdated"]').should('contain.text', '1')
+		cy.get('[data-cy="importResultParsingErrors"]').should('contain.text', '0')
+		cy.get('[data-cy="importResultRowErrors"]').should('contain.text', '0')
+	})
+
 })
 
 describe('Import csv from Files file action', () => {

lib/Service/ColumnService.php

@@ -470,7 +470,7 @@ public function findOrCreateColumnsByTitleForTableAsArray(?int $tableId, ?int $v
 				$result[$i] = '';
 			}
 			// if column was not found
-			if ($result[$i] === '' && $createUnknownColumns) {
+			if ($result[$i] === '' && $createUnknownColumns && $dataTypes[$i]['type'] !== Column::TYPE_META_ID) {
 				$description = $this->l->t('This column was automatically created by the import service.');
 				$result[$i] = $this->create(
 					$userId,

lib/Service/ImportService.php

@@ -33,7 +33,6 @@
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
-use Throwable;
 use TypeError;
 use function file_exists;
 use function is_string;
@@ -185,7 +184,7 @@ private function getPreviewData(Worksheet $worksheet): array {
 				$colIndex = $cellIterator->getCurrentColumnIndex() - 1;
 				$column = $this->columns[$colIndex];
 
-				if (!array_key_exists($colIndex, $this->columns)) {
+				if (!array_key_exists($colIndex, $columns)) {
 					continue;
 				}
 
@@ -421,7 +420,7 @@ private function upsertRow(Row $row): void {
 				}
 
 				$columnKey = $i;
-				if ($this->idColumnIndex !== null && $i > $this->idColumnIndex) {
+				if ($this->columnsConfig && $this->idColumnIndex !== null && $i > $this->idColumnIndex) {
 					// if we have an ID column, we need to adjust the index
 					$columnKey = $i - 1;
 				}
@@ -557,6 +556,8 @@ private function getColumns(Row $firstRow, Row $secondRow): void {
 
 				if (!$this->columnsConfig && mb_strtolower($title) === Column::META_ID_TITLE) {
 					$this->idColumnIndex = $index;
+					$titles[] = $title;
+					$dataTypes[] = ['type' => Column::TYPE_META_ID];
 					$secondRowCellIterator->next();
 					$index++;
 					continue;

tests/integration/features/APIv1.feature

@@ -269,7 +269,7 @@ Feature: APIv1
       |         | new row     | 100     |
     When user imports file "update-rows.csv" into last created table
     Then import results have the following data
-      | found_columns_count    | 2 |
+      | found_columns_count    | 3 |
       | matching_columns_count | 2 |
       | created_columns_count  | 0 |
       | inserted_rows_count    | 1 |