npm - @routr/pgdata - Versions diffs - 2.7.2 → 2.7.5 - Mend

@routr/pgdata 2.7.2 → 2.7.5

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.

Files changed (8) hide show

package/dist/mappers/agent.d.ts CHANGED Viewed

@@ -7,7 +7,11 @@ type AgentWithDomainAndCredentials = Prisma.AgentGetPayload<{
         domain: {
             include: {
                 accessControlList: true;
-                egressPolicies: true;
+                egressPolicies: {
+                    include: {
+                        number: true;
+                    };
+                };
             };
         };
         credentials: true;

package/dist/mappers/domain.d.ts CHANGED Viewed

@@ -5,7 +5,11 @@ import { EntityManager } from "./manager";
 type DomainWithACL = Prisma.DomainGetPayload<{
     include: {
         accessControlList: true;
-        egressPolicies: true;
+        egressPolicies: {
+            include: {
+                number: true;
+            };
+        };
     };
 }>;
 export declare class DomainManager extends EntityManager {

package/dist/mappers/domain.js CHANGED Viewed

@@ -4,6 +4,7 @@ exports.DomainManager = void 0;
 const common_1 = require("@routr/common");
 const acl_1 = require("./acl");
 const manager_1 = require("./manager");
+const number_1 = require("./number");
 // Needs testing
 class DomainManager extends manager_1.EntityManager {
     constructor(domain) {
@@ -13,7 +14,11 @@ class DomainManager extends manager_1.EntityManager {
     static includeFields() {
         return {
             accessControlList: true,
-            egressPolicies: true
+            egressPolicies: {
+                include: {
+                    number: true
+                }
+            }
         };
     }
     validOrThrowCreate() {
@@ -52,7 +57,11 @@ class DomainManager extends manager_1.EntityManager {
     static mapToDto(domain) {
         var _a;
         return domain
-            ? Object.assign(Object.assign({}, domain), { accessControlListRef: (_a = domain.accessControlList) === null || _a === void 0 ? void 0 : _a.ref, accessControlList: acl_1.ACLManager.mapToDto(domain.accessControlList), extended: domain.extended, createdAt: domain.createdAt.getTime() / 1000, updatedAt: domain.updatedAt.getTime() / 1000 }) : undefined;
+            ? Object.assign(Object.assign({}, domain), { accessControlListRef: (_a = domain.accessControlList) === null || _a === void 0 ? void 0 : _a.ref, accessControlList: acl_1.ACLManager.mapToDto(domain.accessControlList), egressPolicies: domain.egressPolicies.map((policy) => ({
+                    rule: policy.rule,
+                    numberRef: policy.numberRef,
+                    number: number_1.NumberManager.mapToDtoWithoutTrunk(policy.number)
+                })), extended: domain.extended, createdAt: domain.createdAt.getTime() / 1000, updatedAt: domain.updatedAt.getTime() / 1000 }) : undefined;
     }
 }
 exports.DomainManager = DomainManager;

package/dist/mappers/number.d.ts CHANGED Viewed

@@ -22,5 +22,6 @@ export declare class NumberManager extends EntityManager {
     validOrThrowUpdate(): void;
     mapToPrisma(): NumberPrismaModel;
     static mapToDto(number: NumberWithTrunk): CC.INumber;
+    static mapToDtoWithoutTrunk(number: NumberPrismaModel): CC.INumber;
 }
 export {};

package/dist/mappers/number.js CHANGED Viewed

@@ -24,12 +24,13 @@ class NumberManager extends manager_1.EntityManager {
         };
     }
     validOrThrowCreate() {
+        common_1.CommonConnect.hasTelUrlOrThrow(this.number.telUrl);
+        common_1.CommonConnect.isValidTelUrlOrThrow(this.number.telUrl);
         if (common_2.Environment.ENFORCE_E164) {
-            common_1.CommonConnect.isValidE164OrThrow(this.number.telUrl, this.number.countryIsoCode, common_2.Environment.ENFORCE_E164_WITH_MOBILE_PREFIX);
+            common_1.CommonConnect.isValidE164OrThrow(this.number.telUrl.split("tel:")[1], this.number.countryIsoCode, common_2.Environment.ENFORCE_E164_WITH_MOBILE_PREFIX);
         }
         common_1.CommonConnect.hasNameOrThrow(this.number.name);
         common_1.CommonConnect.isValidNameOrThrow(this.number.name);
-        common_1.CommonConnect.hasTelUrlOrThrow(this.number.telUrl);
         common_1.CommonConnect.isValidAORLinkOrThrow(this.number.aorLink);
         common_1.CommonConnect.hasCityOrThrow(this.number.city);
         common_1.CommonConnect.hasCountryOrThrow(this.number.country);
@@ -88,5 +89,25 @@ class NumberManager extends manager_1.EntityManager {
             }
             : undefined;
     }
+    static mapToDtoWithoutTrunk(number) {
+        return number
+            ? {
+                apiVersion: number.apiVersion,
+                ref: number.ref,
+                name: number.name,
+                trunkRef: number.trunkRef,
+                telUrl: number.telUrl,
+                aorLink: number.aorLink,
+                city: number.city,
+                country: number.country,
+                countryIsoCode: number.countryISOCode,
+                sessionAffinityHeader: number.sessionAffinityHeader,
+                extraHeaders: number.extraHeaders,
+                extended: number.extended,
+                createdAt: number.createdAt.getTime() / 1000,
+                updatedAt: number.updatedAt.getTime() / 1000
+            }
+            : undefined;
+    }
 }
 exports.NumberManager = NumberManager;

package/dist/mappers/utils.d.ts CHANGED Viewed

@@ -6,4 +6,4 @@ import { DomainManager } from "./domain";
 import { NumberManager } from "./number";
 import { PeerManager } from "./peer";
 import { TrunkManager } from "./trunk";
-export declare function getManager(kind: CC.KindWithoutUnknown): typeof ACLManager | typeof CredentialsManager | typeof DomainManager | typeof AgentManager | typeof TrunkManager | typeof NumberManager | typeof PeerManager;
+export declare function getManager(kind: CC.KindWithoutUnknown): typeof ACLManager | typeof CredentialsManager | typeof TrunkManager | typeof NumberManager | typeof DomainManager | typeof AgentManager | typeof PeerManager;

package/dist/service.js CHANGED Viewed

@@ -68,9 +68,9 @@ const logger = (0, logger_1.getLogger)({ service: "pgdata", filePath: __filename
  */
 function pgDataService(config) {
     const { bindAddr } = config;
-    logger.info("starting routr service", { bindAddr, name: "pgdata" });
     const internalServer = new grpc.Server();
     const externalServer = new grpc.Server();
+    logger.info("starting routr service", { bindAddr, name: "pgdata" });
     const kinds = [
         common_1.CommonConnect.Kind.AGENT,
         common_1.CommonConnect.Kind.CREDENTIALS,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@routr/pgdata",
-  "version": "2.7.2",
+  "version": "2.7.5",
   "description": "Postgres API Server for Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -32,8 +32,8 @@
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
     "@prisma/client": "^5.9.1",
-    "@routr/common": "^2.7.2",
-    "@routr/processor": "^2.7.2",
+    "@routr/common": "^2.7.5",
+    "@routr/processor": "^2.7.5",
     "google-protobuf": "^3.9.2",
     "pb-util": "^1.0.3",
     "phone": "^3.1.32",
@@ -57,5 +57,5 @@
     "@types/validator": "^13.7.10",
     "prisma": "^5.9.1"
   },
-  "gitHead": "01dfded02d52434ae789257b069b3bba1949878f"
+  "gitHead": "dddfe0d347cd9cf928c2500fe01ed14df2a3943a"
 }