@natlibfi/melinda-rest-api-commons 5.0.0-alpha.1 → 5.0.0-alpha.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,184 @@
1
+ import { MongoClient } from "mongodb";
2
+ import moment from "moment";
3
+ import httpStatus from "http-status";
4
+ import sanitize from "mongo-sanitize";
5
+ import { createLogger } from "@natlibfi/melinda-backend-commons";
6
+ import { Error as ApiError } from "@natlibfi/melinda-commons";
7
+ import { logError } from "./utils.js";
8
+ import { LOG_ITEM_TYPE } from "./constants.js";
9
+ export default async function(MONGO_URI, dbName = "rest-api") {
10
+ const logger = createLogger();
11
+ const client = await MongoClient.connect(MONGO_URI);
12
+ const db = client.db(dbName);
13
+ const collection = "logs";
14
+ return { addLogItem, query, queryById, getListOfLogs, getListOfCatalogers, getListOfCorrelationIds, getExpandedListOfLogs, protect, remove, removeBySequences };
15
+ async function addLogItem(logItem) {
16
+ const time = moment().toDate();
17
+ const newLogItem = {
18
+ ...logItem,
19
+ creationTime: time,
20
+ protected: false
21
+ };
22
+ try {
23
+ checkLogItemType(logItem.logItemType, false);
24
+ const result = await db.collection(collection).insertOne(newLogItem);
25
+ if (result.acknowledged) {
26
+ const { blobSequence, blobSequenceStart, blobSequenceEnd } = logItem;
27
+ const itemString = blobSequenceStart && blobSequenceEnd ? `${blobSequenceStart} - ${blobSequenceEnd}` : `${blobSequence}`;
28
+ logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId}, blobSequence(s): ${itemString}. ***`);
29
+ return;
30
+ }
31
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);
32
+ } catch (error) {
33
+ const errorMessage = error.payload || error.message || "";
34
+ logError(error);
35
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
36
+ }
37
+ }
38
+ async function query({ limit = 5, skip = 0, ...rest }) {
39
+ logger.debug(`Query params: ${JSON.stringify(rest)}`);
40
+ logger.debug(`Limit and skip params: ${limit} | ${skip}`);
41
+ checkLogItemType(rest.logItemType, false, false);
42
+ const result = await db.collection(collection).find(rest).sort({ creationTime: 1 }).skip(parseInt(skip, 10)).limit(parseInt(limit, 10)).toArray();
43
+ logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items! (skip: ${skip} limit: ${limit})` : "Not found!"}`);
44
+ return result;
45
+ }
46
+ async function queryById(correlationId, logItemType = LOG_ITEM_TYPE.MERGE_LOG, skip = 0, limit = 1) {
47
+ logger.debug(`QueryById: ${correlationId}, logItemType: ${logItemType}, skip: ${skip}, limit: ${limit}`);
48
+ const result = await db.collection(collection).find({ correlationId, logItemType }).sort({ blobSequence: 1 }).skip(parseInt(skip, 10)).limit(parseInt(limit, 10)).toArray();
49
+ logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : "Not found!"}`);
50
+ return result;
51
+ }
52
+ async function getListOfLogs(logItemType = LOG_ITEM_TYPE.MERGE_LOG) {
53
+ checkLogItemType(logItemType, true, true);
54
+ const result = await db.collection(collection).distinct("correlationId", { logItemType: `${logItemType}` });
55
+ logger.debug(`Query result for getListOfLogs: ${result.length > 0 ? `Found ${result.length} correlationIds for ${logItemType}!` : "Not found!"}`);
56
+ return result;
57
+ }
58
+ async function getListOfCatalogers() {
59
+ logger.debug(`Getting list of Catalogers`);
60
+ const result = await db.collection(collection).distinct("cataloger");
61
+ return result;
62
+ }
63
+ async function getListOfCorrelationIds() {
64
+ logger.debug(`Getting list of CorrelationIds`);
65
+ const result = await db.collection(collection).distinct("correlationId");
66
+ return result;
67
+ }
68
+ async function getExpandedListOfLogs({ logItemTypes = [LOG_ITEM_TYPE.MERGE_LOG, LOG_ITEM_TYPE.MATCH_LOG], catalogers = [], dateBefore = /* @__PURE__ */ new Date(), dateAfter = "2000-01-01", test = false }) {
69
+ logger.debug(`commons/getExpandedListOfLogs: logItemTypes: ${JSON.stringify(logItemTypes)}, dateAfter: ${dateAfter}, dateBefore: ${dateBefore}}, catalogers: ${JSON.stringify(catalogers)}`);
70
+ logger.silly(JSON.stringify(generateMatchObject({ logItemTypes, catalogers, dateBefore, dateAfter })));
71
+ const pipeline = [
72
+ // currently return only MERGE_LOG and MATCH_LOG
73
+ generateMatchObject({ logItemTypes, catalogers, dateBefore, dateAfter, test }),
74
+ {
75
+ "$sort": { "correlationId": 1, "logItemType": 1, "creationTime": 1 }
76
+ },
77
+ {
78
+ "$group": {
79
+ "_id": { "correlationId": "$correlationId", "logItemType": "$logItemType" },
80
+ "creationTime": { "$first": "$creationTime" },
81
+ "cataloger": { "$first": "$cataloger" },
82
+ "logCount": { "$sum": 1 }
83
+ }
84
+ },
85
+ {
86
+ "$sort": { "correlationId": 1, "logItemType": 1, "creationTime": 1 }
87
+ }
88
+ ];
89
+ const result = await db.collection(collection).aggregate(pipeline).toArray();
90
+ const fixedResult = result.map((logListing) => {
91
+ const { correlationId, logItemType } = logListing._id;
92
+ const { cataloger, creationTime, logCount } = logListing;
93
+ return { correlationId, logItemType, cataloger, creationTime, logCount };
94
+ });
95
+ logger.silly(`Query result: ${JSON.stringify(result)}`);
96
+ logger.silly(`Query result: ${JSON.stringify(fixedResult)}`);
97
+ logger.debug(`Query result: ${fixedResult.length > 0 ? `Found ${fixedResult.length} log items!` : "Not found!"}`);
98
+ return fixedResult;
99
+ function generateMatchObject({ logItemTypes: logItemTypes2, catalogers: catalogers2, dateBefore: dateBefore2, dateAfter: dateAfter2, test: test2 = false }) {
100
+ const matchOptions = {
101
+ "$match": {
102
+ "logItemType": logItemTypes2.length > 0 ? { "$in": logItemTypes2 } : /.*/ui,
103
+ "cataloger": catalogers2.length > 0 ? { "$in": catalogers2 } : /.*/ui,
104
+ "creationTime": {
105
+ "$gte": test2 ? new Date(dateAfter2).toISOString() : new Date(dateAfter2),
106
+ "$lte": test2 ? new Date(dateBefore2).toISOString() : new Date(dateBefore2)
107
+ }
108
+ }
109
+ };
110
+ return matchOptions;
111
+ }
112
+ }
113
+ async function protect(correlationId, blobSequence) {
114
+ logger.info(`Protecting in Mongo (${collection}) correlationId: ${correlationId}, blobSequence: ${blobSequence}`);
115
+ const cleanCorrelationId = sanitize(correlationId);
116
+ const cleanBlobSequence = sanitize(blobSequence);
117
+ const filter = blobSequence ? { correlationId: cleanCorrelationId, blobSequence: parseInt(cleanBlobSequence, 10) } : { correlationId: cleanCorrelationId };
118
+ try {
119
+ const result = await db.collection(collection).updateMany(
120
+ filter,
121
+ [
122
+ {
123
+ $set: {
124
+ modificationTime: moment().toDate(),
125
+ protected: { $not: "$protected" }
126
+ }
127
+ }
128
+ ]
129
+ );
130
+ return result;
131
+ } catch (error) {
132
+ const errorMessage = error.payload || error.message || "";
133
+ logError(error);
134
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
135
+ }
136
+ }
137
+ async function remove(correlationId, force = false) {
138
+ logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}`);
139
+ const clean = sanitize(correlationId);
140
+ const filter = force ? { correlationId: clean } : { correlationId: clean, protected: { $ne: true } };
141
+ try {
142
+ const result = await db.collection(collection).deleteMany(filter);
143
+ return result;
144
+ } catch (error) {
145
+ const errorMessage = error.payload || error.message || "";
146
+ logError(error);
147
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
148
+ }
149
+ }
150
+ async function removeBySequences(correlationId, sequences = [], force = false) {
151
+ logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}, sequences: ${sequences.length}`);
152
+ const clean = sanitize(correlationId);
153
+ const cleanSequences = sequences.filter((sequence) => Number.isInteger(Number(sequence)) && sequence > 0);
154
+ if (sequences.length !== cleanSequences.length) {
155
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Invalid sequences in removeBySequences. Sequences should be positive integers`);
156
+ }
157
+ const filter = force ? { correlationId: clean, blobSequence: { $in: cleanSequences } } : { correlationId: clean, blobSequence: { $in: sequences }, protected: { $ne: true } };
158
+ try {
159
+ const result = await db.collection(collection).deleteMany(filter);
160
+ return result;
161
+ } catch (error) {
162
+ const errorMessage = error.payload || error.message || "";
163
+ logError(error);
164
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);
165
+ }
166
+ }
167
+ function checkLogItemType(logItemType, errorUnknown = false, errorNotExisting = false) {
168
+ if (logItemType) {
169
+ const typeInLogItemTypes = Object.values(LOG_ITEM_TYPE).indexOf(logItemType) > -1;
170
+ if (typeInLogItemTypes) {
171
+ return logger.debug(`Valid logItemType: ${logItemType}`);
172
+ }
173
+ if (errorUnknown) {
174
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Unknown logItemType: ${logItemType}`);
175
+ }
176
+ return logger.debug(`WARN: We have unknown logType: ${logItemType}`);
177
+ }
178
+ if (errorNotExisting) {
179
+ throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `No logItemType: ${logItemType}`);
180
+ }
181
+ return logger.debug(`No logItemType: ${logItemType}`);
182
+ }
183
+ }
184
+ //# sourceMappingURL=mongoLog.js.map
@@ -0,0 +1,7 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../src/mongoLog.js"],
4
+ "sourcesContent": ["import {MongoClient} from 'mongodb';\nimport moment from 'moment';\nimport httpStatus from 'http-status';\nimport sanitize from 'mongo-sanitize';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {logError} from './utils.js';\nimport {LOG_ITEM_TYPE} from './constants.js';\n\n/**\n * Create log operator\n * @param {String} MONGO_URI connnection address to mongo\n * @param {String} dbName Mongo DB name, defaults 'rest-api'\n * @returns {Object} containing all log handling functions\n */\nexport default async function (MONGO_URI, dbName = 'rest-api') {\n const logger = createLogger();\n\n // Connect to mongo (MONGO)\n const client = await MongoClient.connect(MONGO_URI);\n const db = client.db(dbName);\n const collection = 'logs';\n return {addLogItem, query, queryById, getListOfLogs, getListOfCatalogers, getListOfCorrelationIds, getExpandedListOfLogs, protect, remove, removeBySequences};\n\n /**\n * Add log item to collection\n * @param {Object} logItem contains log item data\n * @returns void\n */\n async function addLogItem(logItem) {\n const time = moment().toDate();\n const newLogItem = {\n ...logItem,\n creationTime: time,\n protected: false\n };\n try {\n // console.log(newLogItem); // eslint-disable-line\n checkLogItemType(logItem.logItemType, false);\n const result = await db.collection(collection).insertOne(newLogItem);\n if (result.acknowledged) {\n const {blobSequence, blobSequenceStart, blobSequenceEnd} = logItem;\n const itemString = blobSequenceStart && blobSequenceEnd ? `${blobSequenceStart} - ${blobSequenceEnd}` : `${blobSequence}`;\n logger.info(`*** New ${logItem.logItemType} added for ${logItem.correlationId}, blobSequence(s): ${itemString}. ***`);\n // console.log('addLogItem done', result); // eslint-disable-line\n return;\n }\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR);\n } catch (error) {\n const errorMessage = error.payload || error.message || '';\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n }\n }\n\n /**\n * Query log items\n * @param {Integer} limit defaults 5\n * @param {Integer} skip defaults 0\n * @param {Object} rest query params\n * @returns result array\n */\n async function query({limit = 5, skip = 0, ...rest}) {\n logger.debug(`Query params: ${JSON.stringify(rest)}`);\n logger.debug(`Limit and skip params: ${limit} | ${skip}`);\n checkLogItemType(rest.logItemType, false, false);\n const result = await db.collection(collection)\n .find(rest)\n .sort({creationTime: 1})\n .skip(parseInt(skip, 10))\n .limit(parseInt(limit, 10))\n .toArray();\n //logger.debug(`Query result: ${result}`);\n logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items! (skip: ${skip} limit: ${limit})` : 'Not found!'}`);\n return result;\n }\n\n // DEVELOP: queryById returns jsut one (randomish) log! is this useful?\n /**\n * Get single log item by correlationId\n * @param {String} correlationId\n * @param {String} logItemType constant LOG_ITEM_TYPE defaults LOG_ITEM_TYPE.MERGE_LOG\n * @param {Integer} skip defaults 0\n * @param {Integer} limit defaults 1\n * @returns query result array\n */\n async function queryById(correlationId, logItemType = LOG_ITEM_TYPE.MERGE_LOG, skip = 0, limit = 1) {\n logger.debug(`QueryById: ${correlationId}, logItemType: ${logItemType}, skip: ${skip}, limit: ${limit}`);\n const result = await db.collection(collection)\n .find({correlationId, logItemType})\n .sort({blobSequence: 1})\n .skip(parseInt(skip, 10))\n .limit(parseInt(limit, 10))\n .toArray();\n logger.debug(`Query result: ${result.length > 0 ? `Found ${result.length} log items!` : 'Not found!'}`);\n return result;\n }\n\n // getListOfLogs returns list of correlationIds that have logs of given logItemType\n // if logItemType is not given, getListOfLogs returns list of correlationIds that have MERGE_LOG\n /**\n * Get list of correlationIds of logs filtered by logItemType\n * @param {String} logItemType constant LOG_ITEM_TYPE defaults LOG_ITEM_TYPE.MERGE_LOG\n * @returns Array of query results\n */\n async function getListOfLogs(logItemType = LOG_ITEM_TYPE.MERGE_LOG) {\n checkLogItemType(logItemType, true, true);\n //logger.debug(logItemType);\n // eslint-disable-next-line no-console\n // console.log(`${JSON.stringify(logItemType)}`);\n const result = await db.collection(collection)\n .distinct('correlationId', {logItemType: `${logItemType}`});\n logger.debug(`Query result for getListOfLogs: ${result.length > 0 ? `Found ${result.length} correlationIds for ${logItemType}!` : 'Not found!'}`);\n return result;\n }\n\n /**\n * Get list of catalogers from all available logs\n * @returns Array of query results\n */\n async function getListOfCatalogers() {\n logger.debug(`Getting list of Catalogers`);\n\n const result = await db.collection(collection)\n .distinct('cataloger');\n\n return result;\n }\n\n /**\n * Get list of correlationIds from all available logs\n * @returns Array of query results\n */\n async function getListOfCorrelationIds() {\n logger.debug(`Getting list of CorrelationIds`);\n\n const result = await db.collection(collection)\n .distinct('correlationId');\n\n return result;\n }\n\n\n /**\n * Get filtered list of logs with extra info. Give params in Object\n * @param {[String]} logItemTypes: String array of logItemTypes. Defaults [LOG_ITEM_TYPE.MERGE_LOG, LOG_ITEM_TYPE.MATCH_LOG]\n * @param {[String]} catalogers: String array of wanted catalogers. Defaults []\n * @param {String} dateBefore: String date schema 'YYYY-MM-DD'. Defaults new Date()\n * @param {String} dateAfter: String date schema 'YYYY-MM-DD'. Defaults '2000-01-01'\n * @param {Boolean} test: Boolean is this test run. Defaults false\n * @returns Parsed Object {'correlationId', 'logItemType', 'creationTime', 'cataloger', 'logCount'}\n */\n async function getExpandedListOfLogs({logItemTypes = [LOG_ITEM_TYPE.MERGE_LOG, LOG_ITEM_TYPE.MATCH_LOG], catalogers = [], dateBefore = new Date(), dateAfter = '2000-01-01', test = false}) {\n logger.debug(`commons/getExpandedListOfLogs: logItemTypes: ${JSON.stringify(logItemTypes)}, dateAfter: ${dateAfter}, dateBefore: ${dateBefore}}, catalogers: ${JSON.stringify(catalogers)}`);\n logger.silly(JSON.stringify(generateMatchObject({logItemTypes, catalogers, dateBefore, dateAfter}))); // eslint-disable-line\n //checkLogItemType(logItemType, false, false);\n //logger.debug(`Getting expanded list of logs`);\n const pipeline = [\n // currently return only MERGE_LOG and MATCH_LOG\n generateMatchObject({logItemTypes, catalogers, dateBefore, dateAfter, test}),\n {\n '$sort':\n {'correlationId': 1, 'logItemType': 1, 'creationTime': 1}\n },\n {\n '$group':\n {\n '_id': {'correlationId': '$correlationId', 'logItemType': '$logItemType'},\n 'creationTime': {'$first': '$creationTime'},\n 'cataloger': {'$first': '$cataloger'},\n 'logCount': {'$sum': 1}\n }\n },\n {\n '$sort':\n {'correlationId': 1, 'logItemType': 1, 'creationTime': 1}\n }\n ];\n\n const result = await db.collection(collection)\n .aggregate(pipeline)\n .toArray();\n\n const fixedResult = result.map((logListing) => {\n const {correlationId, logItemType} = logListing._id;\n const {cataloger, creationTime, logCount} = logListing;\n return {correlationId, logItemType, cataloger, creationTime, logCount};\n });\n\n logger.silly(`Query result: ${JSON.stringify(result)}`);\n logger.silly(`Query result: ${JSON.stringify(fixedResult)}`);\n\n logger.debug(`Query result: ${fixedResult.length > 0 ? `Found ${fixedResult.length} log items!` : 'Not found!'}`);\n return fixedResult;\n\n /**\n * Generate match object for aggregation pipeline\n * @param {[String]} logItemTypes: String array of logItemTypes.\n * @param {[String]} catalogers: String array of wanted catalogers\n * @param {String} dateBefore: String date schema 'YYYY-MM-DD'\n * @param {String} dateAfter: String date schema 'YYYY-MM-DD'\n * @param {Boolean} test: Boolean is this test run. Defaults false\n * @returns Match Object\n */\n function generateMatchObject({logItemTypes, catalogers, dateBefore, dateAfter, test = false}) {\n const matchOptions = {\n '$match': {\n 'logItemType': logItemTypes.length > 0 ? {'$in': logItemTypes} : /.*/ui,\n 'cataloger': catalogers.length > 0 ? {'$in': catalogers} : /.*/ui,\n 'creationTime': {\n '$gte': test ? new Date(dateAfter).toISOString() : new Date(dateAfter),\n '$lte': test ? new Date(dateBefore).toISOString() : new Date(dateBefore)\n }\n }\n };\n\n return matchOptions;\n }\n }\n\n /**\n * Protect logs from cleaning. Forced cleaning defaults 30days\n * @param {String} correlationId\n * @param {Integer} blobSequence\n * @returns result\n */\n async function protect(correlationId, blobSequence) {\n logger.info(`Protecting in Mongo (${collection}) correlationId: ${correlationId}, blobSequence: ${blobSequence}`);\n const cleanCorrelationId = sanitize(correlationId);\n const cleanBlobSequence = sanitize(blobSequence);\n const filter = blobSequence ? {correlationId: cleanCorrelationId, blobSequence: parseInt(cleanBlobSequence, 10)} : {correlationId: cleanCorrelationId};\n\n try {\n const result = await db.collection(collection).updateMany(\n filter,\n [\n {\n $set: {\n modificationTime: moment().toDate(),\n protected: {$not: '$protected'}\n }\n }\n ]\n );\n return result;\n } catch (error) {\n const errorMessage = error.payload || error.message || '';\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n }\n }\n\n /**\n * Remove logs\n * @param {String} correlationId\n * @param {Boolean} force defaults false\n * @returns result\n */\n async function remove(correlationId, force = false) {\n logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}`);\n const clean = sanitize(correlationId);\n const filter = force ? {correlationId: clean} : {correlationId: clean, protected: {$ne: true}};\n\n try {\n const result = await db.collection(collection).deleteMany(filter);\n return result;\n } catch (error) {\n const errorMessage = error.payload || error.message || '';\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n }\n }\n\n /**\n * Remove logs by sequences\n * @param {String} correlationId\n * @param {[Integer]} sequences\n * @param {Boolean} force defaults false\n * @returns result\n */\n async function removeBySequences(correlationId, sequences = [], force = false) {\n logger.info(`Removing from Mongo (${collection}) correlationId: ${correlationId}, sequences: ${sequences.length}`);\n const clean = sanitize(correlationId);\n // blobSequences are integers that start from 1\n // we accept also strings that are convertilble to integers greated than 0\n const cleanSequences = sequences.filter(sequence => Number.isInteger(Number(sequence)) && sequence > 0);\n\n if (sequences.length !== cleanSequences.length) {\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Invalid sequences in removeBySequences. Sequences should be positive integers`);\n }\n\n const filter = force ? {correlationId: clean, blobSequence: {$in: cleanSequences}} : {correlationId: clean, blobSequence: {$in: sequences}, protected: {$ne: true}};\n\n try {\n const result = await db.collection(collection).deleteMany(filter);\n return result;\n } catch (error) {\n const errorMessage = error.payload || error.message || '';\n logError(error);\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Mongo errored: ${errorMessage}`);\n }\n }\n\n /**\n * Checks existence and validity of logItemType\n * @param {String} logItemType constant LOG_ITEM_TYPE\n * @param {Boolean} errorUnknown defaults false\n * @param {Boolean} errorNotExisting defaults false\n * @returns void\n */\n function checkLogItemType(logItemType, errorUnknown = false, errorNotExisting = false) {\n if (logItemType) {\n const typeInLogItemTypes = Object.values(LOG_ITEM_TYPE).indexOf(logItemType) > -1;\n if (typeInLogItemTypes) {\n return logger.debug(`Valid logItemType: ${logItemType}`);\n }\n if (errorUnknown) {\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `Unknown logItemType: ${logItemType}`);\n }\n return logger.debug(`WARN: We have unknown logType: ${logItemType}`);\n }\n\n if (errorNotExisting) {\n throw new ApiError(httpStatus.INTERNAL_SERVER_ERROR, `No logItemType: ${logItemType}`);\n }\n return logger.debug(`No logItemType: ${logItemType}`);\n }\n}\n"],
5
+ "mappings": "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",
6
+ "names": ["logItemTypes", "catalogers", "dateBefore", "dateAfter", "test"]
7
+ }
package/dist/utils.js ADDED
@@ -0,0 +1,102 @@
1
+ import httpStatus from "http-status";
2
+ import { createLogger } from "@natlibfi/melinda-backend-commons";
3
+ import { Error as ApiError } from "@natlibfi/melinda-commons";
4
+ import { IMPORT_JOB_STATE, OPERATIONS } from "./constants.js";
5
+ const logger = createLogger();
6
+ export function logError(err) {
7
+ if (err instanceof ApiError) {
8
+ logger.error(JSON.stringify(err));
9
+ return;
10
+ }
11
+ if (err === "SIGINT") {
12
+ logger.error(err);
13
+ return;
14
+ }
15
+ logger.error(err.stack === void 0 ? err : err.stack);
16
+ }
17
+ export function createImportJobState(operation, state, queryImportJobState = false) {
18
+ if (!(state in IMPORT_JOB_STATE)) {
19
+ throw new Error("Invalid IMPORT_JOB_STATE");
20
+ }
21
+ if (!(operation in OPERATIONS)) {
22
+ throw new Error("Invalid operation");
23
+ }
24
+ if (queryImportJobState) {
25
+ const importJobStateWithOperation = `importJobState.${operation}`;
26
+ const importJobStateForQuery = { [importJobStateWithOperation]: state };
27
+ return importJobStateForQuery;
28
+ }
29
+ return { [operation]: state };
30
+ }
31
+ export function createRecordResponseItem({ responsePayload, responseStatus, recordMetadata, id }) {
32
+ const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload, id);
33
+ const recordResponseItem = {
34
+ databaseId: id || "000000000",
35
+ recordMetadata: responsePayload.recordMetadata || recordMetadata || void 0,
36
+ ...recordResponseStatusAndMessage
37
+ };
38
+ return recordResponseItem;
39
+ }
40
+ function getRecordResponseStatusAndMessage(responseStatus, responsePayload, id) {
41
+ logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);
42
+ const message = getMessageFromResponsePayload(responsePayload);
43
+ const ids = responsePayload.ids || [];
44
+ logger.debug(`Response message: ${message}`);
45
+ if (["UPDATED", "CREATED", "INVALID", "ERROR", "SKIPPED", "FIXED"].includes(responseStatus)) {
46
+ return { recordStatus: responseStatus, detailedRecordStatus: responseStatus, message };
47
+ }
48
+ if (["SKIPPED_CHANGE", "SKIPPED_UPDATE"].includes(responseStatus)) {
49
+ return { recordStatus: "SKIPPED", detailedRecordStatus: responseStatus, message };
50
+ }
51
+ if (["UNKNOWN"].includes(responseStatus)) {
52
+ return { recordStatus: "ERROR", detailedRecordStatus: responseStatus, message, ids };
53
+ }
54
+ if ([httpStatus.CONFLICT, "CONFLICT"].includes(responseStatus)) {
55
+ if (/^Duplicates in database/u.test(message)) {
56
+ return { recordStatus: "DUPLICATE", detailedRecordStatus: "DUPLICATE", message, ids };
57
+ }
58
+ if (/^MatchValidation for all/u.test(message)) {
59
+ return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message, ids };
60
+ }
61
+ if (ids.length > 1 || ids[0] !== id) {
62
+ return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message, ids };
63
+ }
64
+ return { recordStatus: "ERROR", detailedRecordStatus: "CONFLICT", message };
65
+ }
66
+ if ([httpStatus.UNPROCESSABLE_ENTITY, "UNPROCESSABLE_ENTITY"].includes(responseStatus)) {
67
+ if (ids.length > 1 || ids[0] !== id) {
68
+ return { recordStatus: "INVALID", detailedRecordStatus: "UNPROCESSABLE_ENTITY", message, ids };
69
+ }
70
+ return { recordStatus: "INVALID", detailedRecordStatus: "UNPROCESSABLE_ENTITY", message };
71
+ }
72
+ if ([httpStatus.NOT_FOUND, "NOT_FOUND"].includes(responseStatus)) {
73
+ return { recordStatus: "ERROR", detailedRecordStatus: "NOT_FOUND", message };
74
+ }
75
+ if ([httpStatus.FORBIDDEN, "FORBIDDEN"].includes(responseStatus)) {
76
+ return { recordStatus: "ERROR", detailedRecordStatus: "FORBIDDEN", message };
77
+ }
78
+ logger.debug(`Unknown responseStatus: ${responseStatus}`);
79
+ const newMessage = `${message} - Unknown recordStatus: ${responseStatus}`;
80
+ return { recordStatus: "ERROR", detailedRecordStatus: responseStatus, message: newMessage };
81
+ }
82
+ function getMessageFromResponsePayload(responsePayload) {
83
+ if (responsePayload.message) {
84
+ return responsePayload.message;
85
+ }
86
+ if (typeof responsePayload === "string" || responsePayload instanceof String) {
87
+ return responsePayload;
88
+ }
89
+ return "";
90
+ }
91
+ export async function addRecordResponseItem({ recordResponseItem, correlationId, mongoOperator }) {
92
+ await mongoOperator.pushMessages({ correlationId, messages: [recordResponseItem], messageField: "records" });
93
+ return true;
94
+ }
95
+ export async function addRecordResponseItems({ recordResponseItems, correlationId, mongoOperator }) {
96
+ if (!Array.isArray(recordResponseItems)) {
97
+ throw new Error("RecordResponseItems is not an array!");
98
+ }
99
+ await mongoOperator.pushMessages({ correlationId, messages: recordResponseItems, messageField: "records" });
100
+ return true;
101
+ }
102
+ //# sourceMappingURL=utils.js.map
@@ -0,0 +1,7 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../src/utils.js"],
4
+ "sourcesContent": ["import httpStatus from 'http-status';\nimport {createLogger} from '@natlibfi/melinda-backend-commons';\nimport {Error as ApiError} from '@natlibfi/melinda-commons';\nimport {IMPORT_JOB_STATE, OPERATIONS} from './constants.js';\n\nconst logger = createLogger();\n\nexport function logError(err) {\n if (err instanceof ApiError) {\n logger.error(JSON.stringify(err));\n return;\n }\n\n if (err === 'SIGINT') {\n logger.error(err);\n return;\n }\n\n logger.error(err.stack === undefined ? err : err.stack);\n}\n\nexport function createImportJobState(operation, state, queryImportJobState = false) {\n if (!(state in IMPORT_JOB_STATE)) {\n throw new Error('Invalid IMPORT_JOB_STATE');\n }\n\n if (!(operation in OPERATIONS)) {\n throw new Error('Invalid operation');\n }\n\n if (queryImportJobState) {\n const importJobStateWithOperation = `importJobState.${operation}`;\n const importJobStateForQuery = {[importJobStateWithOperation]: state};\n\n return importJobStateForQuery;\n }\n\n return {[operation]: state};\n}\n\nexport function createRecordResponseItem({responsePayload, responseStatus, recordMetadata, id}) {\n const recordResponseStatusAndMessage = getRecordResponseStatusAndMessage(responseStatus, responsePayload, id);\n const recordResponseItem = {\n databaseId: id || '000000000',\n recordMetadata: responsePayload.recordMetadata || recordMetadata || undefined,\n ...recordResponseStatusAndMessage\n };\n return recordResponseItem;\n}\n\n// eslint-disable-next-line max-statements\nfunction getRecordResponseStatusAndMessage(responseStatus, responsePayload, id) {\n\n logger.debug(`Response status: ${responseStatus} responsePayload: ${JSON.stringify(responsePayload)}`);\n //const responseStatusName = httpStatus[`${responseStatus}_NAME`];\n //logger.debug(`Response status name: ${responseStatusName}`);\n\n const message = getMessageFromResponsePayload(responsePayload);\n const ids = responsePayload.ids || [];\n\n logger.debug(`Response message: ${message}`);\n\n // We map responseStatus here for a wider recordStatus and more detailed detailedRecordStatus\n // recordStatus corresponds to RECORD_IMPORT_STATEs used in https://github.com/NatLibFi/melinda-record-import-commons-js\n\n // Non-http statuses\n if (['UPDATED', 'CREATED', 'INVALID', 'ERROR', 'SKIPPED', 'FIXED'].includes(responseStatus)) {\n return {recordStatus: responseStatus, detailedRecordStatus: responseStatus, message};\n }\n\n // More detailed SKIPPED statuses\n if (['SKIPPED_CHANGE', 'SKIPPED_UPDATE'].includes(responseStatus)) {\n return {recordStatus: 'SKIPPED', detailedRecordStatus: responseStatus, message};\n }\n\n if (['UNKNOWN'].includes(responseStatus)) {\n return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message, ids};\n }\n\n // Duplicates and other CONFLICT statuses\n if ([httpStatus.CONFLICT, 'CONFLICT'].includes(responseStatus)) {\n if ((/^Duplicates in database/u).test(message)) {\n return {recordStatus: 'DUPLICATE', detailedRecordStatus: 'DUPLICATE', message, ids};\n }\n if ((/^MatchValidation for all/u).test(message)) {\n return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n }\n\n // Use ids only if there are more than one id or the id in payload does not match databaseId\n if (ids.length > 1 || ids[0] !== id) {\n return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message, ids};\n }\n return {recordStatus: 'ERROR', detailedRecordStatus: 'CONFLICT', message};\n }\n\n if ([httpStatus.UNPROCESSABLE_ENTITY, 'UNPROCESSABLE_ENTITY'].includes(responseStatus)) {\n if (ids.length > 1 || ids[0] !== id) {\n return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message, ids};\n }\n return {recordStatus: 'INVALID', detailedRecordStatus: 'UNPROCESSABLE_ENTITY', message};\n }\n\n if ([httpStatus.NOT_FOUND, 'NOT_FOUND'].includes(responseStatus)) {\n return {recordStatus: 'ERROR', detailedRecordStatus: 'NOT_FOUND', message};\n }\n\n if ([httpStatus.FORBIDDEN, 'FORBIDDEN'].includes(responseStatus)) {\n return {recordStatus: 'ERROR', detailedRecordStatus: 'FORBIDDEN', message};\n }\n\n // Otherwise\n logger.debug(`Unknown responseStatus: ${responseStatus}`);\n const newMessage = `${message} - Unknown recordStatus: ${responseStatus}`;\n return {recordStatus: 'ERROR', detailedRecordStatus: responseStatus, message: newMessage};\n}\n\nfunction getMessageFromResponsePayload(responsePayload) {\n if (responsePayload.message) {\n return responsePayload.message;\n }\n if (typeof responsePayload === 'string' || responsePayload instanceof String) {\n return responsePayload;\n }\n return '';\n}\n\nexport async function addRecordResponseItem({recordResponseItem, correlationId, mongoOperator}) {\n await mongoOperator.pushMessages({correlationId, messages: [recordResponseItem], messageField: 'records'});\n return true;\n}\n\n// Use addRecordResponseItems to add several recordResponseItems in one mongo operation to avoid writeconflicts\nexport async function addRecordResponseItems({recordResponseItems, correlationId, mongoOperator}) {\n if (!Array.isArray(recordResponseItems)) {\n throw new Error('RecordResponseItems is not an array!');\n }\n await mongoOperator.pushMessages({correlationId, messages: recordResponseItems, messageField: 'records'});\n return true;\n}\n\n"],
5
+ "mappings": "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",
6
+ "names": []
7
+ }
package/package.json CHANGED
@@ -14,7 +14,7 @@
14
14
  "url": "git@github.com:natlibfi/melinda-rest-api-commons.git"
