bruce-models 3.3.1 → 3.3.3

package/dist/bruce-models.umd.js

@@ -874,19 +874,77 @@
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
-                const req = yield api.GET(`account/${id}`, reqParams);
-                const resData = {
-                    account: req
-                };
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`accountbyid/${id}`, reqParams);
+                        // Update the cache by subdomain as well in case it's different to the ID.
+                        if ((data === null || data === void 0 ? void 0 : data.ID) && (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) != false) {
+                            yield api.SetCacheItem({
+                                key: data.Subdomain,
+                                value: prom,
+                                req: reqParams
+                            });
+                        }
+                        res({
+                            account: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
                 yield api.SetCacheItem({
                     key: GetCacheKey(id),
-                    value: resData,
+                    value: prom,
                     req: reqParams
                 });
-                return resData;
+                return prom;
             });
         }
         Account.Get = Get;
+        /**
+         * Returns a client account record by subdomain or ID.
+         * @param params
+         * @returns
+         */
+        function GetBySubdomain(params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                let { api, subdomain, req: reqParams } = params;
+                if (!api) {
+                    api = exports.ENVIRONMENT.Api().GetGuardianApi();
+                }
+                const cache = yield api.GetCacheItem(GetCacheKey(subdomain), reqParams);
+                if (cache === null || cache === void 0 ? void 0 : cache.found) {
+                    return cache.data;
+                }
+                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        const data = yield api.GET(`account/${subdomain}`, reqParams);
+                        // Update the cache by ID as well in case it's different to the subdomain.
+                        if ((data === null || data === void 0 ? void 0 : data.ID) && (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) != false) {
+                            yield api.SetCacheItem({
+                                key: data.ID,
+                                value: prom,
+                                req: reqParams
+                            });
+                        }
+                        res({
+                            account: data
+                        });
+                    }
+                    catch (e) {
+                        rej(e);
+                    }
+                }));
+                yield api.SetCacheItem({
+                    key: GetCacheKey(subdomain),
+                    value: prom,
+                    req: reqParams
+                });
+                return prom;
+            });
+        }
+        Account.GetBySubdomain = GetBySubdomain;
         /**
          * Gets a list of client accounts related to the current session user.
          * @param params
@@ -2719,7 +2777,7 @@
          */
         function GetListByIds(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, entityIds, req: reqParams, expandRelations } = params;
+                let { api, entityIds, req: reqParams, expandRelations, expandLocation } = params;
                 if (!entityIds.length) {
                     throw ("Entity IDs are required.");
                 }
@@ -2730,7 +2788,7 @@
                 const reqIds = [];
                 for (let i = 0; i < entityIds.length; i++) {
                     const entityId = entityIds[i];
-                    const key = GetCacheKey({ entityId, expandRelations });
+                    const key = GetCacheKey({ entityId, expandRelations, expandLocation });
                     const cache = api.GetCacheItem(key, reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         reqs.push(cache.data);
@@ -2747,15 +2805,17 @@
                     },
                     PageSize: reqIds.length
                 };
+                if (expandRelations) {
+                    reqData["Expand"] = "relation";
+                }
+                else if (expandLocation) {
+                    reqData["Expand"] = "location";
+                }
                 if (reqIds.length > 0) {
-                    const urlParams = new URLSearchParams();
-                    if (expandRelations) {
-                        urlParams.append("$expand", "relation");
-                    }
-                    const req = api.POST("entities?" + urlParams.toString(), reqData, exports.Api.PrepReqParams(reqParams));
+                    const req = api.POST("entities", reqData, exports.Api.PrepReqParams(reqParams));
                     for (let i = 0; i < reqIds.length; i++) {
                         const entityId = reqIds[i];
-                        const key = GetCacheKey({ entityId });
+                        const key = GetCacheKey({ entityId, expandLocation, expandRelations });
                         const prom = new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                             try {
                                 const data = yield req;
@@ -10369,7 +10429,7 @@
         DataSource.GetList = GetList;
     })(exports.DataSource || (exports.DataSource = {}));
 
-    const VERSION = "3.3.1";
+    const VERSION = "3.3.3";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;