@fintekkers/ledger-models 0.1.61 → 0.1.63

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

@@ -37,7 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testPortfolio = void 0;
 // Model Utils
 var field_pb_1 = require("../../../fintekkers/models/position/field_pb");
 var uuid = require("../../models/utils/uuid");
@@ -45,38 +44,35 @@ var dt = require("../../models/utils/datetime");
 //Requests & Services
 var PortfolioService_1 = require("./PortfolioService");
 var portfolio_pb_1 = require("../../../fintekkers/models/portfolio/portfolio_pb");
-test('test creating a portfolio against the api.fintekkers.org portfolio service', function () {
-    var isTrue = testPortfolio();
-    expect(isTrue).resolves.toBe(true);
-}, 30000);
-function testPortfolio() {
-    return __awaiter(this, void 0, void 0, function () {
-        var id_proto, now, portfolioService, portfolio, validationSummary, createPortfolioResponse, searchResults;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    id_proto = uuid.UUID.random().toUUIDProto();
-                    now = dt.ZonedDateTime.now();
-                    portfolioService = new PortfolioService_1.PortfolioService();
-                    portfolio = new portfolio_pb_1.PortfolioProto();
-                    portfolio.setObjectClass('Portfolio');
-                    portfolio.setVersion('0.0.1');
-                    portfolio.setUuid(id_proto);
-                    portfolio.setPortfolioName('TEST PORTFOLIO');
-                    portfolio.setAsOf(now.to_date_proto());
-                    return [4 /*yield*/, portfolioService.validateCreatePortfolio(portfolio)];
-                case 1:
-                    validationSummary = _a.sent();
-                    return [4 /*yield*/, portfolioService.createPortfolio(portfolio)];
-                case 2:
-                    createPortfolioResponse = _a.sent();
-                    return [4 /*yield*/, portfolioService.searchPortfolio(now.to_date_proto(), field_pb_1.FieldProto.PORTFOLIO_NAME, 'Federal Reserve SOMA Holdings')];
-                case 3:
-                    searchResults = _a.sent();
-                    return [2 /*return*/, true];
-            }
-        });
+var positionfilter_1 = require("../../models/position/positionfilter");
+test('test creating a portfolio against the api.fintekkers.org portfolio service', function () { return __awaiter(void 0, void 0, void 0, function () {
+    var id_proto, now, portfolioService, portfolio, validationSummary, createPortfolioResponse, searchResults;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                id_proto = uuid.UUID.random().toUUIDProto();
+                now = dt.ZonedDateTime.now();
+                portfolioService = new PortfolioService_1.PortfolioService();
+                portfolio = new portfolio_pb_1.PortfolioProto();
+                portfolio.setObjectClass('Portfolio');
+                portfolio.setVersion('0.0.1');
+                portfolio.setUuid(id_proto);
+                portfolio.setPortfolioName('TEST PORTFOLIO');
+                portfolio.setAsOf(now.toProto());
+                return [4 /*yield*/, portfolioService.validateCreatePortfolio(portfolio)];
+            case 1:
+                validationSummary = _a.sent();
+                expect(validationSummary.getErrorsList().length).toBe(0);
+                return [4 /*yield*/, portfolioService.createPortfolio(portfolio)];
+            case 2:
+                createPortfolioResponse = _a.sent();
+                expect(createPortfolioResponse.getPortfolioResponseList().length).toBe(1);
+                return [4 /*yield*/, portfolioService.searchPortfolio(now.toProto(), new positionfilter_1.PositionFilter().addFilter(field_pb_1.FieldProto.PORTFOLIO_NAME, 'Federal Reserve SOMA Holdings'))];
+            case 3:
+                searchResults = _a.sent();
+                expect(searchResults.length > 0).toBe(true);
+                return [2 /*return*/];
+        }
     });
-}
-exports.testPortfolio = testPortfolio;
+}); }, 30000);
 //# sourceMappingURL=portfolio.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"portfolio.test.js","sourceRoot":"","sources":["portfolio.test.ts"],"names":[],"mappings":";AAAA,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAET,cAAc;AACd,yEAA0E;AAC1E,8CAAgD;AAChD,gDAAkD;AAElD,qBAAqB;AACrB,uDAAsD;AACtD,kFAAmF;AAInF,IAAI,CAAC,4EAA4E,EAAE;IACjF,IAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC,EAAE,KAAK,CAAC,CAAC;AAEV,SAAsB,aAAa;;;;;;oBAC3B,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;oBAC5C,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;oBAE7B,gBAAgB,GAAG,IAAI,mCAAgB,EAAE,CAAC;oBAE1C,SAAS,GAAG,IAAI,6BAAc,EAAE,CAAC;oBACvC,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;oBACtC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBAC9B,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBAC5B,SAAS,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;oBAC7C,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC;oBAEf,qBAAM,gBAAgB,CAAC,uBAAuB,CAAC,SAAS,CAAC,EAAA;;oBAA7E,iBAAiB,GAAG,SAAyD;oBAEtB,qBAAM,gBAAgB,CAAC,eAAe,CAAC,SAAS,CAAC,EAAA;;oBAAxG,uBAAuB,GAAgC,SAAiD;oBAExF,qBAAM,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,qBAAU,CAAC,cAAc,EAAE,+BAA+B,CAAC,EAAA;;oBAAvI,aAAa,GAAG,SAAuH;oBAE3I,sBAAO,IAAI,EAAC;;;;CACb;AApBD,sCAoBC"}