15
15
  },
16
16
  "license": "MIT",
17
- "version": "5.0.0-alpha.1",
17
+ "version": "5.0.0-alpha.3",
18
18
  "main": "./dist/index.js",
19
19
  "type": "module",
20
20
  "engines": {
@@ -25,7 +25,7 @@
25
25
  },
26
26
  "scripts": {
27
27
  "prepare": "npm run build",
28
- "build": "esbuild src/**/*.js --sourcemap --platform=node --main-fields=main --outdir=dist --allow-overwrite --analyze",
28
+ "build": "esbuild ./src/*.js ./src/**/*.js --sourcemap --platform=node --main-fields=main --outdir=dist --allow-overwrite --analyze",
29
29
  "lint": "eslint ./src",
30
30
  "lint:dev": "eslint --fix ./src",
31
31
  "test": "npm run lint && npm run test:base",
@@ -40,15 +40,15 @@
40
40
  "@natlibfi/marc-record": "^10.0.0-alpha.1",
41
41
  "@natlibfi/marc-record-serializers": "^11.0.0-alpha.2",
42
42
  "@natlibfi/marc-record-validate": "^9.0.0-alpha.1",
43
- "@natlibfi/marc-record-validators-melinda": "^11.6.2",
43
+ "@natlibfi/marc-record-validators-melinda": "^11.6.7",
44
44
  "@natlibfi/melinda-backend-commons": "^3.0.0-alpha.3",
45
45
  "@natlibfi/melinda-commons": "^14.0.0-alpha.3",
46
- "amqplib": "^0.10.8",
47
- "debug": "^4.4.0",
46
+ "amqplib": "^0.10.9",
47
+ "debug": "^4.4.1",
48
48
  "http-status": "^2.1.0",
49
49
  "moment": "^2.30.1",
50
50
  "mongo-sanitize": "^1.1.0",
51
- "mongodb": "^6.18.0"
51
+ "mongodb": "^6.19.0"
52
52
  },
53
53
  "devDependencies": {
54
54
  "@natlibfi/fixugen": "^3.0.0-alpha.5",
@@ -56,7 +56,7 @@
56
56
  "@natlibfi/fixura-mongo": "^3.0.0-alpha.5",
57
57
  "cross-env": "^10.0.0",
58
58
  "esbuild": "^0.25.9",
59
- "eslint": "^9.33.0"
59
+ "eslint": "^9.34.0"
60
60
  },
61
61
  "overrides": {
62
62
  "nanoid": "^3.3.8"
File without changes
File without changes
File without changes
File without changes