From 6d418bfe18c5da3bf381f3751dc4ee0f969a0434 Mon Sep 17 00:00:00 2001 From: Yaroslav_Kiriak Date: Thu, 18 Jan 2024 18:27:29 +0200 Subject: [PATCH] MODSOURMAN-1063: adjust recordProcessingLogDto.json and add recordProcessingLogDtoCollection.json schema (#304) --- ramls/metadata-provider.raml | 4 +- ramls/raml-storage | 2 +- ramls/tmpSchemas/recordProcessingLogDto.json | 134 ------------------ .../recordProcessingLogDtoCollection.json | 27 ---- 4 files changed, 3 insertions(+), 164 deletions(-) delete mode 100644 ramls/tmpSchemas/recordProcessingLogDto.json delete mode 100644 ramls/tmpSchemas/recordProcessingLogDtoCollection.json diff --git a/ramls/metadata-provider.raml b/ramls/metadata-provider.raml index fab04351d..2088a9fe3 100644 --- a/ramls/metadata-provider.raml +++ b/ramls/metadata-provider.raml @@ -17,8 +17,8 @@ types: errors: !include raml-storage/raml-util/schemas/errors.schema jobExecutionSourceChunk: !include raml-storage/schemas/mod-source-record-manager/jobExecutionSourceChunk.json journalRecordCollection: !include raml-storage/schemas/mod-source-record-manager/journalRecordCollection.json - recordProcessingLogDto: !include tmpSchemas/recordProcessingLogDto.json - recordProcessingLogDtoCollection: !include tmpSchemas/recordProcessingLogDtoCollection.json + recordProcessingLogDto: !include raml-storage/schemas/dto/recordProcessingLogDto.json + recordProcessingLogDtoCollection: !include raml-storage/schemas/dto/recordProcessingLogDtoCollection.json jobExecutionSummaryDto: !include raml-storage/schemas/dto/jobExecutionSummaryDto.json jobProfileInfoCollection: !include raml-storage/schemas/common/profileInfoCollection.json jobExecutionUserInfoCollection: !include raml-storage/schemas/dto/jobExecutionUserInfoCollection.json diff --git a/ramls/raml-storage b/ramls/raml-storage index 603cabe6d..3f6af3f26 160000 --- a/ramls/raml-storage +++ b/ramls/raml-storage @@ -1 +1 @@ -Subproject commit 603cabe6de718edb0476a8bbf55280989fc7cbfa +Subproject commit 3f6af3f264dfa984338afe128412f0e20d02e361 diff --git a/ramls/tmpSchemas/recordProcessingLogDto.json b/ramls/tmpSchemas/recordProcessingLogDto.json deleted file mode 100644 index 7fe97a591..000000000 --- a/ramls/tmpSchemas/recordProcessingLogDto.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Record processing log DTO schema", - "javaType": "org.folio.rest.jaxrs.model.RecordProcessingLogDto", - "type": "object", - "additionalProperties": false, - "properties": { - "jobExecutionId": { - "description": "UUID", - "$ref": "../raml-storage/raml-util/schemas/uuid.schema" - }, - "incomingRecordId ": { - "description": "Incoming record identifier, UUID", - "$ref": "../raml-storage/raml-util/schemas/uuid.schema" - }, - "sourceRecordId": { - "description": "SRS record identifier, UUID", - "$ref": "../raml-storage/raml-util/schemas/uuid.schema" - }, - "sourceRecordOrder": { - "description": "Order of a record in imported file", - "type": "string" - }, - "sourceRecordTitle": { - "description": "Title from record", - "type": "string" - }, - "sourceRecordActionStatus": { - "description": "Status of action performed above a record", - "$ref": "../raml-storage/schemas/dto/actionStatus.json" - }, - "sourceRecordType": { - "description": "Type of entity", - "type": "string", - "$ref": "../raml-storage/schemas/dto/recordType.json" - }, - "error": { - "description": "Error message", - "type": "string" - }, - "sourceRecordTenantId": { - "description": "Id of tenant in which action was performed over record", - "type": "string" - }, - "relatedInstanceInfo": { - "description": "Information about instance associated with source record", - "$ref": "../raml-storage/schemas/dto/processedEntityInfo.json" - }, - "relatedHoldingsInfo": { - "description": "Information about holdings associated with source record", - "type": "array", - "items": { - "$ref": "../raml-storage/schemas/dto/processedHoldingsInfo.json" - } - }, - "relatedItemInfo": { - "description": "Information about item associated with source record", - "type": "array", - "items": { - "$ref": "../raml-storage/schemas/dto/processedItemInfo.json" - } - }, - "relatedAuthorityInfo": { - "description": "Information about authority associated with source record", - "$ref": "../raml-storage/schemas/dto/processedEntityInfo.json" - }, - "relatedPoLineInfo": { - "description": "Information about poLine associated with source record", - "properties": { - "actionStatus": { - "description": "Status of action performed above folio entity, value MULTIPLE if multiple entities of the same type were affected", - "$ref": "../raml-storage/schemas/dto/actionStatus.json" - }, - "idList": { - "description": "Id of entities which were affected during data import process", - "type": "array", - "items": { - "$ref": "../raml-storage/raml-util/schemas/uuid.schema" - } - }, - "hridList": { - "description": "Human readable id of entities which were affected during data import process", - "type": "array", - "items": { - "type": "string" - } - }, - "error": { - "description": "Error message", - "type": "string" - }, - "orderId": { - "description": "Order identifier, UUID", - "$ref": "../raml-storage/raml-util/schemas/uuid.schema" - } - } - }, - "relatedInvoiceInfo": { - "description": "Information about invoice associated with source record", - "$ref": "../raml-storage/schemas/dto/processedEntityInfo.json" - }, - "relatedInvoiceLineInfo": { - "description": "Information about invoice line associated with source record", - "type": "object", - "additionalProperties": false, - "properties": { - "actionStatus": { - "description": "Status of action performed with invoice line", - "$ref": "../raml-storage/schemas/dto/actionStatus.json" - }, - "id": { - "description": "Invoice line identifier, UUID", - "$ref": "../raml-storage/raml-util/schemas/uuid.schema" - }, - "fullInvoiceLineNumber": { - "description": "Consists of vendor invoice number and invoice line sequence number", - "type": "string" - }, - "error": { - "description": "Error message", - "type": "string" - } - } - }, - "invoiceLineJournalRecordId": { - "description": "UUID of journalRecord which keeps data of particular invoice line processing", - "$ref": "../raml-storage/raml-util/schemas/uuid.schema" - } - }, - "required": [ - "jobExecutionId", - "sourceRecordOrder" - ] -} diff --git a/ramls/tmpSchemas/recordProcessingLogDtoCollection.json b/ramls/tmpSchemas/recordProcessingLogDtoCollection.json deleted file mode 100644 index 9384e6ac4..000000000 --- a/ramls/tmpSchemas/recordProcessingLogDtoCollection.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#", - "description": "Collection of record processing logs", - "type": "object", - "additionalProperties": false, - "properties": { - "entries": { - "description": "List of of record processing logs", - "type": "array", - "id": "entries", - "items": { - "$ref": "recordProcessingLogDto.json" - } - }, - "totalRecords": { - "description": "Total number of records in collection", - "type": "integer" - } - }, - "excludedFromEqualsAndHashCode": [ - "totalRecords" - ], - "required": [ - "entries", - "totalRecords" - ] -}