@fintekkers/ledger-models 0.1.61 → 0.1.63

package/node/wrappers/models/utils/serialization.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"serialization.test.js","sourceRoot":"","sources":["serialization.test.ts"],"names":[],"mappings":";;AAEA,iDAAyD;AACzD,+BAA8B;AAE9B,+BAAkC;AAClC,IAAI,CAAC,2EAA2E,EAAE;IAC9E,iBAAiB,EAAE,CAAC;AACtB,CAAC,CAAC,CAAC;AAEL,SAAS,iBAAiB;IACtB,SAAS,EAAE,CAAC;IAEZ,oCAAoC;IAEpC,IAAM,cAAc,GAAQ,sCAAsB,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACzE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvD,IAAM,gBAAgB,GAAQ,sCAAsB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACjF,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEzD,IAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,IAAM,mBAAmB,GAAQ,sCAAsB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACvE,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE5D,IAAM,qBAAqB,GAAQ,sCAAsB,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC3F,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,SAAS;IACd,IAAM,IAAI,GAAS,WAAI,CAAC,MAAM,EAAE,CAAC;IACjC,IAAM,cAAc,GAAc,sCAAsB,CAAC,SAAS,CAAC,IAAI,CAAc,CAAC;IACtF,IAAM,QAAQ,GAAS,sCAAsB,CAAC,WAAW,CAAC,cAAc,CAAS,CAAC;IAElF,IAAM,UAAU,GAAW,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3C,IAAM,cAAc,GAAW,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEnD,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACzC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;AACzD,CAAC"}
+{"version":3,"file":"serialization.test.js","sourceRoot":"","sources":["serialization.test.ts"],"names":[],"mappings":";;AAEA,iDAAyD;AACzD,+BAA8B;AAE9B,+BAAkC;AAClC,IAAI,CAAC,iCAAiC,EAAE;IACpC,iBAAiB,EAAE,CAAC;AACtB,CAAC,CAAC,CAAC;AAEL,SAAS,iBAAiB;IACtB,SAAS,EAAE,CAAC;IAEZ,IAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,uCAAuC;IAC/E,IAAM,cAAc,GAAQ,sCAAsB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACxE,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE3D,IAAM,gBAAgB,GAAQ,sCAAsB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACjF,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEhE,IAAM,mBAAmB,GAAQ,sCAAsB,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAC7E,MAAM,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEhE,IAAM,qBAAqB,GAAQ,sCAAsB,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAC3F,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,SAAS;IACd,IAAM,IAAI,GAAS,WAAI,CAAC,MAAM,EAAE,CAAC;IACjC,IAAM,cAAc,GAAc,sCAAsB,CAAC,SAAS,CAAC,IAAI,CAAc,CAAC;IACtF,IAAM,QAAQ,GAAS,sCAAsB,CAAC,WAAW,CAAC,cAAc,CAAS,CAAC;IAElF,IAAM,UAAU,GAAW,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3C,IAAM,cAAc,GAAW,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAEnD,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACzC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;AACzD,CAAC"}

package/node/wrappers/models/utils/serialization.test.ts

@@ -4,27 +4,25 @@ import { ProtoSerializationUtil } from './serialization';
 import { UUID } from './uuid';
 
 import assert = require('assert');