+{"version":3,"file":"portfolio.test.js","sourceRoot":"","sources":["portfolio.test.ts"],"names":[],"mappings":";AAAA,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAET,cAAc;AACd,yEAA0E;AAC1E,8CAAgD;AAChD,gDAAkD;AAElD,qBAAqB;AACrB,uDAAsD;AACtD,kFAAmF;AAEnF,uEAAsE;AAGtE,IAAI,CAAC,4EAA4E,EAAE;;;;;gBAC3E,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;gBAC5C,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;gBAE7B,gBAAgB,GAAG,IAAI,mCAAgB,EAAE,CAAC;gBAE1C,SAAS,GAAG,IAAI,6BAAc,EAAE,CAAC;gBACvC,SAAS,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;gBACtC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC9B,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5B,SAAS,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;gBAC7C,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAET,qBAAM,gBAAgB,CAAC,uBAAuB,CAAC,SAAS,CAAC,EAAA;;gBAA7E,iBAAiB,GAAG,SAAyD;gBACjF,MAAM,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEG,qBAAM,gBAAgB,CAAC,eAAe,CAAC,SAAS,CAAC,EAAA;;gBAAzG,uBAAuB,GAAiC,SAAiD;gBAC7G,MAAM,CAAC,uBAAuB,CAAC,wBAAwB,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEtD,qBAAM,gBAAgB,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,IAAI,+BAAc,EAAE,CAAC,SAAS,CAAC,qBAAU,CAAC,cAAc,EAAE,+BAA+B,CAAC,CAAC,EAAA;;gBAAjK,aAAa,GAAG,SAAiJ;gBACrK,MAAM,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;;;KAC7C,EAAE,KAAK,CAAC,CAAC"}

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

@@ -9,14 +9,10 @@ import * as dt from '../../models/utils/datetime';
 import { PortfolioService } from './PortfolioService';
 import { PortfolioProto } from '../../../fintekkers/models/portfolio/portfolio_pb';
 import { CreatePortfolioResponseProto } from '../../../fintekkers/requests/portfolio/create_portfolio_response_pb';
