@zetra/citrineos-data 1.8.3-fork.3 → 1.8.4

package/dist/layers/sequelize/model/Tenant.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { Column, DataType, HasMany, Model, PrimaryKey, Table } from 'sequelize-typescript';
-import { Authorization, LocalListAuthorization, LocalListVersion, LocalListVersionAuthorization, SendLocalList, SendLocalListAuthorization, } from './Authorization/index.js';
+import { LocalListAuthorization, LocalListVersion, LocalListVersionAuthorization, SendLocalList, SendLocalListAuthorization, } from './Authorization/index.js';
 import { Boot } from './Boot.js';
 import { Certificate, InstalledCertificate } from './Certificate/index.js';
 import { ChangeConfiguration } from './ChangeConfiguration.js';
@@ -28,6 +28,7 @@ import { Tariff } from './Tariff/index.js';
 import { TenantPartner } from './TenantPartner.js';
 import { MeterValue, StartTransaction, StopTransaction, Transaction, TransactionEvent, } from './TransactionEvent/index.js';
 import { EventData, VariableMonitoring, VariableMonitoringStatus, } from './VariableMonitoring/index.js';
+import { AuthorizationTenant } from './AuthorizationTenant.js';
 export var TenantAttributeProps;
 (function (TenantAttributeProps) {
     TenantAttributeProps["id"] = "id";
@@ -77,9 +78,9 @@ __decorate([
     __metadata("design:type", Array)
 ], Tenant.prototype, "tenantPartners", void 0);
 __decorate([
-    HasMany(() => Authorization),
+    HasMany(() => AuthorizationTenant),
     __metadata("design:type", Array)
-], Tenant.prototype, "authorizations", void 0);
+], Tenant.prototype, "authorizationTenants", void 0);
 __decorate([
     HasMany(() => Boot),
     __metadata("design:type", Array)

package/dist/layers/sequelize/model/Tenant.js.map

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

package/dist/layers/sequelize/model/TenantPartner.d.ts

@@ -1,4 +1,4 @@
-import type { PartnerProfile, TenantDto, TenantPartnerDto } from '@citrineos/base';
+import type { PartnerProfile, TenantDto, TenantPartnerDto } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
 import { Authorization } from './Authorization/index.js';
 export declare class TenantPartner extends Model implements TenantPartnerDto {
@@ -6,6 +6,7 @@ export declare class TenantPartner extends Model implements TenantPartnerDto {
     partyId: string;
     countryCode: string;
     partnerProfileOCPI: PartnerProfile;
+    awsSecretCertificateArn?: string | null;
     authorizations: Authorization[];
     tenantId: number;
     tenant?: TenantDto;

package/dist/layers/sequelize/model/TenantPartner.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID } from '@citrineos/base';
+import { DEFAULT_TENANT_ID } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, HasMany, Model, Table, } from 'sequelize-typescript';
 import { Authorization } from './Authorization/index.js';
 import { Tenant } from './Tenant.js';
@@ -37,6 +37,10 @@ __decorate([
     Column(DataType.JSONB),
     __metadata("design:type", Object)
 ], TenantPartner.prototype, "partnerProfileOCPI", void 0);
+__decorate([
+    Column({ type: DataType.STRING, allowNull: true }),
+    __metadata("design:type", Object)
+], TenantPartner.prototype, "awsSecretCertificateArn", void 0);
 __decorate([
     HasMany(() => Authorization),
     __metadata("design:type", Array)

package/dist/layers/sequelize/model/TenantPartner.js.map

@@ -1 +1 @@
-{"version":3,"file":"TenantPartner.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/model/TenantPartner.ts"],"names":[],"mappings":";;;;;;;;;AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,OAAO,EACP,KAAK,EACL,KAAK,GACN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG9B,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,KAAK;IACtC,MAAM,CAAU,UAAU,GAAW,eAAe,CAAC;IA4B9C,AAAP,MAAM,CAAC,gBAAgB,CAAC,QAAuB;QAC7C,IAAI,QAAQ,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC9B,QAAQ,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACxC,CAAC;IACH,CAAC;IAED,YAAY,GAAG,IAAW;QACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACf,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACpC,CAAC;IACH,CAAC;;AApCO;IADP,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;;8CACA;AAGhB;IADP,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;;kDACI;AAGpB;IADP,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;;yDACoB;AAGnC;IADP,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;;qDACW;AAShC;IAPP,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACxB,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK;QAChB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,UAAU;KACrB,CAAC;;+CACuB;AAGjB;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;6CACG;AAIpB;IAFN,YAAY;IACZ,YAAY;;qCACqB,aAAa;;2CAI9C;AAjCU,aAAa;IADzB,KAAK;;GACO,aAAa,CAyCzB"}
+{"version":3,"file":"TenantPartner.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/model/TenantPartner.ts"],"names":[],"mappings":";;;;;;;;;AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,OAAO,EACP,KAAK,EACL,KAAK,GACN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG9B,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,KAAK;IACtC,MAAM,CAAU,UAAU,GAAW,eAAe,CAAC;IA+B9C,AAAP,MAAM,CAAC,gBAAgB,CAAC,QAAuB;QAC7C,IAAI,QAAQ,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC9B,QAAQ,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACxC,CAAC;IACH,CAAC;IAED,YAAY,GAAG,IAAW;QACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACf,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACpC,CAAC;IACH,CAAC;;AAvCO;IADP,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;;8CACA;AAGhB;IADP,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;;kDACI;AAGpB;IADP,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;;yDACoB;AAGnC;IADP,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;8DACH;AAGxC;IADP,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC;;qDACW;AAShC;IAPP,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACxB,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK;QAChB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,UAAU;KACrB,CAAC;;+CACuB;AAGjB;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;6CACG;AAIpB;IAFN,YAAY;IACZ,YAAY;;qCACqB,aAAa;;2CAI9C;AApCU,aAAa;IADzB,KAAK;;GACO,aAAa,CA4CzB"}

package/dist/layers/sequelize/model/TransactionEvent/MeterValue.d.ts

@@ -1,4 +1,4 @@
-import type { MeterValueDto, TenantDto, SampledValue } from '@citrineos/base';
+import type { MeterValueDto, TenantDto, SampledValue } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
 export declare class MeterValue extends Model implements MeterValueDto {
     static readonly MODEL_NAME: string;

package/dist/layers/sequelize/model/TransactionEvent/MeterValue.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, Namespace } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, Model, Table, } from 'sequelize-typescript';
 import { TransactionEvent } from './TransactionEvent.js';
 import { Transaction } from './Transaction.js';

package/dist/layers/sequelize/model/TransactionEvent/StartTransaction.d.ts

@@ -1,7 +1,5 @@
-import type { StartTransactionDto, TenantDto } from '@citrineos/base';
+import type { ConnectorDto, StartTransactionDto, TenantDto, TransactionDto } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
-import { Transaction } from './Transaction.js';
-import { Connector } from '../Location/index.js';
 export declare class StartTransaction extends Model implements StartTransactionDto {
     static readonly MODEL_NAME: string;
     stationId: string;
@@ -9,9 +7,9 @@ export declare class StartTransaction extends Model implements StartTransactionD
     timestamp: string;
     reservationId?: number | null;
     transactionDatabaseId: number;
-    transaction: Transaction;
+    transaction: TransactionDto;
     connectorDatabaseId: number;
-    connector: Connector;
+    connector: ConnectorDto;
     tenantId: number;
     tenant?: TenantDto;
     static setDefaultTenant(instance: StartTransaction): void;

package/dist/layers/sequelize/model/TransactionEvent/StartTransaction.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, OCPP1_6_Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, OCPP1_6_Namespace } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, Model, Table, } from 'sequelize-typescript';
 import { Transaction } from './Transaction.js';
 import { Connector } from '../Location/index.js';
