@spotto/contract 0.2.0-alpha.6 → 0.2.1-alpha.0

package/dist/types/assets/[id]/get.d.ts

@@ -3,6 +3,9 @@ export interface ILastLocation extends IEmbeddedEntity {
     firstSeen: number;
     lastSeen: number;
 }
+export interface ICandidateLocation extends IEmbeddedEntity {
+    confidence: number;
+}
 export interface GetAssetResponse {
     id: string;
     name: string;
@@ -10,6 +13,8 @@ export interface GetAssetResponse {
     score?: number;
     meta?: IEntityMeta;
     lastLocation?: ILastLocation;
+    candidateLocations?: ICandidateLocation[];
 }
+export declare const candidateLocationSchema: import("joi").ObjectSchema<IEmbeddedEntity & ICandidateLocation>;
 export declare const getAssetResponseSchema: import("joi").ObjectSchema<GetAssetResponse>;
 export declare const validateGetAssetResponse: (payload: any) => GetAssetResponse;

package/dist/types/assets/[id]/get.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateGetAssetResponse = exports.getAssetResponseSchema = void 0;
+exports.validateGetAssetResponse = exports.getAssetResponseSchema = exports.candidateLocationSchema = void 0;
 const joi_1 = require("joi");
 const shared_1 = require("../../shared");
+exports.candidateLocationSchema = shared_1.embeddedEntitySchema().append({
+    confidence: joi_1.number().strict().min(0).max(100).required(),
+});
 exports.getAssetResponseSchema = joi_1.object({
     id: shared_1.xObjectId.required(),
     name: shared_1.xString.required(),
@@ -13,6 +16,7 @@ exports.getAssetResponseSchema = joi_1.object({
         firstSeen: shared_1.xTime.required(),
         lastSeen: shared_1.xTime.required(),
     }),
+    candidateLocations: joi_1.array().items(exports.candidateLocationSchema),
 });
 const validateGetAssetResponse = (payload) => shared_1.validateJoiSchema(exports.getAssetResponseSchema, payload);
 exports.validateGetAssetResponse = validateGetAssetResponse;

package/dist/types/assets/[id]/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/types/assets/[id]/get.ts"],"names":[],"mappings":";;;AAAA,6BAAqC;AACrC,yCAUsB;AA6BT,QAAA,sBAAsB,GAAG,YAAM,CAAmB;IAE7D,EAAE,EAAE,kBAAS,CAAC,QAAQ,EAAE;IACxB,IAAI,EAAE,gBAAO,CAAC,QAAQ,EAAE;IAGxB,KAAK,EAAE,YAAM,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,IAAI,EAAE,yBAAgB;IACtB,MAAM,EAAE,wBAAe,EAAE;IACzB,YAAY,EAAE,6BAAoB,EAAiB,CAAC,MAAM,CAAC;QACzD,SAAS,EAAE,cAAK,CAAC,QAAQ,EAAE;QAC3B,QAAQ,EAAE,cAAK,CAAC,QAAQ,EAAE;KAC3B,CAAC;CACH,CAAC,CAAC;AAEI,MAAM,wBAAwB,GAAG,CAAC,OAAY,EAAE,EAAE,CACvD,0BAAiB,CAAmB,8BAAsB,EAAE,OAAO,CAAC,CAAC;AAD1D,QAAA,wBAAwB,4BACkC"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../src/types/assets/[id]/get.ts"],"names":[],"mappings":";;;AAAA,6BAA4C;AAC5C,yCAUsB;AAmCT,QAAA,uBAAuB,GAClC,6BAAoB,EAAsB,CAAC,MAAM,CAAC;IAChD,UAAU,EAAE,YAAM,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;CACzD,CAAC,CAAC;AAEQ,QAAA,sBAAsB,GAAG,YAAM,CAAmB;IAE7D,EAAE,EAAE,kBAAS,CAAC,QAAQ,EAAE;IACxB,IAAI,EAAE,gBAAO,CAAC,QAAQ,EAAE;IAGxB,KAAK,EAAE,YAAM,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,IAAI,EAAE,yBAAgB;IACtB,MAAM,EAAE,wBAAe,EAAE;IACzB,YAAY,EAAE,6BAAoB,EAAiB,CAAC,MAAM,CAAC;QACzD,SAAS,EAAE,cAAK,CAAC,QAAQ,EAAE;QAC3B,QAAQ,EAAE,cAAK,CAAC,QAAQ,EAAE;KAC3B,CAAC;IACF,kBAAkB,EAAE,WAAK,EAAE,CAAC,KAAK,CAAC,+BAAuB,CAAC;CAC3D,CAAC,CAAC;AAEI,MAAM,wBAAwB,GAAG,CAAC,OAAY,EAAE,EAAE,CACvD,0BAAiB,CAAmB,8BAAsB,EAAE,OAAO,CAAC,CAAC;AAD1D,QAAA,wBAAwB,4BACkC"}

