Fix for storing table extension field and enumextension values on base table, Make Range and Assignment Explorer work (mostly) with simple pools and other smaller stuff

Ninja Azure Back End.code-workspace

@@ -29,7 +29,7 @@
 		"files.exclude": {
 			"**/.git": true,
 			"**/dist": true,
-			"**/node_modules": true
+			"**/node_modules": true,
 		},
 		"cSpell.words": [
 			"alext",
@@ -52,7 +52,6 @@
 			"vjeko",
 			"vjekocom",
 			"xmlport"
-		],
-		"debug.internalConsoleOptions": "neverOpen"
+		]
 	}
 }

Ninja VS Code Extension.code-workspace

@@ -46,7 +46,6 @@
 			"xmlport"
 		],
 		"typescript.referencesCodeLens.enabled": true,
-		"editor.formatOnSave": true,
-		"svg.preview.background": "editor"
+		"editor.formatOnSave": true
 	}
 }

azure-function-app/.vscode/settings.json

@@ -12,7 +12,7 @@
         "**/CVS": true,
         "**/.DS_Store": true,
         "**/Thumbs.db": true,
-        "dist": true,
-        "node_modules": true
+        "**/dist": true,
+        "**/node_modules": true
     }
 }

azure-function-app/src/functions/v2/getNext/index.ts

@@ -5,14 +5,22 @@ import { AppInfo, Range } from "../TypesV2";
 import { GetNextRequest, GetNextResponse } from "./types";
 import { updateConsumption } from "./update";
 