@@ -57,7 +57,7 @@ __decorate([
 ], StartTransaction.prototype, "transactionDatabaseId", void 0);
 __decorate([
     BelongsTo(() => Transaction),
-    __metadata("design:type", Transaction)
+    __metadata("design:type", Object)
 ], StartTransaction.prototype, "transaction", void 0);
 __decorate([
     ForeignKey(() => Connector),
@@ -65,7 +65,7 @@ __decorate([
 ], StartTransaction.prototype, "connectorDatabaseId", void 0);
 __decorate([
     BelongsTo(() => Connector),
-    __metadata("design:type", Connector)
+    __metadata("design:type", Object)
 ], StartTransaction.prototype, "connector", void 0);
 __decorate([
     ForeignKey(() => Tenant),

package/dist/layers/sequelize/model/TransactionEvent/StartTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"StartTransaction.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/TransactionEvent/StartTransaction.ts"],"names":[],"mappings":";;;;;;;;;AAIA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,KAAK,EACL,KAAK,GACN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG/B,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,KAAK;IACzC,MAAM,CAAU,UAAU,GAAW,iBAAiB,CAAC,gBAAgB,CAAC;IAiDjE,AAAP,MAAM,CAAC,gBAAgB,CAAC,QAA0B;QAChD,IAAI,QAAQ,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC9B,QAAQ,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACxC,CAAC;IACH,CAAC;IAED,YAAY,GAAG,IAAW;QACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACf,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACpC,CAAC;IACH,CAAC;;AAzDO;IADP,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;;mDACE;AAGlB;IADP,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;;oDACE;AAQnB;IANP,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,GAAG;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;QACvD,CAAC;KACF,CAAC;;mDACwB;AAGlB;IADP,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;;uDACa;AAO9B;IALP,UAAU,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC;IAC7B,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,OAAO;QACtB,MAAM,EAAE,IAAI;KACb,CAAC;;+DACoC;AAG9B;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC;8BACR,WAAW;qDAAC;AAGzB;IADP,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;;6DACQ;AAG5B;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;8BACR,SAAS;mDAAC;AASrB;IAPP,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACxB,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK;QAChB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,UAAU;KACrB,CAAC;;kDACuB;AAGjB;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACG;AAIpB;IAFN,YAAY;IACZ,YAAY;;qCACqB,gBAAgB;;8CAIjD;AAtDU,gBAAgB;IAD5B,KAAK;;GACO,gBAAgB,CA8D5B"}
+{"version":3,"file":"StartTransaction.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/TransactionEvent/StartTransaction.ts"],"names":[],"mappings":";;;;;;;;;AAIA,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,MAAM,EACN,QAAQ,EACR,UAAU,EACV,KAAK,EACL,KAAK,GACN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG/B,IAAM,gBAAgB,GAAtB,MAAM,gBAAiB,SAAQ,KAAK;IACzC,MAAM,CAAU,UAAU,GAAW,iBAAiB,CAAC,gBAAgB,CAAC;IAiDjE,AAAP,MAAM,CAAC,gBAAgB,CAAC,QAA0B;QAChD,IAAI,QAAQ,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC9B,QAAQ,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACxC,CAAC;IACH,CAAC;IAED,YAAY,GAAG,IAAW;QACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACf,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,iBAAiB,CAAC;QACpC,CAAC;IACH,CAAC;;AAzDO;IADP,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;;mDACE;AAGlB;IADP,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;;oDACE;AAQnB;IANP,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,GAAG;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;QACvD,CAAC;KACF,CAAC;;mDACwB;AAGlB;IADP,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;;uDACa;AAO9B;IALP,UAAU,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC;IAC7B,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,OAAO;QACtB,MAAM,EAAE,IAAI;KACb,CAAC;;+DACoC;AAG9B;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC;;qDACO;AAG5B;IADP,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;;6DACQ;AAG5B;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;;mDACK;AASxB;IAPP,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACxB,MAAM,CAAC;QACN,IAAI,EAAE,QAAQ,CAAC,OAAO;QACtB,SAAS,EAAE,KAAK;QAChB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,UAAU;KACrB,CAAC;;kDACuB;AAGjB;IADP,SAAS,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACG;AAIpB;IAFN,YAAY;IACZ,YAAY;;qCACqB,gBAAgB;;8CAIjD;AAtDU,gBAAgB;IAD5B,KAAK;;GACO,gBAAgB,CA8D5B"}

package/dist/layers/sequelize/model/TransactionEvent/StopTransaction.d.ts

@@ -1,4 +1,4 @@
-import type { StopTransactionDto, TenantDto } from '@citrineos/base';
+import type { StopTransactionDto, TenantDto } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
 import { MeterValue } from './MeterValue.js';
 import { Transaction } from './Transaction.js';

package/dist/layers/sequelize/model/TransactionEvent/StopTransaction.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, OCPP1_6_Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, OCPP1_6_Namespace } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, HasMany, Model, Table, } from 'sequelize-typescript';
 import { Tenant } from '../Tenant.js';
 import { MeterValue } from './MeterValue.js';