-test('test creating a security against the api.fintekkers.org portfolio service', () => {
+test('test serialization of key types', () => {
     testSerialization();
   });
 
 function testSerialization(): void {
     checkUUID();
 
-    //TODO: Make these tests more robust
-
-    const serializedDate: any = ProtoSerializationUtil.serialize(new Date());
-    assert(serializedDate.toString().indexOf('2023') > -1);
+    const march2023 = new Date(2023, 2, 5); //Month is zero-indexed, so 2 == March.
+    const serializedDate: any = ProtoSerializationUtil.serialize(march2023);
+    assert(serializedDate.toString().indexOf('2023,3,5') > -1);
 
     const deserializedDate: any = ProtoSerializationUtil.deserialize(serializedDate);
-    assert(deserializedDate.toString().indexOf('2023') > -1);
+    assert(deserializedDate.toString().indexOf('Mar 05 2023') > -1);
 
-    const obj = new Date();
-    const serializedTimestamp: any = ProtoSerializationUtil.serialize(obj);
-    assert(serializedTimestamp.toString().indexOf('2023') > -1);
+    const serializedTimestamp: any = ProtoSerializationUtil.serialize(march2023);
+    assert(serializedTimestamp.toString().indexOf('2023,3,5') > -1);
 
     const deserializedTimestamp: any = ProtoSerializationUtil.deserialize(serializedTimestamp);
-    assert(deserializedTimestamp.toString().indexOf('2023') > -1);
+    assert(deserializedTimestamp.toString().indexOf('Mar 05 2023') > -1);
 }
 
 function checkUUID() {

package/node/wrappers/models/utils/serialization.ts

@@ -2,46 +2,54 @@ import { DecimalValueProto } from "../../../fintekkers/models/util/decimal_value
 import { LocalDateProto } from "../../../fintekkers/models/util/local_date_pb";
 import { LocalTimestampProto } from "../../../fintekkers/models/util/local_timestamp_pb";
 import { UUIDProto } from "../../../fintekkers/models/util/uuid_pb";
+import { ZonedDateTime } from "./datetime";
 import { UUID } from "./uuid";
 
-  
-  interface EnumValueDescriptor {
-    name: string;
-    values_by_number: { [key: number]: { name: string } };
+interface EnumValueDescriptor {
+  name: string;
+  values_by_number: { [key: number]: { name: string } };
+}
+
+export class ProtoSerializationUtil {
+  static serialize(obj: any): any {
+    if (obj instanceof UUID) {
+      return obj.toUUIDProto();
+    }
+    if (obj instanceof Date) {
+      return new LocalDateProto()
+        .setYear(obj.getFullYear())
+        .setMonth(obj.getMonth() + 1)
+        .setDay(obj.getDate());
+    }
+    if (obj instanceof ZonedDateTime) {
+      return obj.toProto();
+    }
+    if (typeof obj === "number") {
+      return new DecimalValueProto().setArbitraryPrecisionValue(obj.toString());
+    }
+
+    throw new Error(`Could not serialize object of type ${typeof obj}. Value: ${obj}`);
   }
-  
-  export class ProtoSerializationUtil {
-    static serialize(obj: any) {
-      if (obj instanceof UUID) {
-        return obj.toUUIDProto();
-      }
-      if (obj instanceof Date) {
-        return new LocalDateProto()
-            .setYear(obj.getUTCFullYear())
-            .setMonth(obj.getUTCMonth() + 1)
-            .setDay(obj.getUTCDate());
-      }
-      if (typeof obj === "number") {
-        return new DecimalValueProto().setArbitraryPrecisionValue(obj.toString());
-      }
-  
-      throw new Error(`Could not serialize object of type ${typeof obj}. Value: ${obj}`);
-    }
-  
-    static deserialize(obj: any) {
-      if (obj instanceof UUIDProto) {
-        return UUID.fromU8Array(obj.getRawUuid_asU8());
-      }
-      if (obj instanceof LocalDateProto) {
-        return new Date(Date.UTC(obj.getYear(), obj.getMonth() - 1, obj.getDay()));
-      }
-      if (obj.enum_name && obj.enum_name === "TRANSACTION_TYPE") {
-        return null;// new TransactionType(obj.enum_value);
-      }
-      if (obj instanceof DecimalValueProto) {
-        return parseFloat(obj.getArbitraryPrecisionValue());
-      }
-  
-      throw new Error(`Could not deserialize object of type ${typeof obj}. Value: ${obj}`);
+
+  static deserialize(obj: any): any {
+    if (obj instanceof UUIDProto) {
+      return UUID.fromU8Array(obj.getRawUuid_asU8());
+    }
+    if (obj instanceof LocalDateProto) {
+      const date = new Date(obj.getYear(), obj.getMonth() - 1, obj.getDay());
+      date.setHours(0, 0, 0, 0);
+      return date;
+    }
+    if (obj instanceof LocalTimestampProto) {
+      return new ZonedDateTime(obj);
     }
+    if (obj.enum_name && obj.enum_name === "TRANSACTION_TYPE") {
+      return null;// new TransactionType(obj.enum_value);
+    }
+    if (obj instanceof DecimalValueProto) {
+      return parseFloat(obj.getArbitraryPrecisionValue());
+    }
+
+    throw new Error(`Could not deserialize object of type ${typeof obj}. Value: ${obj}`);
   }
+}

package/node/wrappers/models/utils/serialization.util.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unpack = exports.pack = void 0;
+var any_pb_1 = require("google-protobuf/google/protobuf/any_pb");
+var wrappers_pb_1 = require("google-protobuf/google/protobuf/wrappers_pb");
+var serialization_1 = require("./serialization");
+var local_date_pb_1 = require("../../../fintekkers/models/util/local_date_pb");
+var datetime_1 = require("./datetime");
+var local_timestamp_pb_1 = require("../../../fintekkers/models/util/local_timestamp_pb");
+var uuid_1 = require("./uuid");
+var uuid_pb_1 = require("../../../fintekkers/models/util/uuid_pb");
+function pack(value) {
+    if (typeof value === 'string') {
+        return packStringIntoAny(value);
+    }
+    else if (value instanceof Date) {
+        var localDateProto = serialization_1.ProtoSerializationUtil.serialize(value);
+        return packDateIntoAny(localDateProto);
+    }
+    else if (value instanceof datetime_1.ZonedDateTime) {
+        var localDateProto = serialization_1.ProtoSerializationUtil.serialize(value);
+        return packTimestampIntoAny(localDateProto);
+    }
+    else if (value instanceof uuid_1.UUID) {
+        // const uuid: UUIDProto = ProtoSerializationUtil.serialize(value);
+        return packIDIntoAny(value.toUUIDProto());
+    }
+    else {
+        throw new Error("Unrecognized type cannot be packed: " + typeof value);
+    }
+}
+exports.pack = pack;
+function unpack(value) {
+    var typeUrl = value.getTypeUrl();
+    if (typeUrl === 'type.googleapis.com/google.protobuf.StringValue') {
+        return unpackStringFromAny(value);
+    }
+    else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.LocalDateProto') {
+        return unpackDateFromAny(value);
+    }
+    else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.LocalTimestampProto') {
+        return unpackTimestampFromAny(value);
+    }
+    else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.UUIDProto') {
+        return unpackIDIntoAny(value);
+    }
+    else {
+        console.log(value);
+        throw new Error("Unrecognized Any type cannot be unpacked: " + typeUrl);
+    }
+}
+exports.unpack = unpack;
+function packIDIntoAny(uuid) {
+    var anyMessage = new any_pb_1.Any();
+    anyMessage.pack(uuid.serializeBinary(), 'fintekkers.models.util.UUIDProto');
+    return anyMessage;
+}
+function unpackIDIntoAny(anyMessage) {
+    var typeUrl = anyMessage.getTypeUrl();
+    if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.UUIDProto') {
+        throw new Error('Unexpected type URL for a date: ' + typeUrl);
+    }
+    var uuidProto = uuid_pb_1.UUIDProto.deserializeBinary(anyMessage.getValue_asU8());
+    return serialization_1.ProtoSerializationUtil.deserialize(uuidProto);
+}
+function packTimestampIntoAny(inputDate) {
+    var anyMessage = new any_pb_1.Any();
+    anyMessage.pack(inputDate.serializeBinary(), 'fintekkers.models.util.LocalTimestampProto');
+    return anyMessage;
+}
+function unpackTimestampFromAny(anyMessage) {
+    var typeUrl = anyMessage.getTypeUrl();
+    if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.LocalTimestampProto') {
+        throw new Error('Unexpected type URL for a timestamp: ' + typeUrl);
+    }
+    var dateProto = local_timestamp_pb_1.LocalTimestampProto.deserializeBinary(anyMessage.getValue_asU8());
+    return serialization_1.ProtoSerializationUtil.deserialize(dateProto);
+}
+function packDateIntoAny(inputDate) {
+    var anyMessage = new any_pb_1.Any();
+    anyMessage.pack(inputDate.serializeBinary(), 'fintekkers.models.util.LocalDateProto');
+    return anyMessage;
+}
+function unpackDateFromAny(anyMessage) {
+    var typeUrl = anyMessage.getTypeUrl();
+    if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.LocalDateProto') {
+        throw new Error('Unexpected type URL for a date: ' + typeUrl);
+    }
+    var dateProto = local_date_pb_1.LocalDateProto.deserializeBinary(anyMessage.getValue_asU8());
+    return serialization_1.ProtoSerializationUtil.deserialize(dateProto);
+}
+function packStringIntoAny(inputString) {
+    var stringValue = new wrappers_pb_1.StringValue();
+    stringValue.setValue(inputString);
+    var anyMessage = new any_pb_1.Any();
+    anyMessage.pack(stringValue.serializeBinary(), 'google.protobuf.StringValue');
+    return anyMessage;
+}
+function unpackStringFromAny(anyMessage) {
+    var typeUrl = anyMessage.getTypeUrl();
+    if (typeUrl !== 'type.googleapis.com/google.protobuf.StringValue') {
+        throw new Error('Unexpected type URL: ' + typeUrl);
+    }
+    var packedData = wrappers_pb_1.StringValue.deserializeBinary(anyMessage.getValue_asU8());
+    var stringValue = packedData.getValue();
+    return stringValue;
+}
+//# sourceMappingURL=serialization.util.js.map