package/dist/types/assets/[id]/location.d.ts

@@ -1,7 +1,8 @@
-import { ILastLocation } from './get';
+import { ILastLocation, ICandidateLocation } from './get';
 export interface GetAssetLastLocationResponse {
     id: string;
     lastLocation: ILastLocation | null;
+    candidateLocations?: ICandidateLocation[];
 }
 export declare const getAssetLastLocationResponseSchema: import("joi").ObjectSchema<GetAssetLastLocationResponse>;
 export declare const validateGetAssetLastLocationResponse: (payload: any) => GetAssetLastLocationResponse;

package/dist/types/assets/[id]/location.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateGetAssetLastLocationResponse = exports.getAssetLastLocationResponseSchema = void 0;
 const joi_1 = require("joi");
 const shared_1 = require("../../shared");
+const get_1 = require("./get");
 exports.getAssetLastLocationResponseSchema = joi_1.object({
     id: shared_1.xObjectId.required(),
     lastLocation: shared_1.embeddedEntitySchema()
@@ -12,6 +13,7 @@ exports.getAssetLastLocationResponseSchema = joi_1.object({
     })
         .allow(null)
         .required(),
+    candidateLocations: joi_1.array().items(get_1.candidateLocationSchema),
 });
 const validateGetAssetLastLocationResponse = (payload) => shared_1.validateJoiSchema(exports.getAssetLastLocationResponseSchema, payload);
 exports.validateGetAssetLastLocationResponse = validateGetAssetLastLocationResponse;

package/dist/types/assets/[id]/location.js.map