package/dist/layers/sequelize/model/TransactionEvent/Transaction.d.ts

@@ -1,13 +1,8 @@
-import type { StartTransactionDto, StopTransactionDto, TenantDto, TransactionDto } from '@citrineos/base';
+import type { AuthorizationDto, ConnectorDto, EvseDto, StartTransactionDto, StopTransactionDto, TariffDto, TenantDto, TransactionDto, TransactionEventDto } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
-import { Authorization } from '../Authorization/index.js';
-import { Tariff } from '../index.js';
 import { type ChargingStation as ChargingStationType } from '../Location/ChargingStation.js';
-import { Connector } from '../Location/Connector.js';
-import { Evse } from '../Location/Evse.js';
 import { type Location as LocationType } from '../Location/Location.js';
 import { MeterValue } from './MeterValue.js';
-import { TransactionEvent } from './TransactionEvent.js';
 export declare class Transaction extends Model implements TransactionDto {
     static readonly MODEL_NAME: string;
     static readonly TRANSACTION_EVENTS_ALIAS = "transactionEvents";
@@ -17,17 +12,17 @@ export declare class Transaction extends Model implements TransactionDto {
     stationId: string;
     station: ChargingStationType;
     evseId?: number;
-    evse?: Evse | null;
+    evse?: EvseDto | null;
     connectorId?: number;
-    connector?: Connector | null;
+    connector?: ConnectorDto | null;
     authorizationId?: number;
-    authorization?: Authorization;
+    authorization?: AuthorizationDto;
     tariffId?: number;
-    tariff?: Tariff;
+    tariff?: TariffDto;
     transactionId: string;
     isActive: boolean;
-    transactionEvents?: TransactionEvent[];
-    transactionEventsFilter?: TransactionEvent[];
+    transactionEvents?: TransactionEventDto[];
+    transactionEventsFilter?: TransactionEventDto[];
     meterValues?: MeterValue[];
     startTransaction?: StartTransactionDto;
     stopTransaction?: StopTransactionDto;

package/dist/layers/sequelize/model/TransactionEvent/Transaction.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, Namespace } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, HasMany, HasOne, Model, Table, } from 'sequelize-typescript';
 import { Authorization } from '../Authorization/index.js';
 import { Tariff, Tenant } from '../index.js';