package/node/wrappers/models/utils/serialization.util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serialization.util.js","sourceRoot":"","sources":["serialization.util.ts"],"names":[],"mappings":"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"}

package/node/wrappers/models/utils/serialization.util.test.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var serialization_util_1 = require("./serialization.util");
+var datetime_1 = require("./datetime");
+var assert = require("assert");
+test('test packing/unpacking string', function () {
+    testString();
+});
+test('test packing/unpacking date', function () {
+    testDate();
+});
+test('test packing/unpacking timestamp', function () {
+    testTimestamp();
+});
+function testTimestamp() {
+    var now = datetime_1.ZonedDateTime.now();
+    var packedNow = (0, serialization_util_1.pack)(now);
+    var unpackedNow = (0, serialization_util_1.unpack)(packedNow);
+    assert.equal(now.getTimezone(), unpackedNow.getTimezone(), "Timezone doesn't match");
+    assert.equal(now.getSeconds(), unpackedNow.getSeconds(), "Seconds do not match");
+    assert.equal(now.getNanoSeconds(), unpackedNow.getNanoSeconds(), "Nanoseconds do not match");
+}
+function testDate() {
+    var testDate = new Date();
+    testDate.setHours(0, 0, 0, 0);
+    var packedDate = (0, serialization_util_1.pack)(testDate);
+    var unpackedDate = (0, serialization_util_1.unpack)(packedDate);
+    assert.equal(unpackedDate.getTime(), testDate.getTime(), "Date packing/unpacking failed");
+}
+function testString() {
+    var testString = "Hello";
+    var packedString = (0, serialization_util_1.pack)(testString);
+    var unpackedString = (0, serialization_util_1.unpack)(packedString);
+    assert.equal(unpackedString, testString, "String packing/unpacking failed");
+}
+//# sourceMappingURL=serialization.util.test.js.map

