@boostercloud/framework-provider-azure 0.21.4 → 0.22.0

package/dist/constants.d.ts

@@ -7,3 +7,5 @@ export declare const environmentVarNames: {
     readonly websocketAPIURL: "BOOSTER_WEBSOCKET_API_URL";
     readonly cosmosDbConnectionString: "COSMOSDB_CONNECTION_STRING";
 };
+export declare const AZURE_CONFLICT_ERROR_CODE = 409;
+export declare const AZURE_PRECONDITION_FAILED_ERROR = 412;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.environmentVarNames = exports.eventsStoreAttributes = void 0;
+exports.AZURE_PRECONDITION_FAILED_ERROR = exports.AZURE_CONFLICT_ERROR_CODE = exports.environmentVarNames = exports.eventsStoreAttributes = void 0;
 exports.eventsStoreAttributes = {
     partitionKey: 'entityTypeName_entityID_kind',
     sortKey: 'createdAt',
@@ -10,3 +10,5 @@ exports.environmentVarNames = {
     websocketAPIURL: 'BOOSTER_WEBSOCKET_API_URL',
     cosmosDbConnectionString: 'COSMOSDB_CONNECTION_STRING',
 };
+exports.AZURE_CONFLICT_ERROR_CODE = 409;
+exports.AZURE_PRECONDITION_FAILED_ERROR = 412;

package/dist/index.js

@@ -9,6 +9,7 @@ const cosmos_1 = require("@azure/cosmos");
 const constants_1 = require("./constants");
 const read_model_adapter_1 = require("./library/read-model-adapter");
 const searcher_adapter_1 = require("./library/searcher-adapter");
+const scheduled_adapter_1 = require("./library/scheduled-adapter");
 let cosmosClient;
 if (typeof process.env[constants_1.environmentVarNames.cosmosDbConnectionString] === 'undefined') {
     cosmosClient = {};
@@ -41,7 +42,7 @@ const Provider = () => ({
         rawToEnvelopes: undefined,
         fetchSubscriptions: undefined,
         store: read_model_adapter_1.storeReadModel.bind(null, cosmosClient),
-        delete: undefined,
+        delete: read_model_adapter_1.deleteReadModel.bind(null, cosmosClient),
         deleteSubscription: undefined,
         deleteAllSubscriptions: undefined,
     },
@@ -63,7 +64,7 @@ const Provider = () => ({
     },
     // ScheduledCommandsLibrary
     scheduled: {
-        rawToEnvelope: undefined,
+        rawToEnvelope: scheduled_adapter_1.rawScheduledInputToEnvelope,
     },
     // ProviderInfrastructureGetter
     infrastructure: () => {

package/dist/library/graphql-adapter.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rawGraphQLRequestToEnvelope = void 0;
 async function rawGraphQLRequestToEnvelope(context, logger) {
+    var _a, _b;
     logger.debug('Received GraphQL request: ', context.req);
     const requestID = context.executionContext.invocationId;
     const connectionID = undefined; // TODO: Add this when sockets are supported
@@ -14,6 +15,7 @@ async function rawGraphQLRequestToEnvelope(context, logger) {
         return {
             requestID,
             eventType,
+            token: (_b = (_a = context.req) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.authorization,
             value: graphQLValue,
         };
     }

package/dist/library/read-model-adapter.d.ts

@@ -2,3 +2,4 @@ import { CosmosClient } from '@azure/cosmos';
 import { BoosterConfig, Logger, ReadModelInterface, ReadOnlyNonEmptyArray, UUID } from '@boostercloud/framework-types';
 export declare function fetchReadModel(db: CosmosClient, config: BoosterConfig, logger: Logger, readModelName: string, readModelID: UUID): Promise<ReadOnlyNonEmptyArray<ReadModelInterface>>;
 export declare function storeReadModel(db: CosmosClient, config: BoosterConfig, logger: Logger, readModelName: string, readModel: ReadModelInterface): Promise<void>;
+export declare function deleteReadModel(db: CosmosClient, config: BoosterConfig, logger: Logger, readModelName: string, readModel: ReadModelInterface): Promise<void>;

package/dist/library/read-model-adapter.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storeReadModel = exports.fetchReadModel = void 0;
+exports.deleteReadModel = exports.storeReadModel = exports.fetchReadModel = void 0;
+const framework_types_1 = require("@boostercloud/framework-types");
+const constants_1 = require("../constants");
 async function fetchReadModel(db, config, logger, readModelName, readModelID) {
     const { resource } = await db
         .database(config.resourceNames.applicationStack)
@@ -8,14 +10,78 @@ async function fetchReadModel(db, config, logger, readModelName, readModelID) {
         .item(readModelID, readModelID)
         .read();
     logger.debug(`[ReadModelAdapter#fetchReadModel] Loaded read model ${readModelName} with ID ${readModelID} with result:`, resource);
-    return [resource];
+    if (!resource)
+        return [resource];
+    return [
+        {
+            ...resource,
+            boosterMetadata: {
+                ...resource === null || resource === void 0 ? void 0 : resource.boosterMetadata,
+                optimisticConcurrencyValue: resource._etag,
+            },
+        },
+    ];
 }
 exports.fetchReadModel = fetchReadModel;
+async function insertReadModel(logger, readModel, db, config, readModelName) {
+    const itemModel = {
+        ...readModel,
+        id: readModel.id.toString(),
+    };
+    try {
+        await db
+            .database(config.resourceNames.applicationStack)
+            .container(config.resourceNames.forReadModel(readModelName))
+            .items.create(itemModel);
+        logger.debug('[ReadModelAdapter#insertReadModel] Read model inserted');
+    }
+    catch (err) {
+        // In case of conflict (The ID provided for a resource on a PUT or POST operation has been taken by an existing resource) we should retry it
+        if (err.code == constants_1.AZURE_CONFLICT_ERROR_CODE) {
+            logger.debug('[ReadModelAdapter#insertReadModel] Read model insert failed with a conflict failure');
+            throw new framework_types_1.OptimisticConcurrencyUnexpectedVersionError(err.message);
+        }
+        throw err;
+    }
+}
+async function updateReadModel(readModel, db, config, readModelName, logger) {
+    var _a;
+    /** upsert only occurs if the etag we are sending matches the etag on the server. i.e. Only replace if the item hasn't changed */
+    const options = {
+        accessCondition: { condition: ((_a = readModel.boosterMetadata) === null || _a === void 0 ? void 0 : _a.optimisticConcurrencyValue) || '*', type: 'IfMatch' },
+    };
+    try {
+        await db
+            .database(config.resourceNames.applicationStack)
+            .container(config.resourceNames.forReadModel(readModelName))
+            .items.upsert(readModel, options);
+        logger.debug('[ReadModelAdapter#updateReadModel] Read model updated');
+    }
+    catch (err) {
+        // If there is a precondition failure then we should retry it
+        if (err.code == constants_1.AZURE_PRECONDITION_FAILED_ERROR) {
+            logger.debug('[ReadModelAdapter#updateReadModel] Read model update failed with a pre-condition failure');
+            throw new framework_types_1.OptimisticConcurrencyUnexpectedVersionError(err.message);
+        }
+        throw err;
+    }
+}
 async function storeReadModel(db, config, logger, readModelName, readModel) {
+    var _a, _b;
+    const version = (_b = (_a = readModel.boosterMetadata) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : 0;
+    if (version === 0) {
+        await insertReadModel(logger, readModel, db, config, readModelName);
+    }
+    await updateReadModel(readModel, db, config, readModelName, logger);
+}
+exports.storeReadModel = storeReadModel;
+async function deleteReadModel(db, config, logger, readModelName, readModel) {
+    logger.debug(`[ReadModelAdapter#deleteReadModel] Entering to Read model deleted. ID = ${readModel.id}`);
     await db
         .database(config.resourceNames.applicationStack)
         .container(config.resourceNames.forReadModel(readModelName))
-        .items.upsert(readModel);
-    logger.debug('[ReadModelAdapter#storeReadModel] Read model stored');
+        .item(readModel.id, readModel.id)
+        .delete();
+    logger.debug(`[ReadModelAdapter#deleteReadModel] Read model deleted. ID = ${readModel.id}`);
 }
-exports.storeReadModel = storeReadModel;
+exports.deleteReadModel = deleteReadModel;

package/dist/library/scheduled-adapter.d.ts

@@ -0,0 +1,8 @@
+import { Logger, ScheduledCommandEnvelope } from '@boostercloud/framework-types';
+interface AzureScheduledCommandEnvelope {
+    bindings: {
+        [name: string]: unknown;
+    };
+}
+export declare function rawScheduledInputToEnvelope(input: Partial<AzureScheduledCommandEnvelope>, logger: Logger): Promise<ScheduledCommandEnvelope>;
+export {};

package/dist/library/scheduled-adapter.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rawScheduledInputToEnvelope = void 0;
+const framework_types_1 = require("@boostercloud/framework-types");
+async function rawScheduledInputToEnvelope(input, logger) {
+    logger.debug('Received AzureScheduledCommand request: ', input);
+    if (!input.bindings || !Object.keys(input.bindings).length)
+        throw new Error(`bindings is not defined or empty, scheduled command envelope should have the structure {bindings: [name: string]: string }, but you gave ${JSON.stringify(input)}`);
+    return {
+        requestID: framework_types_1.UUID.generate(),
+        typeName: Object.keys(input.bindings)[0],
+    };
+}
+exports.rawScheduledInputToEnvelope = rawScheduledInputToEnvelope;

package/dist/library/searcher-adapter.d.ts

@@ -1,3 +1,3 @@
 import { CosmosClient } from '@azure/cosmos';
-import { BoosterConfig, Logger, FilterFor } from '@boostercloud/framework-types';
-export declare function searchReadModel(cosmosDb: CosmosClient, config: BoosterConfig, logger: Logger, readModelName: string, filters: FilterFor<unknown>): Promise<Array<any>>;
+import { BoosterConfig, Logger, FilterFor, ReadModelListResult } from '@boostercloud/framework-types';
+export declare function searchReadModel(cosmosDb: CosmosClient, config: BoosterConfig, logger: Logger, readModelName: string, filters: FilterFor<unknown>, limit?: number, afterCursor?: Record<string, string> | undefined, paginatedVersion?: boolean): Promise<Array<any> | ReadModelListResult<any>>;

package/dist/library/searcher-adapter.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchReadModel = void 0;
 const framework_types_1 = require("@boostercloud/framework-types");
-async function searchReadModel(cosmosDb, config, logger, readModelName, filters) {
+async function searchReadModel(cosmosDb, config, logger, readModelName, filters, limit, afterCursor, paginatedVersion = false) {
     const filterExpression = buildFilterExpression(filters);
+    const queryDefinition = `SELECT * FROM c ${filterExpression !== '' ? `WHERE ${filterExpression}` : filterExpression}`;
+    const queryWithPagination = queryDefinition + (paginatedVersion && limit ? ` OFFSET ${(afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) || 0} LIMIT ${limit}` : '');
     const querySpec = {
-        query: `SELECT * FROM c ${filterExpression !== '' ? `WHERE ${filterExpression}` : filterExpression}`,
+        query: queryWithPagination,
         parameters: buildExpressionAttributeValues(filters),
     };
     logger.debug('Running search with the following params: \n', querySpec);
@@ -14,8 +16,16 @@ async function searchReadModel(cosmosDb, config, logger, readModelName, filters)
         .container(config.resourceNames.forReadModel(readModelName))
         .items.query(querySpec)
         .fetchAll();
-    logger.debug('Search result: ', resources);
-    return resources !== null && resources !== void 0 ? resources : [];
+    if (paginatedVersion) {
+        return {
+            items: resources !== null && resources !== void 0 ? resources : [],
+            count: resources.length,
+            cursor: { id: ((limit ? limit : 1) + ((afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) ? parseInt(afterCursor === null || afterCursor === void 0 ? void 0 : afterCursor.id) : 0)).toString() },
+        };
+    }
+    else {
+        return resources !== null && resources !== void 0 ? resources : [];
+    }
 }
 exports.searchReadModel = searchReadModel;
 function buildFilterExpression(filters, usedPlaceholders = []) {
@@ -59,8 +69,9 @@ function buildOperation(propName, filter = {}, usedPlaceholders, nested) {
                 return `CONTAINS(${propName}, ${holder(index)})`;
             case 'beginsWith':
                 return `STARTSWITH(${propName}, ${holder(index)})`;
-            case 'includes':
-                return `CONTAINS(${propName}, ${holder(index)})`;
+            case 'includes': {
+                return `ARRAY_CONTAINS(${propName}, ${holder(index)}, true)`;
+            }
             default:
                 if (typeof value === 'object') {
                     return buildOperation(operation, value, usedPlaceholders, propName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-azure",
-  "version": "0.21.4",
+  "version": "0.22.0",
   "description": "Handle Booster's integration with Azure",
   "keywords": [
     "framework-provider-azure"
@@ -22,7 +22,7 @@
   "dependencies": {
     "@azure/cosmos": "3.7.3",
     "@azure/functions": "^1.2.2",
-    "@boostercloud/framework-types": "^0.21.4",
+    "@boostercloud/framework-types": "^0.22.0",
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
     "mocha": "8.4.0",
@@ -41,5 +41,5 @@
   "bugs": {
     "url": "https://github.com/boostercloud/booster/issues"
   },
-  "gitHead": "f0fe51ca4d0cb3745e9880a5dc05fd7b474bbc26"
+  "gitHead": "b479b1f7e3614d7737b4c82aac7b2020a640b269"
 }