@@ -89,7 +89,7 @@ __decorate([
 ], Transaction.prototype, "authorizationId", void 0);
 __decorate([
     BelongsTo(() => Authorization),
-    __metadata("design:type", Authorization)
+    __metadata("design:type", Object)
 ], Transaction.prototype, "authorization", void 0);
 __decorate([
     Column(DataType.INTEGER),
@@ -98,7 +98,7 @@ __decorate([
 ], Transaction.prototype, "tariffId", void 0);
 __decorate([
     BelongsTo(() => Tariff),
-    __metadata("design:type", Tariff)
+    __metadata("design:type", Object)
 ], Transaction.prototype, "tariff", void 0);
 __decorate([
     Column({

package/dist/layers/sequelize/model/TransactionEvent/Transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/TransactionEvent/Transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../../../../src/layers/sequelize/model/TransactionEvent/Transaction.ts"],"names":[],"mappings":"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"}

package/dist/layers/sequelize/model/TransactionEvent/TransactionEvent.d.ts

@@ -1,8 +1,7 @@
-import type { TenantDto, TransactionEventDto, TransactionEventEnumType, TriggerReasonEnumType, TransactionType } from '@citrineos/base';
-import { OCPP2_0_1 } from '@citrineos/base';
+import type { TenantDto, TransactionDto, TransactionEventDto, TransactionEventEnumType, TriggerReasonEnumType, TransactionType } from '@zetra/citrineos-base';
+import { OCPP2_0_1 } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
 import { MeterValue } from './MeterValue.js';
-import { Transaction } from './Transaction.js';
 export declare class TransactionEvent extends Model implements TransactionEventDto {
     static readonly MODEL_NAME: string;
     stationId: string;
@@ -16,7 +15,7 @@ export declare class TransactionEvent extends Model implements TransactionEventD
     cableMaxCurrent?: number | null;
     reservationId?: number | null;
     transactionDatabaseId?: number;
-    transaction?: Transaction;
+    transaction?: TransactionDto;
     transactionInfo: TransactionType;
     evseId?: number | null;
     evse?: OCPP2_0_1.EVSEType;

package/dist/layers/sequelize/model/TransactionEvent/TransactionEvent.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, HasMany, Model, Table, } from 'sequelize-typescript';
 import { EvseType } from '../DeviceModel/index.js';
 import { MeterValue } from './MeterValue.js';
@@ -78,7 +78,7 @@ __decorate([
 ], TransactionEvent.prototype, "transactionDatabaseId", void 0);
 __decorate([
     BelongsTo(() => Transaction),
-    __metadata("design:type", Transaction)
+    __metadata("design:type", Object)
 ], TransactionEvent.prototype, "transaction", void 0);
 __decorate([
     Column(DataType.JSON),

package/dist/layers/sequelize/model/TransactionEvent/TransactionEvent.js.map

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

package/dist/layers/sequelize/model/VariableMonitoring/EventData.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentDto, EventDataDto, VariableDto, TenantDto, EventTriggerEnumType, EventNotificationEnumType } from '@citrineos/base';
-import { OCPP2_0_1 } from '@citrineos/base';
+import type { ComponentDto, EventDataDto, VariableDto, TenantDto, EventTriggerEnumType, EventNotificationEnumType } from '@zetra/citrineos-base';
+import { OCPP2_0_1 } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
 export declare class EventData extends Model implements EventDataDto {
     static readonly MODEL_NAME: string;

package/dist/layers/sequelize/model/VariableMonitoring/EventData.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, Index, Model, Table, } from 'sequelize-typescript';
 import { Component, Variable } from '../DeviceModel/index.js';
 import { Tenant } from '../Tenant.js';

package/dist/layers/sequelize/model/VariableMonitoring/VariableMonitoring.d.ts

@@ -1,5 +1,5 @@
-import type { ComponentDto, VariableDto, VariableMonitoringDto, TenantDto, MonitorEnumType } from '@citrineos/base';
-import { OCPP2_0_1 } from '@citrineos/base';
+import type { ComponentDto, VariableDto, VariableMonitoringDto, TenantDto, MonitorEnumType } from '@zetra/citrineos-base';
+import { OCPP2_0_1 } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
 export declare class VariableMonitoring extends Model implements VariableMonitoringDto {
     static readonly MODEL_NAME: string;

package/dist/layers/sequelize/model/VariableMonitoring/VariableMonitoring.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@zetra/citrineos-base';
 import { AutoIncrement, BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, Index, Model, PrimaryKey, Table, } from 'sequelize-typescript';
 import { Component, Variable } from '../DeviceModel/index.js';
 import { Tenant } from '../Tenant.js';

package/dist/layers/sequelize/model/VariableMonitoring/VariableMonitoringStatus.d.ts

@@ -1,5 +1,5 @@
-import type { VariableMonitoringDto, VariableMonitoringStatusDto, TenantDto, StatusInfo } from '@citrineos/base';
-import { OCPP2_0_1 } from '@citrineos/base';
+import type { VariableMonitoringDto, VariableMonitoringStatusDto, TenantDto, StatusInfo } from '@zetra/citrineos-base';
+import { OCPP2_0_1 } from '@zetra/citrineos-base';
 import { Model } from 'sequelize-typescript';
 export declare class VariableMonitoringStatus extends Model implements VariableMonitoringStatusDto {
     static readonly MODEL_NAME: string;

package/dist/layers/sequelize/model/VariableMonitoring/VariableMonitoringStatus.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@citrineos/base';
+import { DEFAULT_TENANT_ID, OCPP2_0_1, OCPP2_0_1_Namespace } from '@zetra/citrineos-base';
 import { BeforeCreate, BeforeUpdate, BelongsTo, Column, DataType, ForeignKey, Model, Table, } from 'sequelize-typescript';
 import { Tenant } from '../Tenant.js';
 import { VariableMonitoring } from './VariableMonitoring.js';

package/dist/layers/sequelize/model/index.d.ts

@@ -19,3 +19,4 @@ export * from './Tenant.js';
 export * from './TransactionEvent/index.js';
 export * from './VariableMonitoring/index.js';
 export * from './TenantPartner.js';
+export * from './AuthorizationTenant.js';

package/dist/layers/sequelize/model/index.js

@@ -23,4 +23,5 @@ export * from './Tenant.js';
 export * from './TransactionEvent/index.js';
 export * from './VariableMonitoring/index.js';
 export * from './TenantPartner.js';
+export * from './AuthorizationTenant.js';
 //# sourceMappingURL=index.js.map

package/dist/layers/sequelize/model/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/model/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AACtC,+BAA+B;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,WAAW,CAAC;AAC1B,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/model/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AACtC,+BAA+B;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AACzC,cAAc,WAAW,CAAC;AAC1B,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kCAAkC,CAAC;AACjD,cAAc,oCAAoC,CAAC;AACnD,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC"}

package/dist/layers/sequelize/repository/AsyncJobStatus.d.ts

@@ -1,5 +1,5 @@
 import { SequelizeRepository } from './Base.js';
-import type { BootstrapConfig } from '@citrineos/base';
+import type { BootstrapConfig } from '@zetra/citrineos-base';
 import { Sequelize } from 'sequelize-typescript';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';

package/dist/layers/sequelize/repository/Authorization.d.ts

@@ -1,12 +1,14 @@
-import type { BootstrapConfig } from '@citrineos/base';
-import { Sequelize } from 'sequelize-typescript';
+import type { BootstrapConfig } from '@zetra/citrineos-base';
+import { Model, Sequelize, type ModelStatic } from 'sequelize-typescript';
 import type { ILogObj } from 'tslog';
 import { Logger } from 'tslog';
 import { type AuthorizationQuerystring, type IAuthorizationRepository } from '../../../interfaces/index.js';
 import { Authorization } from '../model/index.js';
-import { SequelizeRepository } from './Base.js';
-export declare class SequelizeAuthorizationRepository extends SequelizeRepository<Authorization> implements IAuthorizationRepository {
+import { SequelizeTenantJunctionRepository } from './BaseJunction.js';
+export declare class SequelizeAuthorizationRepository extends SequelizeTenantJunctionRepository<Authorization> implements IAuthorizationRepository {
     constructor(config: BootstrapConfig, logger?: Logger<ILogObj>, sequelizeInstance?: Sequelize);
+    protected getJunctionModel(): ModelStatic<Model>;
+    protected getJunctionForeignKey(): string;
     readAllByQuerystring(tenantId: number, query: AuthorizationQuerystring): Promise<Authorization[]>;
     readOnlyOneByQuerystring(tenantId: number, query: AuthorizationQuerystring): Promise<Authorization | undefined>;
     /**

package/dist/layers/sequelize/repository/Authorization.js

@@ -1,25 +1,33 @@
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { Sequelize } from 'sequelize-typescript';
+import { Model, Sequelize } from 'sequelize-typescript';
 import { Logger } from 'tslog';
 import {} from '../../../interfaces/index.js';
 import { Authorization } from '../model/index.js';
-import { SequelizeRepository } from './Base.js';
-export class SequelizeAuthorizationRepository extends SequelizeRepository {
+import { AuthorizationTenant } from '../model/AuthorizationTenant.js';
+import { AuthorizationLocation } from '../model/AuthorizationLocation.js';
+import { SequelizeTenantJunctionRepository } from './BaseJunction.js';
+export class SequelizeAuthorizationRepository extends SequelizeTenantJunctionRepository {
     constructor(config, logger, sequelizeInstance) {
         super(config, Authorization.MODEL_NAME, logger, sequelizeInstance);
     }
+    getJunctionModel() {
+        return AuthorizationTenant;
+    }
+    getJunctionForeignKey() {
+        return 'authorizationId';
+    }
     async readAllByQuerystring(tenantId, query) {
-        return await super.readAllByQuery(tenantId, this._constructQuery(query));
+        return await super.readAllByQuery(tenantId, this._constructQuery(query, tenantId));
     }
     async readOnlyOneByQuerystring(tenantId, query) {
-        return await super.readOnlyOneByQuery(tenantId, this._constructQuery(query));
+        return await super.readOnlyOneByQuery(tenantId, this._constructQuery(query, tenantId));
     }
     /**
      * Private Methods
      */
-    _constructQuery(queryParams) {
+    _constructQuery(queryParams, tenantId) {
         const where = {};
         if (queryParams.idToken) {
             where.idToken = queryParams.idToken;
@@ -30,6 +38,21 @@ export class SequelizeAuthorizationRepository extends SequelizeRepository {
         }
         return {
             where,
+            include: [
+                {
+                    model: AuthorizationTenant,
+                    as: 'tenants',
+                    required: true,
+                    where: { tenantId },
+                    attributes: [],
+                },
+                {
+                    model: AuthorizationLocation,
+                    as: 'locations',
+                    required: false,
+                    attributes: ['locationId'],
+                },
+            ],
         };
     }
 }

package/dist/layers/sequelize/repository/Authorization.js.map

@@ -1 +1 @@
-{"version":3,"file":"Authorization.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/Authorization.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAGtC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,OAAO,gCACX,SAAQ,mBAAkC;IAG1C,YAAY,MAAuB,EAAE,MAAwB,EAAE,iBAA6B;QAC1F,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,QAAgB,EAChB,KAA+B;QAE/B,OAAO,MAAM,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,QAAgB,EAChB,KAA+B;QAE/B,OAAO,MAAM,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED;;OAEG;IAEK,eAAe,CAAC,WAAqC;QAC3D,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,KAAK,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;QACtC,CAAC;QACD,oGAAoG;QACpG,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;QACvC,CAAC;QAED,OAAO;YACL,KAAK;SACN,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"Authorization.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/Authorization.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAGtC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAoB,MAAM,sBAAsB,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC/B,OAAO,EAGN,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAEtE,MAAM,OAAO,gCACX,SAAQ,iCAAgD;IAGxD,YAAY,MAAuB,EAAE,MAAwB,EAAE,iBAA6B;QAC1F,KAAK,CAAC,MAAM,EAAE,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACrE,CAAC;IAES,gBAAgB;QACxB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAES,qBAAqB;QAC7B,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,QAAgB,EAChB,KAA+B;QAE/B,OAAO,MAAM,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IACrF,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,QAAgB,EAChB,KAA+B;QAE/B,OAAO,MAAM,KAAK,CAAC,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzF,CAAC;IAED;;OAEG;IAEK,eAAe,CAAC,WAAqC,EAAE,QAAgB;QAC7E,MAAM,KAAK,GAAQ,EAAE,CAAC;QACtB,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;YACxB,KAAK,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC;QACtC,CAAC;QACD,oGAAoG;QACpG,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;YACrB,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC;QACvC,CAAC;QAED,OAAO;YACL,KAAK;YACL,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,mBAAmB;oBAC1B,EAAE,EAAE,SAAS;oBACb,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,EAAE,QAAQ,EAAE;oBACnB,UAAU,EAAE,EAAE;iBACf;gBACD;oBACE,KAAK,EAAE,qBAAqB;oBAC5B,EAAE,EAAE,WAAW;oBACf,QAAQ,EAAE,KAAK;oBACf,UAAU,EAAE,CAAC,YAAY,CAAC;iBAC3B;aACF;SACF,CAAC;IACJ,CAAC;CACF"}

package/dist/layers/sequelize/repository/Base.d.ts

@@ -1,4 +1,4 @@
-import { type BootstrapConfig, CrudRepository } from '@citrineos/base';
+import { type BootstrapConfig, CrudRepository } from '@zetra/citrineos-base';
 import type { Attributes, FindAndCountOptions } from 'sequelize';
 import { type Model, type Sequelize } from 'sequelize-typescript';
 import { type ILogObj, Logger } from 'tslog';

package/dist/layers/sequelize/repository/Base.js

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
 //
 // SPDX-License-Identifier: Apache-2.0
-import { CrudRepository } from '@citrineos/base';
+import { CrudRepository } from '@zetra/citrineos-base';
 import { QueryTypes } from 'sequelize';
 import {} from 'sequelize-typescript';
 import { Logger } from 'tslog';
@@ -42,13 +42,25 @@ export class SequelizeRepository extends CrudRepository {
         return maxValue + 1;
     }
     async existsByKey(tenantId, key, namespace = this.namespace) {
-        return await this.s.models[namespace].findByPk(key).then((row) => row !== null);
+        const pk = this.s.models[namespace].primaryKeyAttribute;
+        return await this.s.models[namespace]
+            .findOne({ where: { [pk]: key, tenantId } })
+            .then((row) => row !== null);
     }
     async existByQuery(tenantId, query, namespace = this.namespace) {
-        return await this.s.models[namespace].findAll(query).then((row) => row.length);
+        const q = query;
+        const mergedQuery = {
+            ...q,
+            where: { ...(q.where ?? {}), tenantId },
+        };
+        return await this.s.models[namespace].findAll(mergedQuery).then((row) => row.length);
     }
     async findAndCount(tenantId, options, namespace = this.namespace) {
-        return this.s.models[namespace].findAndCountAll(options);
+        const merged = {
+            ...options,
+            where: { ...(options.where ?? {}), tenantId },
+        };
+        return this.s.models[namespace].findAndCountAll(merged);
     }
     async _create(tenantId, value, _namespace = this.namespace) {
         return await value.save();

package/dist/layers/sequelize/repository/Base.js.map

@@ -1 +1 @@
-{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/Base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../../src/layers/sequelize/repository/Base.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAEtC,OAAO,EAAwB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AASvE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAA8B,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAgB,MAAM,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEtD,MAAM,OAAO,mBAA+C,SAAQ,cAAiB;IACzE,CAAC,CAAY;IACb,SAAS,CAAS;IAClB,MAAM,CAAkB;IAElC,YACE,MAAuB,EACvB,SAAiB,EACjB,MAAwB,EACxB,iBAA6B;QAE7B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,CAAC,GAAG,iBAAiB,IAAI,wBAAwB,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnF,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM;YAClB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YACtD,CAAC,CAAC,IAAI,MAAM,CAAU,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,SAAS,CACb,QAAgB,EAChB,GAAoB,EACpB,YAAoB,IAAI,CAAC,SAAS;QAElC,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAQ,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAgB,EAChB,KAAa,EACb,YAAoB,IAAI,CAAC,SAAS;QAElC,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;aAClC,OAAO,CAAC,KAAyB,CAAC;aAClC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAU,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,QAAgB,EAChB,SAAiB,EACjB,aAAqB,IAAI,CAAC,SAAS;QAEnC,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,QAAgB,EAChB,UAAkB,EAClB,KAAc,EACd,UAAmB,EACnB,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAE,KAA+B,CAAC,CAAC,CAAC,SAAS,CAAC;QACrE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QACzE,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChD,4EAA4E;YAC5E,OAAO,UAAU,IAAI,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpD,MAAM,IAAI,KAAK,CAAC,aAAa,QAAQ,OAAO,UAAU,cAAc,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,QAAQ,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,QAAgB,EAChB,GAAW,EACX,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC;QACxD,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;aAClC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAuB,EAAE,CAAC;aAChE,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,QAAgB,EAChB,KAAa,EACb,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,CAAC,GAAG,KAAyB,CAAC;QACpC,MAAM,WAAW,GAAG;YAClB,GAAG,CAAC;YACJ,KAAK,EAAE,EAAE,GAAG,CAAE,CAAC,CAAC,KAAgB,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAuB;SACzE,CAAC;QACF,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,QAAgB,EAChB,OAA0D,EAC1D,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,MAAM,GAAG;YACb,GAAG,OAAO;YACV,KAAK,EAAE,EAAE,GAAG,CAAE,OAAO,CAAC,KAAgB,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAuB;SAC/E,CAAC;QACF,OAAQ,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAoB,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC9E,CAAC;IAES,KAAK,CAAC,OAAO,CACrB,QAAgB,EAChB,KAAQ,EACR,aAAqB,IAAI,CAAC,SAAS;QAEnC,OAAO,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAES,KAAK,CAAC,WAAW,CACzB,QAAgB,EAChB,MAAW,EACX,YAAoB,IAAI,CAAC,SAAS;QAElC,OAAO,MAAO,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAoB,CAAC,UAAU,CAAC,MAAa,CAAC,CAAC;IACtF,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,QAAgB,EAChB,KAAQ,EACR,GAAW,EACX,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC;QAChE,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QACpC,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAM,CAAC;IACtE,CAAC;IAES,KAAK,CAAC,oBAAoB,CAClC,QAAgB,EAChB,KAAa,EACb,YAAoB,IAAI,CAAC,SAAS;QAElC,OAAO,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;aAClC,YAAY,CAAC,KAAyB,CAAC;aACvC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,QAAgB,EAChB,KAAiB,EACjB,GAAW,EACX,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAmB,CAAC;QACzD,MAAM,EAAE,GAAG,KAAK,CAAC,mBAAmB,CAAC;QAErC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,GAAG,KAAY,CAAC;QAE1D,MAAM,KAAK,GAAsB;YAC/B,CAAC,EAAE,CAAC,EAAE,GAAG;YACT,QAAQ;SACT,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC,GAAG;YAAE,OAAO,SAAS,CAAC;QAE3B,MAAM,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE5B,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC/B,QAAgB,EAChB,KAAiB,EACjB,KAAa,EACb,YAAoB,IAAI,CAAC,SAAS;QAElC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAmB,CAAC;QAEzD,MAAM,KAAK,GAAsB;YAC/B,GAAI,KAAa,CAAC,KAAK;YACvB,QAAQ;SACT,CAAC;QAEF,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC;YAC/B,GAAI,KAAa;YACjB,KAAK;SACN,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAClD,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,QAAgB,EAChB,GAAW,EACX,YAAoB,IAAI,CAAC,SAAS;QAElC,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YAC9C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;iBACjD,QAAQ,CAAC,GAAG,EAAE,EAAE,WAAW,EAAE,CAAC;iBAC9B,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAQ,CAAC,CAAC;YAE3B,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;oBACrC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,mBAAmB,CAAC,EAAE,GAAG,EAAE;oBAC9D,WAAW;iBACZ,CAAC,CAAC;gBACH,OAAO,aAAa,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,KAAK,CAAC,iBAAiB,CAC/B,QAAgB,EAChB,KAAa,EACb,YAAoB,IAAI,CAAC,SAAS;QAElC,OAAO,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;YAC9C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;iBACnD,OAAO,CAAC;gBACP,GAAG,KAAK;gBACR,WAAW;aACZ,CAAC;iBACD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAW,CAAC,CAAC;YAE/B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YAEvF,IAAI,eAAe,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;gBAC5C,OAAO,eAAe,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,WAAW,YAAY,sBAAsB,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;YACzF,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}