package/node/wrappers/models/utils/serialization.util.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"serialization.util.test.js","sourceRoot":"","sources":["serialization.util.test.ts"],"names":[],"mappings":";;AAEA,2DAAoD;AACpD,uCAA2C;AAE3C,+BAAkC;AAElC,IAAI,CAAC,+BAA+B,EAAE;IACpC,UAAU,EAAE,CAAC;AACf,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6BAA6B,EAAE;IAClC,QAAQ,EAAE,CAAC;AACb,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kCAAkC,EAAE;IACvC,aAAa,EAAE,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,SAAS,aAAa;IACpB,IAAM,GAAG,GAAG,wBAAa,CAAC,GAAG,EAAE,CAAC;IAEhC,IAAM,SAAS,GAAQ,IAAA,yBAAI,EAAC,GAAG,CAAC,CAAC;IACjC,IAAM,WAAW,GAAkB,IAAA,2BAAM,EAAC,SAAS,CAAC,CAAC;IAErD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,WAAW,CAAC,WAAW,EAAE,EAAE,wBAAwB,CAAC,CAAC;IACrF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,UAAU,EAAE,EAAE,sBAAsB,CAAC,CAAC;IACjF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,WAAW,CAAC,cAAc,EAAE,EAAE,0BAA0B,CAAC,CAAC;AAC/F,CAAC;AAED,SAAS,QAAQ;IACf,IAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAA;IAC3B,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE9B,IAAM,UAAU,GAAQ,IAAA,yBAAI,EAAC,QAAQ,CAAC,CAAC;IACvC,IAAM,YAAY,GAAS,IAAA,2BAAM,EAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,+BAA+B,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,UAAU;IACjB,IAAM,UAAU,GAAG,OAAO,CAAC;IAE3B,IAAM,YAAY,GAAQ,IAAA,yBAAI,EAAC,UAAU,CAAC,CAAC;IAC3C,IAAM,cAAc,GAAW,IAAA,2BAAM,EAAC,YAAY,CAAC,CAAC;IACpD,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,UAAU,EAAE,iCAAiC,CAAC,CAAC;AAC9E,CAAC"}