+import { PositionFilter } from '../../models/position/positionfilter';
 
 
-test('test creating a portfolio against the api.fintekkers.org portfolio service', () => {
-  const isTrue = testPortfolio();
-  expect(isTrue).resolves.toBe(true);
-}, 30000);
-
-export async function testPortfolio(): Promise<boolean> {
+test('test creating a portfolio against the api.fintekkers.org portfolio service', async () => {
   const id_proto = uuid.UUID.random().toUUIDProto();
   const now = dt.ZonedDateTime.now();
 
@@ -27,14 +23,14 @@ export async function testPortfolio(): Promise<boolean> {
   portfolio.setVersion('0.0.1');
   portfolio.setUuid(id_proto);
   portfolio.setPortfolioName('TEST PORTFOLIO');
-  portfolio.setAsOf(now.to_date_proto());
+  portfolio.setAsOf(now.toProto());
 
   var validationSummary = await portfolioService.validateCreatePortfolio(portfolio);
+  expect(validationSummary.getErrorsList().length).toBe(0);
 
-  var createPortfolioResponse:CreatePortfolioResponseProto = await portfolioService.createPortfolio(portfolio);
-
-  var searchResults = await portfolioService.searchPortfolio(now.to_date_proto(), FieldProto.PORTFOLIO_NAME, 'Federal Reserve SOMA Holdings');
-
-  return true;
-}
+  var createPortfolioResponse: CreatePortfolioResponseProto = await portfolioService.createPortfolio(portfolio);
+  expect(createPortfolioResponse.getPortfolioResponseList().length).toBe(1);
 
+  var searchResults = await portfolioService.searchPortfolio(now.toProto(), new PositionFilter().addFilter(FieldProto.PORTFOLIO_NAME, 'Federal Reserve SOMA Holdings'));
+  expect(searchResults.length > 0).toBe(true);
+}, 30000);

package/node/wrappers/services/position-service/PositionService.js

@@ -1,4 +1,5 @@
 "use strict";
+// Models
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -37,13 +38,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PositionService = void 0;
-var grpc = require("@grpc/grpc-js");
+// Model Utils
 // Requests & Services
 var position_service_grpc_pb_1 = require("../../../fintekkers/services/position-service/position_service_grpc_pb");
+var requestcontext_1 = require("../../models/utils/requestcontext");
 var PositionService = /** @class */ (function () {
     function PositionService() {
-        this.client = new position_service_grpc_pb_1.PositionClient('api.fintekkers.org:8082', grpc.credentials.createSsl());
-        // this.client = new PositionClient('localhost:8082', grpc.credentials.createInsecure());
+        this.client = new position_service_grpc_pb_1.PositionClient(requestcontext_1.default.apiURL, requestcontext_1.default.apiCredentials);
     }
     PositionService.prototype.search = function (request) {
         return __awaiter(this, void 0, void 0, function () {

package/node/wrappers/services/position-service/PositionService.js.map

@@ -1 +1 @@
-{"version":3,"file":"PositionService.js","sourceRoot":"","sources":["PositionService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oCAAsC;AAgBtC,sBAAsB;AACtB,mHAAwG;AAUxG;IAGE;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,yCAAc,CAAC,yBAAyB,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC;QAC1F,yFAAyF;IAC3F,CAAC;IAEK,gCAAM,GAAZ,UAAa,OAAiC;;YAI5C,SAAe,0BAA0B;;;;wBACjC,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;wBAE1C,sBAAO,IAAI,OAAO,CAAkB,UAAC,OAAO,EAAE,MAAM;gCAClD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,QAAmC;oCACrD,QAAQ,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,UAAC,QAAQ;wCAC3C,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oCAC/B,CAAC,CAAC,CAAC;gCACL,CAAC,CAAC,CAAC;gCAEH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;oCAChB,OAAO,CAAC,aAAa,CAAC,CAAC;gCACzB,CAAC,CAAC,CAAC;gCAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,GAAG;oCACtB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;oCAC3C,MAAM,CAAC,GAAG,CAAC,CAAC;gCACd,CAAC,CAAC,CAAC;4BACL,CAAC,CAAC,EAAC;;;aACJ;;;;;wBAtBK,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;wBACxB,aAAa,GAAoB,EAAE,CAAC;wBAuBnC,qBAAM,0BAA0B,EAAE,EAAA;4BAAzC,sBAAO,SAAkC,EAAC;;;;KAC3C;IACH,sBAAC;AAAD,CAAC,AAnCD,IAmCC;AAEQ,0CAAe"}
+{"version":3,"file":"PositionService.js","sourceRoot":"","sources":["PositionService.ts"],"names":[],"mappings":";AAAA,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAET,cAAc;AAEd,sBAAsB;AACtB,mHAAwG;AAKxG,oEAA0D;AAG1D;IAGE;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,yCAAc,CAAC,wBAAS,CAAC,MAAM,EAAE,wBAAS,CAAC,cAAc,CAAC,CAAC;IAC/E,CAAC;IAEK,gCAAM,GAAZ,UAAa,OAAiC;;YAI5C,SAAe,0BAA0B;;;;wBACjC,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;wBAE1C,sBAAO,IAAI,OAAO,CAAkB,UAAC,OAAO,EAAE,MAAM;gCAClD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,QAAmC;oCACrD,QAAQ,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,UAAC,QAAQ;wCAC3C,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oCAC/B,CAAC,CAAC,CAAC;gCACL,CAAC,CAAC,CAAC;gCAEH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;oCAChB,OAAO,CAAC,aAAa,CAAC,CAAC;gCACzB,CAAC,CAAC,CAAC;gCAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,GAAG;oCACtB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;oCAC3C,MAAM,CAAC,GAAG,CAAC,CAAC;gCACd,CAAC,CAAC,CAAC;4BACL,CAAC,CAAC,EAAC;;;aACJ;;;;;wBAtBK,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;wBACxB,aAAa,GAAoB,EAAE,CAAC;wBAuBnC,qBAAM,0BAA0B,EAAE,EAAA;4BAAzC,sBAAO,SAAkC,EAAC;;;;KAC3C;IACH,sBAAC;AAAD,CAAC,AAlCD,IAkCC;AAEQ,0CAAe"}

package/node/wrappers/services/position-service/PositionService.ts

@@ -1,39 +1,24 @@
-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';
-
-import { ZonedDateTime } from '../../models/utils/datetime';
-import { packStringIntoAny } from '../../models/utils/util';
 
 // Model Utils
-import { PositionFilterProto } from '../../../fintekkers/models/position/position_filter_pb';
-import { FieldProto } from '../../../fintekkers/models/position/field_pb';
 
 // Requests & Services
 import { PositionClient } from '../../../fintekkers/services/position-service/position_service_grpc_pb';
 import { QueryPositionRequestProto } from '../../../fintekkers/requests/position/query_position_request_pb';
 import { QueryPositionResponseProto } from '../../../fintekkers/requests/position/query_position_response_pb';
 
-import { Any } from "google-protobuf/google/protobuf/any_pb";
-import { IdentifierProto } from '../../../fintekkers/models/security/identifier/identifier_pb';
-import { FieldMapEntry } from '../../../fintekkers/models/position/position_util_pb';
-import { PositionProto, PositionViewProto } from '../../../fintekkers/models/position/position_pb';
+import { PositionProto } from '../../../fintekkers/models/position/position_pb';
+import EnvConfig from '../../models/utils/requestcontext';
 
 
 class PositionService {
   private client: PositionClient;
 
   constructor() {
-    this.client = new PositionClient('api.fintekkers.org:8082', grpc.credentials.createSsl());
-    // this.client = new PositionClient('localhost:8082', grpc.credentials.createInsecure());
+    this.client = new PositionClient(EnvConfig.apiURL, EnvConfig.apiCredentials);
   }
 
-  async search(request:QueryPositionRequestProto) {
+  async search(request:QueryPositionRequestProto): Promise<PositionProto[]> {
     const tmpClient = this.client;
     const listPositions: PositionProto[] = [];
 

package/node/wrappers/services/position-service/position.test.js

@@ -45,16 +45,25 @@ var field_pb_1 = require("../../../fintekkers/models/position/field_pb");
 var position_util_pb_1 = require("../../../fintekkers/models/position/position_util_pb");
 var position_filter_pb_1 = require("../../../fintekkers/models/position/position_filter_pb");
 var datetime_1 = require("../../models/utils/datetime");
-var util_1 = require("../../models/utils/util");
+var serialization_util_1 = require("../../models/utils/serialization.util");
 var any_pb_1 = require("google-protobuf/google/protobuf/any_pb");
 //Requests & Services
 var PortfolioService_1 = require("../../services/portfolio-service/PortfolioService");
 var PositionService_1 = require("../../services/position-service/PositionService");
 var query_position_request_pb_1 = require("../../../fintekkers/requests/position/query_position_request_pb");
-test('test getting a position against the api.fintekkers.org position service', function () {
-    var isTrue = testPosition();
-    expect(isTrue).resolves.toBe(true);
-}, 30000);
+var positionfilter_1 = require("../../models/position/positionfilter");
+test('test getting a position against the api.fintekkers.org position service', function () { return __awaiter(void 0, void 0, void 0, function () {
+    var isTrue;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, testPosition()];
+            case 1:
+                isTrue = _a.sent();
+                expect(isTrue).toBe(true);
+                return [2 /*return*/];
+        }
+    });
+}); }, 30000);
 function get_position(security, portfolio, measures, position_type, fields, additional_filters, as_of) {
     if (fields === void 0) { fields = [field_pb_1.FieldProto.PORTFOLIO, field_pb_1.FieldProto.SECURITY]; }
     if (additional_filters === void 0) { additional_filters = []; }
@@ -79,7 +88,7 @@ function get_position(security, portfolio, measures, position_type, fields, addi
                     if (portfolio !== null && portfolio !== undefined) {
                         fieldMapEntry = new position_util_pb_1.FieldMapEntry();
                         fieldMapEntry.setField(field_pb_1.FieldProto.PORTFOLIO_NAME);
-                        fieldMapEntry.setFieldValuePacked((0, util_1.packStringIntoAny)(portfolio.getPortfolioName()));
+                        fieldMapEntry.setFieldValuePacked((0, serialization_util_1.pack)(portfolio.getPortfolioName()));
                         filters.push(fieldMapEntry);
                     }
                     if (additional_filters !== null && additional_filters.length > 0) {
@@ -87,7 +96,7 @@ function get_position(security, portfolio, measures, position_type, fields, addi
                     }
                     filter_fields = new position_filter_pb_1.PositionFilterProto();
                     filter_fields.setFiltersList(filters);
-                    as_of_proto = as_of.to_date_proto();
+                    as_of_proto = as_of.toProto();
                     request = new query_position_request_pb_1.QueryPositionRequestProto();
                     request.setPositionType(position_type);
                     request.setPositionView(position_pb_1.PositionViewProto.DEFAULT_VIEW);
@@ -112,13 +121,19 @@ function testPosition() {
                 case 0:
                     now = datetime_1.ZonedDateTime.now();
                     portfolioService = new PortfolioService_1.PortfolioService();
-                    return [4 /*yield*/, portfolioService.searchPortfolio(now.to_date_proto(), field_pb_1.FieldProto.PORTFOLIO_NAME, "Federal Reserve SOMA Holdings")];
+                    return [4 /*yield*/, portfolioService.searchPortfolio(now.toProto(), new positionfilter_1.PositionFilter().addFilter(field_pb_1.FieldProto.PORTFOLIO_NAME, 'Federal Reserve SOMA Holdings'))];
                 case 1:
                     portfolios = _a.sent();
                     fedReservePortfolio = portfolios[0];
-                    return [4 /*yield*/, get_position(null, fedReservePortfolio, [measure_pb_1.MeasureProto.DIRECTED_QUANTITY], position_pb_1.PositionTypeProto.TRANSACTION, [field_pb_1.FieldProto.PORTFOLIO_NAME, field_pb_1.FieldProto.SECURITY_ID], [], now)];
+                    return [4 /*yield*/, get_position(null, fedReservePortfolio.proto, [measure_pb_1.MeasureProto.DIRECTED_QUANTITY], position_pb_1.PositionTypeProto.TRANSACTION, [field_pb_1.FieldProto.PORTFOLIO_NAME, field_pb_1.FieldProto.SECURITY_ID], [], now)];
                 case 2:
                     positions = _a.sent();
+                    if (positions) {
+                        console.log(positions.length + " positions returned");
+                    }
+                    else {
+                        console.log("No positions found");
+                    }
                     return [2 /*return*/, true];
             }
         });

package/node/wrappers/services/position-service/position.test.js.map

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

package/node/wrappers/services/position-service/position.test.ts

@@ -12,72 +12,73 @@ import { FieldMapEntry } from '../../../fintekkers/models/position/position_util
 import { PositionFilterProto } from '../../../fintekkers/models/position/position_filter_pb';
 import { ZonedDateTime } from '../../models/utils/datetime';
 
-import { packStringIntoAny } from '../../models/utils/util';
+import { pack } from '../../models/utils/serialization.util';
 import { Any } from 'google-protobuf/google/protobuf/any_pb';
 
 //Requests & Services
 import { PortfolioService } from '../../services/portfolio-service/PortfolioService';
 import { PositionService } from '../../services/position-service/PositionService';
 import { QueryPositionRequestProto } from '../../../fintekkers/requests/position/query_position_request_pb';
+import { PositionFilter } from '../../models/position/positionfilter';
 
-test('test getting a position against the api.fintekkers.org position service', () => {
-  const isTrue = testPosition();
-  expect(isTrue).resolves.toBe(true);
+test('test getting a position against the api.fintekkers.org position service', async () => {
+  const isTrue = await testPosition();
+  expect(isTrue).toBe(true);
 }, 30000);
 
-async function get_position(security:SecurityProto, 
-            portfolio:PortfolioProto, 
-            measures:MeasureProto[], 
-            position_type:PositionTypeProto, 
-            fields = [FieldProto.PORTFOLIO, FieldProto.SECURITY], 
-            additional_filters = [], as_of = ZonedDateTime.now()) {
-    const filters = [];
+async function get_position(security: SecurityProto,
+  portfolio: PortfolioProto,
+  measures: MeasureProto[],
+  position_type: PositionTypeProto,
+  fields = [FieldProto.PORTFOLIO, FieldProto.SECURITY],
+  additional_filters = [], as_of = ZonedDateTime.now()) {
+  const filters = [];
 
-    if (security !== null && security !== undefined) {
-        const id_proto = new IdentifierProto();
-        id_proto.setIdentifierValue(security.getIdentifier().getIdentifierValue());
-        id_proto.setIdentifierType(security.getIdentifier().getIdentifierType());
+  if (security !== null && security !== undefined) {
+    const id_proto = new IdentifierProto();
+    id_proto.setIdentifierValue(security.getIdentifier().getIdentifierValue());
+    id_proto.setIdentifierType(security.getIdentifier().getIdentifierType());
 
-        const security_id_packed = new Any();
-        security_id_packed.pack(id_proto);
+    const security_id_packed = new Any();
+    security_id_packed.pack(id_proto);
 
-        const fieldMapEntry = new FieldMapEntry();
-        fieldMapEntry.setField(FieldProto.IDENTIFIER);
-        fieldMapEntry.setFieldValuePacked(security_id_packed);
+    const fieldMapEntry = new FieldMapEntry();
+    fieldMapEntry.setField(FieldProto.IDENTIFIER);
+    fieldMapEntry.setFieldValuePacked(security_id_packed);
 
-        filters.push(fieldMapEntry);
-    }
+    filters.push(fieldMapEntry);
+  }
 
-    if (portfolio !== null && portfolio !== undefined) {
-        const fieldMapEntry = new FieldMapEntry();
-        fieldMapEntry.setField(FieldProto.PORTFOLIO_NAME);
-        fieldMapEntry.setFieldValuePacked(packStringIntoAny(portfolio.getPortfolioName()));
+  if (portfolio !== null && portfolio !== undefined) {
+    const fieldMapEntry = new FieldMapEntry();
+    fieldMapEntry.setField(FieldProto.PORTFOLIO_NAME);
+    fieldMapEntry.setFieldValuePacked(pack(portfolio.getPortfolioName()));
 
-        filters.push(fieldMapEntry);
-    }
+    filters.push(fieldMapEntry);
+  }
 
-    if (additional_filters !== null && additional_filters.length > 0) {
-        filters.push(...additional_filters);
-    }
+  if (additional_filters !== null && additional_filters.length > 0) {
+    filters.push(...additional_filters);
+  }
 
-    const filter_fields = new PositionFilterProto();
-    filter_fields.setFiltersList(filters);
+  const filter_fields = new PositionFilterProto();
+  filter_fields.setFiltersList(filters);
 
-    const as_of_proto = as_of.to_date_proto();
+  const as_of_proto = as_of.toProto();
 
-    const request = new QueryPositionRequestProto();
-    request.setPositionType(position_type);
-    request.setPositionView(PositionViewProto.DEFAULT_VIEW);
-    request.setFieldsList(fields);
-    request.setMeasuresList(measures);
-    request.setFilterFields(filter_fields);
-    request.setAsOf(as_of_proto);
+  const request = new QueryPositionRequestProto();
+  request.setPositionType(position_type);
+  request.setPositionView(PositionViewProto.DEFAULT_VIEW);
+  request.setFieldsList(fields);
+  request.setMeasuresList(measures);
+  request.setFilterFields(filter_fields);
+  request.setAsOf(as_of_proto);
 
-    let position_service = new PositionService();
+  let position_service = new PositionService();
 
-    const positions = await position_service.search(request);
-    
-    return positions;
+  const positions = await position_service.search(request);
+
+  return positions;
 }
 
 async function testPosition(): Promise<boolean> {
@@ -85,18 +86,23 @@ async function testPosition(): Promise<boolean> {
   const now = ZonedDateTime.now();
 
   const portfolioService = new PortfolioService();
-  
+
   let portfolios = await portfolioService.searchPortfolio(
-        now.to_date_proto(), 
-        FieldProto.PORTFOLIO_NAME, 
-        "Federal Reserve SOMA Holdings");
+    now.toProto(),
+    new PositionFilter().addFilter(FieldProto.PORTFOLIO_NAME, 'Federal Reserve SOMA Holdings'));
   const fedReservePortfolio = portfolios[0];
 
-  let positions = await get_position(null, fedReservePortfolio, 
-    [MeasureProto.DIRECTED_QUANTITY], 
+  let positions = await get_position(null, fedReservePortfolio.proto,
+    [MeasureProto.DIRECTED_QUANTITY],
     PositionTypeProto.TRANSACTION,
     [FieldProto.PORTFOLIO_NAME, FieldProto.SECURITY_ID], [], now);
 
+
+  if (positions) {
+    console.log(positions.length + " positions returned")
+  } else {
+    console.log("No positions found");
+  }
   return true;
 }
 

package/node/wrappers/services/security-service/SecurityService.js

@@ -37,20 +37,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecurityService = 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");
+var security_1 = require("../../models/security/security");
+var dt = require("../../models/utils/datetime");
 // Requests & Services
 var security_service_grpc_pb_1 = require("../../../fintekkers/services/security-service/security_service_grpc_pb");
 var query_security_request_pb_1 = require("../../../fintekkers/requests/security/query_security_request_pb");
 var create_security_request_pb_1 = require("../../../fintekkers/requests/security/create_security_request_pb");
-var security_1 = require("../../models/security/security");
+var requestcontext_1 = require("../../models/utils/requestcontext");
 var SecurityService = /** @class */ (function () {
     function SecurityService() {
-        this.client = new security_service_grpc_pb_1.SecurityClient('api.fintekkers.org:8082', grpc.credentials.createSsl());
-        // this.client = new SecurityClient('localhost:8082', grpc.credentials.createInsecure());
+        this.client = new security_service_grpc_pb_1.SecurityClient(requestcontext_1.default.apiURL, requestcontext_1.default.apiCredentials);
     }
     SecurityService.prototype.validateCreateSecurity = function (security) {
         return __awaiter(this, void 0, void 0, function () {
@@ -90,7 +87,16 @@ var SecurityService = /** @class */ (function () {
             });
         });
     };
-    SecurityService.prototype.searchSecurity = function (asOf, fieldProto, fieldValue) {
+    SecurityService.prototype.searchSecurityAsOfNow = function (positionFilter) {
+        return __awaiter(this, void 0, void 0, function () {
+            var now;
+            return __generator(this, function (_a) {
+                now = dt.ZonedDateTime.now().toProto();
+                return [2 /*return*/, this.searchSecurity(now, positionFilter)];
+            });
+        });
+    };
+    SecurityService.prototype.searchSecurity = function (asOf, positionFilter) {
         return __awaiter(this, void 0, void 0, function () {
             function processStreamSynchronously() {
                 return __awaiter(this, void 0, void 0, function () {
@@ -114,7 +120,7 @@ var SecurityService = /** @class */ (function () {
                     });
                 });
             }
-            var searchRequest, positionFilter, fieldMapEntry, tmpClient, listSecurities;
+            var searchRequest, tmpClient, listSecurities;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -122,12 +128,7 @@ var SecurityService = /** @class */ (function () {
                         searchRequest.setObjectClass('SecurityRequest');
                         searchRequest.setVersion('0.0.1');
                         searchRequest.setAsOf(asOf);
-                        positionFilter = new position_filter_pb_1.PositionFilterProto();
-                        positionFilter.setObjectClass('PositionFilter');
-                        positionFilter.setVersion('0.0.1');
-                        fieldMapEntry = (0, util_2.createFieldMapEntry)(fieldProto, fieldValue);
-                        positionFilter.setFiltersList([fieldMapEntry]);
-                        searchRequest.setSearchSecurityInput(positionFilter);
+                        searchRequest.setSearchSecurityInput(positionFilter.toProto());
                         tmpClient = this.client;
                         listSecurities = [];
                         return [4 /*yield*/, processStreamSynchronously()];

package/node/wrappers/services/security-service/SecurityService.js.map

@@ -1 +1 @@
-{"version":3,"file":"SecurityService.js","sourceRoot":"","sources":["SecurityService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SecurityService.js","sourceRoot":"","sources":["SecurityService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAiC;AAMjC,2DAAsD;AAItD,gDAAkD;AAElD,sBAAsB;AACtB,mHAAwG;AACxG,6GAA4G;AAE5G,+GAA8G;AAG9G,oEAA0D;AAE1D;IAGE;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,yCAAc,CAAC,wBAAS,CAAC,MAAM,EAAE,wBAAS,CAAC,cAAc,CAAC,CAAC;IAC/E,CAAC;IAEK,gDAAsB,GAA5B,UAA6B,QAAuB;;;;;;wBAC5C,aAAa,GAAG,IAAI,uDAA0B,EAAE,CAAC;wBACvD,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;wBAChD,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;wBAClC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;wBAEnC,2BAA2B,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;wBACnF,qBAAM,2BAA2B,CAAC,aAAa,CAAC,EAAA;;wBAA3D,QAAQ,GAAG,SAAgD;wBACjE,sBAAO,QAAQ,EAAC;;;;KACjB;IAEK,wCAAc,GAApB,UAAqB,QAAuB;;;;;;wBACpC,aAAa,GAAG,IAAI,uDAA0B,EAAE,CAAC;wBACvD,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;wBAChD,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;wBAClC,aAAa,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;wBAEnC,mBAAmB,GAAG,IAAA,gBAAS,EAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;wBACnE,qBAAM,mBAAmB,CAAC,aAAa,CAAC,EAAA;;wBAAnD,QAAQ,GAAG,SAAwC;wBACzD,sBAAO,QAAQ,EAAC;;;;KACjB;IAEK,+CAAqB,GAA3B,UAA4B,cAA8B;;;;gBAClD,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;gBAC7C,sBAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,EAAC;;;KACjD;IAEK,wCAAc,GAApB,UAAqB,IAAyB,EAAE,cAA8B;;YAY5E,SAAe,0BAA0B;;;;wBACjC,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;wBAEhD,sBAAO,IAAI,OAAO,CAAa,UAAC,OAAO,EAAE,MAAM;gCAC7C,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,UAAC,QAAoC;oCACtD,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,CAAC,UAAC,QAAQ;wCAClD,cAAc,CAAC,IAAI,CAAC,IAAI,kBAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;oCAC9C,CAAC,CAAC,CAAC;gCACL,CAAC,CAAC,CAAC;gCAEH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;oCAChB,OAAO,CAAC,cAAc,CAAC,CAAC;gCAC1B,CAAC,CAAC,CAAC;gCAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAC,GAAG;oCACtB,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;oCAC3C,MAAM,CAAC,GAAG,CAAC,CAAC;gCACd,CAAC,CAAC,CAAC;4BACL,CAAC,CAAC,EAAC;;;aACJ;;;;;wBA9BK,aAAa,GAAG,IAAI,qDAAyB,EAAE,CAAC;wBACtD,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;wBAChD,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;wBAClC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBAE5B,aAAa,CAAC,sBAAsB,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC;wBAEzD,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;wBAExB,cAAc,GAAe,EAAE,CAAC;wBAuB/B,qBAAM,0BAA0B,EAAE,EAAA;4BAAzC,sBAAO,SAAkC,EAAC;;;;KAC3C;IACH,sBAAC;AAAD,CAAC,AArED,IAqEC;AAEQ,0CAAe"}

package/node/wrappers/services/security-service/SecurityService.ts

@@ -1,15 +1,14 @@
-import * as grpc from '@grpc/grpc-js';
 import { promisify } from 'util';
 
 // Models
 import { SecurityProto } from '../../../fintekkers/models/security/security_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';
+import Security from '../../models/security/security';
 
 // Model Utils
-import { PositionFilterProto } from '../../../fintekkers/models/position/position_filter_pb';
-import { FieldProto } from '../../../fintekkers/models/position/field_pb';
+import { PositionFilter } from '../../models/position/positionfilter';
+import * as dt from '../../models/utils/datetime';
 
 // Requests & Services
 import { SecurityClient } from '../../../fintekkers/services/security-service/security_service_grpc_pb';
@@ -17,14 +16,14 @@ import { QuerySecurityRequestProto } from '../../../fintekkers/requests/security
 import { QuerySecurityResponseProto } from '../../../fintekkers/requests/security/query_security_response_pb';
 import { CreateSecurityRequestProto } from '../../../fintekkers/requests/security/create_security_request_pb';
 import { CreateSecurityResponseProto } from '../../../fintekkers/requests/security/create_security_response_pb';
-import Security from '../../models/security/security';
+
+import EnvConfig from '../../models/utils/requestcontext';
 
 class SecurityService {
   private client: SecurityClient;
 
   constructor() {
-    this.client = new SecurityClient('api.fintekkers.org:8082', grpc.credentials.createSsl());
-    // this.client = new SecurityClient('localhost:8082', grpc.credentials.createInsecure());
+    this.client = new SecurityClient(EnvConfig.apiURL, EnvConfig.apiCredentials);
   }
 
   async validateCreateSecurity(security: SecurityProto): Promise<SummaryProto> {
@@ -49,20 +48,18 @@ class SecurityService {
     return response;
   }
 
-  async searchSecurity(asOf: LocalTimestampProto, fieldProto: FieldProto, fieldValue: string): Promise<Security[]> {
+  async searchSecurityAsOfNow(positionFilter: PositionFilter): Promise<Security[]> {
+    const now = dt.ZonedDateTime.now().toProto();
+    return this.searchSecurity(now, positionFilter);
+  }
+
+  async searchSecurity(asOf: LocalTimestampProto, positionFilter: PositionFilter): Promise<Security[]> {
     const searchRequest = new QuerySecurityRequestProto();
     searchRequest.setObjectClass('SecurityRequest');
     searchRequest.setVersion('0.0.1');
     searchRequest.setAsOf(asOf);
 
-    const positionFilter = new PositionFilterProto();
-    positionFilter.setObjectClass('PositionFilter');
-    positionFilter.setVersion('0.0.1');
-
-    const fieldMapEntry = createFieldMapEntry(fieldProto, fieldValue);
-    positionFilter.setFiltersList([fieldMapEntry]);
-
-    searchRequest.setSearchSecurityInput(positionFilter);
+    searchRequest.setSearchSecurityInput(positionFilter.toProto());
 
     const tmpClient = this.client;
 
@@ -72,7 +69,7 @@ class SecurityService {
       const stream2 = tmpClient.search(searchRequest);
 
       return new Promise<Security[]>((resolve, reject) => {
-        stream2.on('data', (response:QuerySecurityResponseProto) => {
+        stream2.on('data', (response: QuerySecurityResponseProto) => {
           response.getSecurityResponseList().forEach((security) => {
             listSecurities.push(new Security(security));
           });
@@ -84,7 +81,7 @@ class SecurityService {
 
         stream2.on('error', (err) => {
           console.error('Error in the stream:', err);
-          reject(err); 
+          reject(err);
         });
       });
     }