-const getRealRanges = (type: string, ranges: Range[]) => {
+interface ObjectStorageInfo {
+    storageId: string;
+    ranges: Range[];
+}
+
+const getObjectStorageInfo = (type: string, ranges: Range[], redirectExtensions?: true): ObjectStorageInfo => {
+    let storageId = type;
+
     if (!type.includes("_")) {
-        return ranges;
+        return { storageId, ranges };
     }
 
     const parts = type.split("_");
-    if (parts[0].toLowerCase() === "tableextension") {
-        return ranges;
+    if (["tableextension", "enumextension"].includes(parts[0].toLowerCase())) {
+        storageId = redirectExtensions ? storageId.replace("extension", "") : storageId;
+        return { storageId, ranges };
     }
 
     const id = parseInt(parts[1]);
@@ -28,7 +36,7 @@ const getRealRanges = (type: string, ranges: Range[]) => {
         ranges = [{ from: 1, to: 49999 }, ...ranges];
     }
 
-    return ranges;
+    return { storageId, ranges };
 }
 
 const limitRanges = (ranges: Range[], require?: number) => {
@@ -47,10 +55,10 @@ const limitRanges = (ranges: Range[], require?: number) => {
 
 const getNext = new ALNinjaRequestHandler<GetNextRequest, GetNextResponse>(async (request) => {
     const appInfo: AppInfo = request.bindings.app || {} as AppInfo;
-    const { appId, type, perRange, require } = request.body;
-    const ids = appInfo[type] || [];
-    const ranges = request.method === "POST" && perRange && require ? limitRanges(request.body.ranges, require) : request.body.ranges;
-    const realRanges = getRealRanges(type, ranges);
+    const { appId, type, perRange, require, redirectExtensions } = request.body;
+    let { storageId, ranges } = getObjectStorageInfo(type, request.body.ranges, redirectExtensions);
+    const ids = appInfo[storageId] || [];
+    const realRanges = request.method === "POST" && perRange && require ? limitRanges(ranges, require) : ranges;
 
     const result = {
         id: perRange ? findAvailablePerRange(realRanges, ids) : findFirstAvailableId(realRanges, ids),
@@ -69,7 +77,7 @@ const getNext = new ALNinjaRequestHandler<GetNextRequest, GetNextResponse>(async
     };
 
     if (request.method === "POST" && (Array.isArray(result.id) ? result.id.length : result.id)) {
-        const { app, success } = await updateConsumption(appId, request, type, realRanges, request.body.ranges, updateContext);
+        const { app, success } = await updateConsumption(appId, request, type, storageId, realRanges, request.body.ranges, updateContext);
         if (!success) {
             throw new ErrorResponse("Too many attempts at updating BLOB", 409);
         }

azure-function-app/src/functions/v2/getNext/test.http

@@ -64,3 +64,29 @@ Content-Type: application/json
     "perRange": true,
     "require": 60000
 }
+
+### Assign a next number from 1 to 49999 of an enum
+
+post http://localhost:7071/api/v2/getNext
+Content-Type: application/json
+
+{
+    "appId": "test_ninja",
+    "type": "enum_50000",
+    "ranges": [
+        {
+            "from": 50000,
+            "to": 50150
+        },
+        {
+            "from": 60000,
+            "to": 60009
+        },
+        {
+            "from": 90000,
+            "to": 90099
+        }
+    ],
+    "perRange": true,
+    "require": 1
+}

azure-function-app/src/functions/v2/getNext/types.ts

@@ -2,10 +2,11 @@ import { ALObjectType } from "../ALObjectType";
 import { Range } from "../TypesV2";
 
 export interface GetNextRequest {
-    type: ALObjectType;
+    type: ALObjectType | string;
     ranges: Range[];
     perRange?: boolean;
     require?: number;
+    redirectExtensions?: true;
 }
 
 export interface GetNextResponse {

azure-function-app/src/functions/v2/getNext/update.ts

@@ -1,15 +1,15 @@
 import { Blob } from "@vjeko.com/azure-func";
 import { findFirstAvailableId } from "../../../common/util";
-import { ALObjectType } from "../ALObjectType";
 import { ALNinjaRequestContext, AppInfo, Range } from "../TypesV2";
 import { ConsumptionUpdateContext } from "./types";
+import { ALObjectType } from "../ALObjectType";
 
 interface UpdateResult {
     app: AppInfo;
     success: boolean;
 }
 
-export async function updateConsumption(appId: string, request: ALNinjaRequestContext, type: ALObjectType, assignFromRanges: Range[], appRanges: Range[], context: ConsumptionUpdateContext): Promise<UpdateResult> {
+export async function updateConsumption(appId: string, request: ALNinjaRequestContext, type: ALObjectType | string, storageId: string, assignFromRanges: Range[], appRanges: Range[], context: ConsumptionUpdateContext): Promise<UpdateResult> {
     let success = true;
 
     const blob = new Blob<AppInfo>(`${appId}.json`);
@@ -27,13 +27,13 @@ export async function updateConsumption(appId: string, request: ALNinjaRequestCo
         }
 
         app._ranges = appRanges;
-        const consumption = app[type];
+        const consumption = app[storageId];
 
         // No ids consumed yet, consume the first one and exit
         if (!consumption || !consumption.length) {
             context.updated = true;
-            app[type] = [context.id];
-            request.log(app, "getNext", { type, id: context.id });
+            app[storageId] = [context.id];
+            request.log(app, "getNext", { type: storageId, id: context.id });
             return { ...app };
         }
 
@@ -49,8 +49,8 @@ export async function updateConsumption(appId: string, request: ALNinjaRequestCo
         }
 
         context.updated = true;
-        app[type] = [...consumption, context.id].sort((left, right) => left - right);
-        request.log(app, "getNext", { type, id: context.id });
+        app[storageId] = [...consumption, context.id].sort((left, right) => left - right);
+        request.log(app, "getNext", { type, storageId, id: context.id });
         return { ...app };
     });
 

azure-function-app/src/functions/v2/storeAssignment/index.ts

@@ -4,19 +4,22 @@ import { StoreAssignmentRequest, StoreAssignmentResponse } from "./types";
 import { addAssignment, removeAssignment } from "./update";
 
 const storeAssignment = new ALNinjaRequestHandler<StoreAssignmentRequest, StoreAssignmentResponse>(async (request) => {
-    const { appId, type, id } = request.body;
+    const { appId, type, id, fieldId, redirectExtensions } = request.body;
+    const storageId = `${redirectExtensions ? type.replace("extension", "") : type}${fieldId ? `_${id}` : ""}`;
+    const idToStore = fieldId || id;
 
     let app: AppInfo, success: boolean = false;
+    const logContent = { type, id, ...(fieldId && { fieldId }) };
 
     switch (request.method) {
         case "POST":
-            const addResult = await addAssignment(appId, request, type, id);
+            const addResult = await addAssignment(appId, request, storageId, idToStore, logContent);
             app = addResult.app;
             success = addResult.success;
             break;
 
         case "DELETE":
-            const removeResult = await removeAssignment(appId, request, type, id);
+            const removeResult = await removeAssignment(appId, request, storageId, idToStore, logContent);
             app = removeResult.app;
             success = removeResult.success;
             break;

azure-function-app/src/functions/v2/storeAssignment/types.ts

@@ -3,6 +3,8 @@ import { ALObjectType } from "../ALObjectType";
 export interface StoreAssignmentRequest {
     type: ALObjectType;
     id: number;
+    fieldId?: number;
+    redirectExtensions?: true;
 }
 
 export interface StoreAssignmentResponse {

azure-function-app/src/functions/v2/storeAssignment/update.ts

@@ -1,13 +1,12 @@
 import { Blob } from "@vjeko.com/azure-func";
-import { ALObjectType } from "../ALObjectType";
 import { ALNinjaRequestContext, AppInfo } from "../TypesV2";
 
 interface UpdateResult {
     app: AppInfo;
     success: boolean;
 }
 
-export async function addAssignment(appId: string, request: ALNinjaRequestContext, type: ALObjectType, id: number): Promise<UpdateResult> {
+export async function addAssignment(appId: string, request: ALNinjaRequestContext, storageId: string, idToAssign: number, content: any): Promise<UpdateResult> {
     let success = true;
 
     const blob = new Blob<AppInfo>(`${appId}.json`);
@@ -16,26 +15,20 @@ export async function addAssignment(appId: string, request: ALNinjaRequestContex
             app = {} as AppInfo;
         }
 
-        let consumption = app[type];
-        if (!consumption) {
-            consumption = [];
-        }
-
-        if (consumption.includes(id)) {
+        let consumption = app[storageId] || [];
+        if (consumption.includes(idToAssign)) {
             success = false;
             return app;
         }
-
-        app[type] = [...consumption, id].sort((left, right) => left - right);
-        request.log(app, "addAssignment", { type, id });
-
+        app[storageId] = [...consumption, idToAssign].sort((left, right) => left - right);
+        request.log(app, "addAssignment", content);
         return { ...app };
     });
 
     return { app, success };
 }
 
-export async function removeAssignment(appId: string, request: ALNinjaRequestContext, type: ALObjectType, id: number): Promise<UpdateResult> {
+export async function removeAssignment(appId: string, request: ALNinjaRequestContext, storageId: string, idToRemove: number, content: any): Promise<UpdateResult> {
     let success = true;
 
     const blob = new Blob<AppInfo>(`${appId}.json`);
@@ -45,13 +38,15 @@ export async function removeAssignment(appId: string, request: ALNinjaRequestCon
             return app;
         }
 
-        let consumption = app[type];
-        if (!consumption || !consumption.includes(id)) {
+        let consumption: number[] = app[storageId] || [];
+        if (!consumption.includes(idToRemove)) {
             return app;
         }
 
-        app[type] = consumption.filter(x => x !== id);
-        request.log(app, "removeAssignment", { type, id });
+        app[storageId] = consumption.filter(x => x !== idToRemove);
+        if ((app[storageId] as number[]).length === 0)
+            delete app[storageId];
+        request.log(app, "removeAssignment", content);
 
         return { ...app };
     });

azure-function-app/test/AzureTestLibrary/v2/Storage.stub.ts

@@ -70,6 +70,9 @@ export class StubStorage extends StubBuilder implements ContentAnalyzer {
     get content(): {} {
         return this._content;
     }
+    get appInfo(): AppInfo {
+        return this._content[`${this._appId}.json`] || {};
+    }
 
     objectIds(objectType: ALObjectType): number[] {
         const app = this._content[`${this._appId}.json`] || {};