package/node/wrappers/models/utils/serialization.util.test.ts

@@ -0,0 +1,47 @@
+import { Any } from 'google-protobuf/google/protobuf/any_pb';
+
+import { pack, unpack } from './serialization.util';
+import { ZonedDateTime } from './datetime';
+
+import assert = require('assert');
+
+test('test packing/unpacking string', () => {
+  testString();
+});
+
+test('test packing/unpacking date', () => {
+  testDate();
+});
+
+test('test packing/unpacking timestamp', () => {
+  testTimestamp();
+});
+
+function testTimestamp() {
+  const now = ZonedDateTime.now();
+
+  const packedNow: Any = pack(now);
+  const unpackedNow: ZonedDateTime = unpack(packedNow);
+
+  assert.equal(now.getTimezone(), unpackedNow.getTimezone(), "Timezone doesn't match");
+  assert.equal(now.getSeconds(), unpackedNow.getSeconds(), "Seconds do not match");
+  assert.equal(now.getNanoSeconds(), unpackedNow.getNanoSeconds(), "Nanoseconds do not match");
+}
+
+function testDate() {
+  const testDate = new Date()
+  testDate.setHours(0, 0, 0, 0);
+
+  const packedDate: Any = pack(testDate);
+  const unpackedDate: Date = unpack(packedDate);
+  assert.equal(unpackedDate.getTime(), testDate.getTime(), "Date packing/unpacking failed");
+}
+
+function testString() {
+  const testString = "Hello";
+
+  const packedString: Any = pack(testString);
+  const unpackedString: String = unpack(packedString);
+  assert.equal(unpackedString, testString, "String packing/unpacking failed");
+}
+

package/node/wrappers/models/utils/serialization.util.ts