@@ -1 +1 @@
-{"version":3,"file":"location.js","sourceRoot":"","sources":["../../../../src/types/assets/[id]/location.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yCAKsB;AAWT,QAAA,kCAAkC,GAAG,YAAM,CACtD;IAEE,EAAE,EAAE,kBAAS,CAAC,QAAQ,EAAE;IAGxB,YAAY,EAAE,6BAAoB,EAAiB;SAChD,MAAM,CAAC;QACN,SAAS,EAAE,cAAK,CAAC,QAAQ,EAAE;QAC3B,QAAQ,EAAE,cAAK,CAAC,QAAQ,EAAE;KAC3B,CAAC;SACD,KAAK,CAAC,IAAI,CAAC;SACX,QAAQ,EAAE;CACd,CACF,CAAC;AAEK,MAAM,oCAAoC,GAAG,CAAC,OAAY,EAAE,EAAE,CACnE,0BAAiB,CACf,0CAAkC,EAClC,OAAO,CACR,CAAC;AAJS,QAAA,oCAAoC,wCAI7C"}
+{"version":3,"file":"location.js","sourceRoot":"","sources":["../../../../src/types/assets/[id]/location.ts"],"names":[],"mappings":";;;AAAA,6BAAoC;AACpC,yCAKsB;AACtB,+BAIe;AAWF,QAAA,kCAAkC,GAC7C,YAAM,CAA+B;IAEnC,EAAE,EAAE,kBAAS,CAAC,QAAQ,EAAE;IAGxB,YAAY,EAAE,6BAAoB,EAAiB;SAChD,MAAM,CAAC;QACN,SAAS,EAAE,cAAK,CAAC,QAAQ,EAAE;QAC3B,QAAQ,EAAE,cAAK,CAAC,QAAQ,EAAE;KAC3B,CAAC;SACD,KAAK,CAAC,IAAI,CAAC;SACX,QAAQ,EAAE;IACb,kBAAkB,EAAE,WAAK,EAAE,CAAC,KAAK,CAAC,6BAAuB,CAAC;CAC3D,CAAC,CAAC;AAEE,MAAM,oCAAoC,GAAG,CAAC,OAAY,EAAE,EAAE,CACnE,0BAAiB,CACf,0CAAkC,EAClC,OAAO,CACR,CAAC;AAJS,QAAA,oCAAoC,wCAI7C"}

package/dist/types/assets/get/query.d.ts

@@ -1,6 +1,6 @@
 import { SearchableSortFields, SortOrders } from '../../shared';
 export declare type AssetSearchField = 'name' | 'tagIds';
-export declare type AssetEmbedField = 'meta' | 'tagIds' | 'lastLocation';
+export declare type AssetEmbedField = 'meta' | 'tagIds' | 'lastLocation' | 'candidateLocations';
 export interface GetAssetsQuery {
     page?: number;
     limit?: number;

package/dist/types/assets/get/query.js

@@ -15,7 +15,7 @@ exports.getAssetsQuerySchema = joi_1.object({
     search: shared_1.xString.lowercase(),
     searchFuzzy: shared_1.xBool,
     searchFields: shared_1.xArrayOfRequiredStrings('name', 'tagIds'),
-    embed: shared_1.xArrayOfRequiredStrings('meta', 'tagIds', 'lastLocation'),
+    embed: shared_1.xArrayOfRequiredStrings('meta', 'tagIds', 'lastLocation', 'candidateLocations'),
 });
 const validateGetAssetsQuery = (payload) => shared_1.validateOptionalJoiSchema(exports.getAssetsQuerySchema, payload);
 exports.validateGetAssetsQuery = validateGetAssetsQuery;

package/dist/types/assets/get/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/types/assets/get/query.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yCAYsB;AAwET,QAAA,oBAAoB,GAAG,YAAM,CAAiB;IAEzD,IAAI,EAAE,aAAI;IACV,KAAK,EAAE,aAAI;IAGX,GAAG,EAAE,0BAAiB,CAAC,IAAI,CAAC;IAC5B,MAAM,EAAE,wBAAe,CAAC,IAAI,CAAC;IAC7B,OAAO,EAAE,cAAK;IACd,QAAQ,EAAE,cAAK;IAGf,IAAI,EAAE,8BAAqB;IAC3B,SAAS,EAAE,mBAAU;IAGrB,MAAM,EAAE,gBAAO,CAAC,SAAS,EAAE;IAC3B,WAAW,EAAE,cAAK;IAClB,YAAY,EAAE,gCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAGvD,KAAK,EAAE,gCAAuB,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC;CACjE,CAAC,CAAC;AAEI,MAAM,sBAAsB,GAAG,CAAC,OAAY,EAAE,EAAE,CACrD,kCAAyB,CAAiB,4BAAoB,EAAE,OAAO,CAAC,CAAC;AAD9D,QAAA,sBAAsB,0BACwC"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/types/assets/get/query.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yCAYsB;AA4ET,QAAA,oBAAoB,GAAG,YAAM,CAAiB;IAEzD,IAAI,EAAE,aAAI;IACV,KAAK,EAAE,aAAI;IAGX,GAAG,EAAE,0BAAiB,CAAC,IAAI,CAAC;IAC5B,MAAM,EAAE,wBAAe,CAAC,IAAI,CAAC;IAC7B,OAAO,EAAE,cAAK;IACd,QAAQ,EAAE,cAAK;IAGf,IAAI,EAAE,8BAAqB;IAC3B,SAAS,EAAE,mBAAU;IAGrB,MAAM,EAAE,gBAAO,CAAC,SAAS,EAAE;IAC3B,WAAW,EAAE,cAAK;IAClB,YAAY,EAAE,gCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAGvD,KAAK,EAAE,gCAAuB,CAC5B,MAAM,EACN,QAAQ,EACR,cAAc,EACd,oBAAoB,CACrB;CACF,CAAC,CAAC;AAEI,MAAM,sBAAsB,GAAG,CAAC,OAAY,EAAE,EAAE,CACrD,kCAAyB,CAAiB,4BAAoB,EAAE,OAAO,CAAC,CAAC;AAD9D,QAAA,sBAAsB,0BACwC"}

package/dist/types/readers/[id]/patch/request.d.ts

@@ -1,5 +1,5 @@
 import { PostReaderRequest } from '../../post';
-export declare type UpdateReaderRequest = Partial<Omit<PostReaderRequest, 'deviceType'>> & {
+export declare type UpdateReaderRequest = Partial<Omit<PostReaderRequest, 'deviceType' | 'type'>> & {
     archived?: boolean;
 };
 export declare const updateReaderRequestSchema: import("joi").ObjectSchema<UpdateReaderRequest>;

package/dist/types/readers/[id]/patch/request.js

@@ -4,10 +4,8 @@ exports.validateUpdateReaderRequest = exports.updateReaderRequestSchema = void 0
 const joi_1 = require("joi");
 const networks_1 = require("../../../networks");
 const schema_1 = require("../../../shared/schema");
-const constants_1 = require("../../constants");
 const post_1 = require("../../post");
 exports.updateReaderRequestSchema = joi_1.object({
-    type: schema_1.xStringIsOneOf(...constants_1.READER_TYPES),
     archived: schema_1.xBool,
     deviceId: schema_1.xString,
     name: joi_1.when('type', {
@@ -15,43 +13,11 @@ exports.updateReaderRequestSchema = joi_1.object({
         then: schema_1.xString.required(),
         otherwise: schema_1.xString.allow(''),
     }),
-    locationId: joi_1.when('type', {
-        switch: [
-            {
-                is: 'FIXED',
-                then: schema_1.xObjectId
-                    .required()
-                    .when('location', { is: joi_1.exist(), then: joi_1.forbidden() }),
-            },
-            {
-                is: joi_1.forbidden(),
-                then: schema_1.xObjectId,
-            },
-        ],
-        otherwise: joi_1.forbidden(),
-    }),
-    location: joi_1.when('type', {
-        switch: [
-            {
-                is: 'FIXED',
-                then: post_1.upsertedLocationSchema
-                    .required()
-                    .when('locationId', { is: joi_1.exist(), then: joi_1.forbidden() }),
-            },
-            {
-                is: joi_1.forbidden(),
-                then: post_1.upsertedLocationSchema,
-            },
-        ],
-        otherwise: joi_1.forbidden(),
-    }),
+    locationId: schema_1.xObjectId,
+    location: post_1.upsertedLocationSchema,
     saveNetwork: schema_1.xBool,
     network: networks_1.networkSchema(),
-    antennas: joi_1.when('type', {
-        is: 'PORTAL',
-        then: post_1.portalAntennaSchema,
-        otherwise: post_1.virtualAntennaSchema,
-    }),
+    antennas: post_1.virtualAntennaSchema,
 })
     .oxor('location', 'locationId')
     .min(1);

package/dist/types/readers/[id]/patch/request.js.map

@@ -1 +1 @@
-{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../../src/types/readers/[id]/patch/request.ts"],"names":[],"mappings":";;;AAAA,6BAAqD;AACrD,gDAAmE;AACnE,mDAMgC;AAChC,+CAA+C;AAC/C,qCAKoB;AAWP,QAAA,yBAAyB,GAAG,YAAM,CAAsB;IACnE,IAAI,EAAE,uBAAc,CAAC,GAAG,wBAAY,CAAC;IACrC,QAAQ,EAAE,cAAK;IAKf,QAAQ,EAAE,gBAAO;IAKjB,IAAI,EAAE,UAAI,CAAC,MAAM,EAAE;QACjB,EAAE,EAAE,QAAQ;QACZ,IAAI,EAAE,gBAAO,CAAC,QAAQ,EAAE;QACxB,SAAS,EAAE,gBAAO,CAAC,KAAK,CAAC,EAAE,CAAC;KAC7B,CAAC;IAMF,UAAU,EAAE,UAAI,CAAC,MAAM,EAAE;QACvB,MAAM,EAAE;YACN;gBACE,EAAE,EAAE,OAAO;gBACX,IAAI,EAAE,kBAAS;qBACZ,QAAQ,EAAE;qBACV,IAAI,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,WAAK,EAAE,EAAE,IAAI,EAAE,eAAS,EAAE,EAAE,CAAC;aACxD;YAED;gBACE,EAAE,EAAE,eAAS,EAAE;gBACf,IAAI,EAAE,kBAAS;aAChB;SACF;QAED,SAAS,EAAE,eAAS,EAAE;KACvB,CAAC;IACF,QAAQ,EAAE,UAAI,CAAC,MAAM,EAAE;QACrB,MAAM,EAAE;YACN;gBACE,EAAE,EAAE,OAAO;gBACX,IAAI,EAAE,6BAAsB;qBACzB,QAAQ,EAAE;qBACV,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,EAAE,WAAK,EAAE,EAAE,IAAI,EAAE,eAAS,EAAE,EAAE,CAAC;aAC1D;YAED;gBACE,EAAE,EAAE,eAAS,EAAE;gBACf,IAAI,EAAE,6BAAsB;aAC7B;SACF;QAED,SAAS,EAAE,eAAS,EAAE;KACvB,CAAC;IACF,WAAW,EAAE,cAAK;IAClB,OAAO,EAAE,wBAAa,EAAmB;IACzC,QAAQ,EAAE,UAAI,CAAC,MAAM,EAAE;QACrB,EAAE,EAAE,QAAQ;QACZ,IAAI,EAAE,0BAAmB;QACzB,SAAS,EAAE,2BAAoB;KAChC,CAAC;CACH,CAAC;KACC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC;KAC9B,GAAG,CAAC,CAAC,CAAC,CAAC;AAEH,MAAM,2BAA2B,GAAG,CAAC,OAAY,EAAE,EAAE,CAC1D,0BAAiB,CAAsB,iCAAyB,EAAE,OAAO,CAAC,CAAC;AADhE,QAAA,2BAA2B,+BACqC"}
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../../../src/types/readers/[id]/patch/request.ts"],"names":[],"mappings":";;;AAAA,6BAAmC;AACnC,gDAAmE;AACnE,mDAKgC;AAChC,qCAIoB;AAWP,QAAA,yBAAyB,GAAG,YAAM,CAAsB;IACnE,QAAQ,EAAE,cAAK;IAKf,QAAQ,EAAE,gBAAO;IAKjB,IAAI,EAAE,UAAI,CAAC,MAAM,EAAE;QACjB,EAAE,EAAE,QAAQ;QACZ,IAAI,EAAE,gBAAO,CAAC,QAAQ,EAAE;QACxB,SAAS,EAAE,gBAAO,CAAC,KAAK,CAAC,EAAE,CAAC;KAC7B,CAAC;IACF,UAAU,EAAE,kBAAS;IACrB,QAAQ,EAAE,6BAAsB;IAChC,WAAW,EAAE,cAAK;IAClB,OAAO,EAAE,wBAAa,EAAmB;IACzC,QAAQ,EAAE,2BAAoB;CAC/B,CAAC;KACC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC;KAC9B,GAAG,CAAC,CAAC,CAAC,CAAC;AAEH,MAAM,2BAA2B,GAAG,CAAC,OAAY,EAAE,EAAE,CAC1D,0BAAiB,CAAsB,iCAAyB,EAAE,OAAO,CAAC,CAAC;AADhE,QAAA,2BAA2B,+BACqC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spotto/contract",
   "license": "ISC",
-  "version": "0.2.0-alpha.6",
+  "version": "0.2.1-alpha.0",
   "description": "Spotto's API Contract",
   "main": "./dist/index.js",
   "files": [
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@airtasker/spot": "^1.4.0",
-    "@spotto/core-lib": "^0.2.0-alpha.5",
+    "@spotto/core-lib": "^0.2.1-alpha.0",
     "geojson-validation": "^1.0.2",
     "joi": "^17.2.1",
     "qs": "^6.9.4"
@@ -26,5 +26,5 @@
     "jest": "^26.6.3",
     "ts-jest": "^26.5.3"
   },
-  "gitHead": "3d7aa95f05eed252f6d6120b3504135dff047abe"
+  "gitHead": "31a268187adbc1fc88deaf55928cdd4d18d42561"
 }