@@ -0,0 +1,121 @@
+import { Any } from 'google-protobuf/google/protobuf/any_pb';
+import { StringValue } from 'google-protobuf/google/protobuf/wrappers_pb';
+import { ProtoSerializationUtil } from './serialization';
+import { LocalDateProto } from '../../../fintekkers/models/util/local_date_pb';
+import { ZonedDateTime } from './datetime';
+import { LocalTimestampProto } from '../../../fintekkers/models/util/local_timestamp_pb';
+import { UUID } from './uuid';
+import { UUIDProto } from '../../../fintekkers/models/util/uuid_pb';
+
+function pack(value: any) {
+  if (typeof value === 'string') {
+    return packStringIntoAny(value);
+  } else if (value instanceof Date) {
+    const localDateProto: LocalDateProto = ProtoSerializationUtil.serialize(value);
+    return packDateIntoAny(localDateProto);
+  } else if (value instanceof ZonedDateTime) {
+    const localDateProto: LocalTimestampProto = ProtoSerializationUtil.serialize(value);
+    return packTimestampIntoAny(localDateProto);
+  } else if (value instanceof UUID) {
+    // const uuid: UUIDProto = ProtoSerializationUtil.serialize(value);
+    return packIDIntoAny(value.toUUIDProto());
+  } else {
+    throw new Error("Unrecognized type cannot be packed: " + typeof value);
+  }
+}
+
+function unpack(value: Any): any {
+  const typeUrl = value.getTypeUrl();
+  if (typeUrl === 'type.googleapis.com/google.protobuf.StringValue') {
+    return unpackStringFromAny(value);
+  } else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.LocalDateProto') {
+    return unpackDateFromAny(value);
+  } else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.LocalTimestampProto') {
+    return unpackTimestampFromAny(value);
+  } else if (typeUrl === 'type.googleapis.com/fintekkers.models.util.UUIDProto') {
+    return unpackIDIntoAny(value);
+  } else {
+    console.log(value);
+    throw new Error("Unrecognized Any type cannot be unpacked: " + typeUrl);
+  }
+}
+
+
+function packIDIntoAny(uuid: UUIDProto): Any {
+  const anyMessage = new Any();
+
+  anyMessage.pack(uuid.serializeBinary(), 'fintekkers.models.util.UUIDProto');
+  return anyMessage;
+}
+
+function unpackIDIntoAny(anyMessage: Any): UUIDProto {
+  const typeUrl = anyMessage.getTypeUrl();
+
+  if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.UUIDProto') {
+    throw new Error('Unexpected type URL for a date: ' + typeUrl);
+  }
+
+  const uuidProto: UUIDProto = UUIDProto.deserializeBinary(anyMessage.getValue_asU8());
+  return ProtoSerializationUtil.deserialize(uuidProto);
+}
+
+function packTimestampIntoAny(inputDate: LocalTimestampProto): Any {
+  const anyMessage = new Any();
+
+  anyMessage.pack(inputDate.serializeBinary(), 'fintekkers.models.util.LocalTimestampProto');
+  return anyMessage;
+}
+
+function unpackTimestampFromAny(anyMessage: Any): LocalTimestampProto {
+  const typeUrl = anyMessage.getTypeUrl();
+
+  if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.LocalTimestampProto') {
+    throw new Error('Unexpected type URL for a timestamp: ' + typeUrl);
+  }
+
+  const dateProto: LocalTimestampProto = LocalTimestampProto.deserializeBinary(anyMessage.getValue_asU8());
+  return ProtoSerializationUtil.deserialize(dateProto);
+}
+
+function packDateIntoAny(inputDate: LocalDateProto): Any {
+  const anyMessage = new Any();
+
+  anyMessage.pack(inputDate.serializeBinary(), 'fintekkers.models.util.LocalDateProto');
+  return anyMessage;
+}
+
+function unpackDateFromAny(anyMessage: Any): LocalDateProto {
+  const typeUrl = anyMessage.getTypeUrl();
+
+  if (typeUrl !== 'type.googleapis.com/fintekkers.models.util.LocalDateProto') {
+    throw new Error('Unexpected type URL for a date: ' + typeUrl);
+  }
+
+  const dateProto: LocalDateProto = LocalDateProto.deserializeBinary(anyMessage.getValue_asU8());
+  return ProtoSerializationUtil.deserialize(dateProto);
+}
+
+function packStringIntoAny(inputString: string): Any {
+  const stringValue = new StringValue();
+  stringValue.setValue(inputString);
+
+  const anyMessage = new Any();
+  anyMessage.pack(stringValue.serializeBinary(), 'google.protobuf.StringValue');
+
+  return anyMessage;
+}
+
+function unpackStringFromAny(anyMessage: Any): string | null {
+  const typeUrl = anyMessage.getTypeUrl();
+
+  if (typeUrl !== 'type.googleapis.com/google.protobuf.StringValue') {
+    throw new Error('Unexpected type URL: ' + typeUrl);
+  }
+
+  const packedData = StringValue.deserializeBinary(anyMessage.getValue_asU8());
+  const stringValue = packedData.getValue();
+
+  return stringValue;
+}
+
+export { pack, unpack };

package/node/wrappers/services/portfolio-service/PortfolioService.js

@@ -37,19 +37,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PortfolioService = void 0;
-var grpc = require("@grpc/grpc-js");
 var util_1 = require("util");
-var util_2 = require("../../models/utils/util");
 // Model Utils
-var position_filter_pb_1 = require("../../../fintekkers/models/position/position_filter_pb");
 // Requests & Services
 var portfolio_service_grpc_pb_1 = require("../../../fintekkers/services/portfolio-service/portfolio_service_grpc_pb");
 var query_portfolio_request_pb_1 = require("../../../fintekkers/requests/portfolio/query_portfolio_request_pb");
 var create_portfolio_request_pb_1 = require("../../../fintekkers/requests/portfolio/create_portfolio_request_pb");
+var requestcontext_1 = require("../../models/utils/requestcontext");
+var portfolio_1 = require("../../models/portfolio/portfolio");
 var PortfolioService = /** @class */ (function () {
     function PortfolioService() {
-        this.client = new portfolio_service_grpc_pb_1.PortfolioClient('api.fintekkers.org:8082', grpc.credentials.createSsl());
-        // this.client = new PortfolioClient('localhost:8082', grpc.credentials.createInsecure());
+        this.client = new portfolio_service_grpc_pb_1.PortfolioClient(requestcontext_1.default.apiURL, requestcontext_1.default.apiCredentials);
     }
     PortfolioService.prototype.validateCreatePortfolio = function (portfolio) {
         return __awaiter(this, void 0, void 0, function () {
@@ -89,7 +87,7 @@ var PortfolioService = /** @class */ (function () {
             });
         });
     };
-    PortfolioService.prototype.searchPortfolio = function (asOf, fieldProto, fieldValue) {
+    PortfolioService.prototype.searchPortfolio = function (asOf, positionFilter) {
         return __awaiter(this, void 0, void 0, function () {
             function processStreamSynchronously() {
                 return __awaiter(this, void 0, void 0, function () {
@@ -99,7 +97,7 @@ var PortfolioService = /** @class */ (function () {
                         return [2 /*return*/, new Promise(function (resolve, reject) {
                                 stream2.on('data', function (response) {
                                     response.getPortfolioResponseList().forEach(function (portfolio) {
-                                        listPortfolios.push(portfolio);
+                                        listPortfolios.push(new portfolio_1.default(portfolio));
                                     });
                                 });
                                 stream2.on('end', function () {
@@ -113,7 +111,7 @@ var PortfolioService = /** @class */ (function () {
                     });
                 });
             }
-            var searchRequest, positionFilter, fieldMapEntry, tmpClient, listPortfolios;
+            var searchRequest, tmpClient, listPortfolios;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -121,14 +119,7 @@ var PortfolioService = /** @class */ (function () {
                         searchRequest.setObjectClass('PortfolioRequest');
                         searchRequest.setVersion('0.0.1');
                         searchRequest.setAsOf(asOf);
-                        positionFilter = new position_filter_pb_1.PositionFilterProto();
-                        positionFilter.setObjectClass('PositionFilter');
-                        positionFilter.setVersion('0.0.1');
-                        if (fieldProto && fieldValue) {
-                            fieldMapEntry = (0, util_2.createFieldMapEntry)(fieldProto, fieldValue);
-                            positionFilter.setFiltersList([fieldMapEntry]);
-                        }
-                        searchRequest.setSearchPortfolioInput(positionFilter);
+                        searchRequest.setSearchPortfolioInput(positionFilter.toProto());
                         tmpClient = this.client;
                         listPortfolios = [];
                         return [4 /*yield*/, processStreamSynchronously()];
@@ -137,6 +128,7 @@ var PortfolioService = /** @class */ (function () {
             });
         });
     };
+    PortfolioService.url = requestcontext_1.default.apiURL;
     return PortfolioService;
 }());
 exports.PortfolioService = PortfolioService;

package/node/wrappers/services/portfolio-service/PortfolioService.js.map

@@ -1 +1 @@
-{"version":3,"file":"PortfolioService.js","sourceRoot":"","sources":["PortfolioService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PortfolioService.js","sourceRoot":"","sources":["PortfolioService.ts"],"names":[],"mappings":"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"}

package/node/wrappers/services/portfolio-service/PortfolioService.ts

@@ -1,15 +1,11 @@
-import * as grpc from '@grpc/grpc-js';
 import { promisify } from 'util';
 
 // Models
 import { PortfolioProto } from '../../../fintekkers/models/portfolio/portfolio_pb';
-import { createFieldMapEntry } from '../../models/utils/util';
 import { LocalTimestampProto } from '../../../fintekkers/models/util/local_timestamp_pb';
 import { SummaryProto } from '../../../fintekkers/requests/util/errors/summary_pb';
 
 // Model Utils
-import { PositionFilterProto } from '../../../fintekkers/models/position/position_filter_pb';
-import { FieldProto } from '../../../fintekkers/models/position/field_pb';
 
 // Requests & Services
 import { PortfolioClient } from '../../../fintekkers/services/portfolio-service/portfolio_service_grpc_pb';
@@ -17,13 +13,17 @@ import { QueryPortfolioRequestProto } from '../../../fintekkers/requests/portfol
 import { QueryPortfolioResponseProto } from '../../../fintekkers/requests/portfolio/query_portfolio_response_pb';
 import { CreatePortfolioRequestProto } from '../../../fintekkers/requests/portfolio/create_portfolio_request_pb';
 import { CreatePortfolioResponseProto } from '../../../fintekkers/requests/portfolio/create_portfolio_response_pb';
+import EnvConfig from '../../models/utils/requestcontext';
+import { PositionFilter } from '../../models/position/positionfilter';
+import Portfolio from '../../models/portfolio/portfolio';
 
 class PortfolioService {
   private client: PortfolioClient;
 
+  static url: string = EnvConfig.apiURL;
+
   constructor() {
-    this.client = new PortfolioClient('api.fintekkers.org:8082', grpc.credentials.createSsl());
-    // this.client = new PortfolioClient('localhost:8082', grpc.credentials.createInsecure());
+    this.client = new PortfolioClient(EnvConfig.apiURL, EnvConfig.apiCredentials);
   }
 
   async validateCreatePortfolio(portfolio: PortfolioProto): Promise<SummaryProto> {
@@ -48,36 +48,26 @@ class PortfolioService {
     return response;
   }
 
-  async searchPortfolio(asOf: LocalTimestampProto, 
-      fieldProto?: FieldProto, fieldValue?: string): Promise<PortfolioProto[]> {
+  async searchPortfolio(asOf: LocalTimestampProto,
+    positionFilter: PositionFilter): Promise<Portfolio[]> {
     const searchRequest = new QueryPortfolioRequestProto();
     searchRequest.setObjectClass('PortfolioRequest');
     searchRequest.setVersion('0.0.1');
     searchRequest.setAsOf(asOf);
 
-    // Need to improve validation logic, uncommenting this code will cause an error of 2:UNKNOWN
-    const positionFilter = new PositionFilterProto();
-    positionFilter.setObjectClass('PositionFilter');
-    positionFilter.setVersion('0.0.1');
-
-    if (fieldProto && fieldValue) {
-      const fieldMapEntry = createFieldMapEntry(fieldProto, fieldValue);
-      positionFilter.setFiltersList([fieldMapEntry]);
-    }
-
-    searchRequest.setSearchPortfolioInput(positionFilter);
+    searchRequest.setSearchPortfolioInput(positionFilter.toProto());
 
     const tmpClient = this.client;
 
-    const listPortfolios: PortfolioProto[] = [];
+    const listPortfolios: Portfolio[] = [];
 
-    async function processStreamSynchronously(): Promise<PortfolioProto[]> {
+    async function processStreamSynchronously(): Promise<Portfolio[]> {
       const stream2 = tmpClient.search(searchRequest);
 
-      return new Promise<PortfolioProto[]>((resolve, reject) => {
-        stream2.on('data', (response:QueryPortfolioResponseProto) => {
+      return new Promise<Portfolio[]>((resolve, reject) => {
+        stream2.on('data', (response: QueryPortfolioResponseProto) => {
           response.getPortfolioResponseList().forEach((portfolio) => {
-            listPortfolios.push(portfolio);
+            listPortfolios.push(new Portfolio(portfolio));
           });
         });