@vrplatform/kysely 1.3.45-stage.4832 → 1.3.45-stage.4835
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/main/query/tenant/status.d.ts +1 -4
- package/build/main/query/tenant/status.js +7 -4
- package/build/main/query/tenant/status.js.map +1 -1
- package/build/module/query/tenant/status.d.ts +1 -4
- package/build/module/query/tenant/status.js +7 -4
- package/build/module/query/tenant/status.js.map +1 -1
- package/package.json +1 -1
|
@@ -5,10 +5,7 @@ type TenantExpressionBuilder = ExpressionBuilder<DB & {
|
|
|
5
5
|
export declare function whereTenantActive(eb: TenantExpressionBuilder): import("kysely").ExpressionWrapper<DB & {
|
|
6
6
|
tenant: PublicTenant;
|
|
7
7
|
}, "tenant", import("kysely/dist/cjs/util/type-utils").SqlBool>;
|
|
8
|
-
export declare function whereTenantNotTestTeam(eb: TenantExpressionBuilder,
|
|
9
|
-
excludedTenantIds: readonly [string, ...string[]];
|
|
10
|
-
testPartnerTenantId: string;
|
|
11
|
-
}): import("kysely").ExpressionWrapper<DB & {
|
|
8
|
+
export declare function whereTenantNotTestTeam(eb: TenantExpressionBuilder, testTeamId: string): import("kysely").ExpressionWrapper<DB & {
|
|
12
9
|
tenant: PublicTenant;
|
|
13
10
|
}, "tenant", import("kysely/dist/cjs/util/type-utils").SqlBool>;
|
|
14
11
|
export declare function whereTenantShouldBePaid(eb: TenantExpressionBuilder, { includePartnerTeams, today, }?: {
|
|
@@ -17,13 +17,16 @@ function whereTenantActive(eb) {
|
|
|
17
17
|
]),
|
|
18
18
|
]);
|
|
19
19
|
}
|
|
20
|
-
function whereTenantNotTestTeam(eb,
|
|
20
|
+
function whereTenantNotTestTeam(eb, testTeamId) {
|
|
21
21
|
return eb.and([
|
|
22
|
-
eb('tenant.id', '
|
|
23
|
-
eb(
|
|
22
|
+
eb('tenant.id', '!=', testTeamId),
|
|
23
|
+
eb.or([
|
|
24
|
+
eb('tenant.partnerId', 'is', null),
|
|
25
|
+
eb('tenant.partnerId', '!=', testTeamId),
|
|
26
|
+
]),
|
|
24
27
|
eb.or([
|
|
25
28
|
eb('tenant.billingPartnerId', 'is', null),
|
|
26
|
-
eb('tenant.billingPartnerId', '!=',
|
|
29
|
+
eb('tenant.billingPartnerId', '!=', testTeamId),
|
|
27
30
|
]),
|
|
28
31
|
]);
|
|
29
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/tenant/status.ts"],"names":[],"mappings":";;AAQA,8CAkBC;AAED,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/tenant/status.ts"],"names":[],"mappings":";;AAQA,8CAkBC;AAED,wDAeC;AAED,0DAqBC;AAlED,6CAAwC;AAQxC,SAAgB,iBAAiB,CAAC,EAA2B;IAC3D,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE,QAAQ,CAAC;QAC5C,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,mCAAmC,EAAE,IAAI,EAAE,IAAI,CAAC;YACnD,EAAE,CAAC,MAAM,CACP,EAAE;iBACC,UAAU,CAAC,iCAAiC,CAAC;iBAC7C,MAAM,CAAC,mBAAmB,CAAC;iBAC3B,QAAQ,CACP,mBAAmB,EACnB,GAAG,EACH,mCAAmC,CACpC;iBACA,KAAK,CAAC,iCAAiC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAC3D;SACF,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,sBAAsB,CACpC,EAA2B,EAC3B,UAAkB;IAElB,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC;QACjC,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,CAAC;YAClC,EAAE,CAAC,kBAAkB,EAAE,IAAI,EAAE,UAAU,CAAC;SACzC,CAAC;QACF,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,yBAAyB,EAAE,IAAI,EAAE,IAAI,CAAC;YACzC,EAAE,CAAC,yBAAyB,EAAE,IAAI,EAAE,UAAU,CAAC;SAChD,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CACrC,EAA2B,EAC3B,EACE,mBAAmB,GAAG,KAAK,EAC3B,KAAK,GAAG,IAAA,WAAG,GAAE,CAAC,QAAQ,EAAE,MAItB,EAAE;IAEN,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,iBAAiB,CAAC,EAAE,CAAC;QACrB,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE,KAAK,CAAC;QACrC,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE,KAAK,CAAC;YACnC,EAAE,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC;SACpC,CAAC;QACF,GAAG,CAAC,mBAAmB;YACrB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;KACpD,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { day } from '@vrplatform/utils';\nimport type { DB, ExpressionBuilder, PublicTenant } from '../../isomorphic';\n\ntype TenantExpressionBuilder = ExpressionBuilder<\n DB & { tenant: PublicTenant },\n 'tenant'\n>;\n\nexport function whereTenantActive(eb: TenantExpressionBuilder) {\n return eb.and([\n eb('tenant.calculatedStatus', '=', 'active'),\n eb.or([\n eb('tenant.calculatedBillingPartnerId', 'is', null),\n eb.exists(\n eb\n .selectFrom('public.tenant as billingPartner')\n .select('billingPartner.id')\n .whereRef(\n 'billingPartner.id',\n '=',\n 'tenant.calculatedBillingPartnerId'\n )\n .where('billingPartner.calculatedStatus', '=', 'active')\n ),\n ]),\n ]);\n}\n\nexport function whereTenantNotTestTeam(\n eb: TenantExpressionBuilder,\n testTeamId: string\n) {\n return eb.and([\n eb('tenant.id', '!=', testTeamId),\n eb.or([\n eb('tenant.partnerId', 'is', null),\n eb('tenant.partnerId', '!=', testTeamId),\n ]),\n eb.or([\n eb('tenant.billingPartnerId', 'is', null),\n eb('tenant.billingPartnerId', '!=', testTeamId),\n ]),\n ]);\n}\n\nexport function whereTenantShouldBePaid(\n eb: TenantExpressionBuilder,\n {\n includePartnerTeams = false,\n today = day().yyyymmdd(),\n }: {\n includePartnerTeams?: boolean;\n today?: Date | string;\n } = {}\n) {\n return eb.and([\n whereTenantActive(eb),\n eb('tenant.isOnboarding', '=', false),\n eb.or([\n eb('tenant.trialUntil', '<', today),\n eb('tenant.trialUntil', 'is', null),\n ]),\n ...(includePartnerTeams\n ? []\n : [eb('tenant.calculatedIsBillable', '=', true)]),\n ]);\n}\n"]}
|
|
@@ -5,10 +5,7 @@ type TenantExpressionBuilder = ExpressionBuilder<DB & {
|
|
|
5
5
|
export declare function whereTenantActive(eb: TenantExpressionBuilder): import("kysely").ExpressionWrapper<DB & {
|
|
6
6
|
tenant: PublicTenant;
|
|
7
7
|
}, "tenant", import("kysely/dist/cjs/util/type-utils").SqlBool>;
|
|
8
|
-
export declare function whereTenantNotTestTeam(eb: TenantExpressionBuilder,
|
|
9
|
-
excludedTenantIds: readonly [string, ...string[]];
|
|
10
|
-
testPartnerTenantId: string;
|
|
11
|
-
}): import("kysely").ExpressionWrapper<DB & {
|
|
8
|
+
export declare function whereTenantNotTestTeam(eb: TenantExpressionBuilder, testTeamId: string): import("kysely").ExpressionWrapper<DB & {
|
|
12
9
|
tenant: PublicTenant;
|
|
13
10
|
}, "tenant", import("kysely/dist/cjs/util/type-utils").SqlBool>;
|
|
14
11
|
export declare function whereTenantShouldBePaid(eb: TenantExpressionBuilder, { includePartnerTeams, today, }?: {
|
|
@@ -12,13 +12,16 @@ export function whereTenantActive(eb) {
|
|
|
12
12
|
]),
|
|
13
13
|
]);
|
|
14
14
|
}
|
|
15
|
-
export function whereTenantNotTestTeam(eb,
|
|
15
|
+
export function whereTenantNotTestTeam(eb, testTeamId) {
|
|
16
16
|
return eb.and([
|
|
17
|
-
eb('tenant.id', '
|
|
18
|
-
eb(
|
|
17
|
+
eb('tenant.id', '!=', testTeamId),
|
|
18
|
+
eb.or([
|
|
19
|
+
eb('tenant.partnerId', 'is', null),
|
|
20
|
+
eb('tenant.partnerId', '!=', testTeamId),
|
|
21
|
+
]),
|
|
19
22
|
eb.or([
|
|
20
23
|
eb('tenant.billingPartnerId', 'is', null),
|
|
21
|
-
eb('tenant.billingPartnerId', '!=',
|
|
24
|
+
eb('tenant.billingPartnerId', '!=', testTeamId),
|
|
22
25
|
]),
|
|
23
26
|
]);
|
|
24
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/tenant/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,UAAU,iBAAiB,CAAC,EAA2B;IAC3D,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE,QAAQ,CAAC;QAC5C,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,mCAAmC,EAAE,IAAI,EAAE,IAAI,CAAC;YACnD,EAAE,CAAC,MAAM,CACP,EAAE;iBACC,UAAU,CAAC,iCAAiC,CAAC;iBAC7C,MAAM,CAAC,mBAAmB,CAAC;iBAC3B,QAAQ,CACP,mBAAmB,EACnB,GAAG,EACH,mCAAmC,CACpC;iBACA,KAAK,CAAC,iCAAiC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAC3D;SACF,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,EAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"src/","sources":["query/tenant/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAQxC,MAAM,UAAU,iBAAiB,CAAC,EAA2B;IAC3D,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE,QAAQ,CAAC;QAC5C,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,mCAAmC,EAAE,IAAI,EAAE,IAAI,CAAC;YACnD,EAAE,CAAC,MAAM,CACP,EAAE;iBACC,UAAU,CAAC,iCAAiC,CAAC;iBAC7C,MAAM,CAAC,mBAAmB,CAAC;iBAC3B,QAAQ,CACP,mBAAmB,EACnB,GAAG,EACH,mCAAmC,CACpC;iBACA,KAAK,CAAC,iCAAiC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAC3D;SACF,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,EAA2B,EAC3B,UAAkB;IAElB,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,UAAU,CAAC;QACjC,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,CAAC;YAClC,EAAE,CAAC,kBAAkB,EAAE,IAAI,EAAE,UAAU,CAAC;SACzC,CAAC;QACF,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,yBAAyB,EAAE,IAAI,EAAE,IAAI,CAAC;YACzC,EAAE,CAAC,yBAAyB,EAAE,IAAI,EAAE,UAAU,CAAC;SAChD,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,EAA2B,EAC3B,EACE,mBAAmB,GAAG,KAAK,EAC3B,KAAK,GAAG,GAAG,EAAE,CAAC,QAAQ,EAAE,MAItB,EAAE;IAEN,OAAO,EAAE,CAAC,GAAG,CAAC;QACZ,iBAAiB,CAAC,EAAE,CAAC;QACrB,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE,KAAK,CAAC;QACrC,EAAE,CAAC,EAAE,CAAC;YACJ,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE,KAAK,CAAC;YACnC,EAAE,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,CAAC;SACpC,CAAC;QACF,GAAG,CAAC,mBAAmB;YACrB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,EAAE,CAAC,6BAA6B,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;KACpD,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { day } from '@vrplatform/utils';\nimport type { DB, ExpressionBuilder, PublicTenant } from '../../isomorphic';\n\ntype TenantExpressionBuilder = ExpressionBuilder<\n DB & { tenant: PublicTenant },\n 'tenant'\n>;\n\nexport function whereTenantActive(eb: TenantExpressionBuilder) {\n return eb.and([\n eb('tenant.calculatedStatus', '=', 'active'),\n eb.or([\n eb('tenant.calculatedBillingPartnerId', 'is', null),\n eb.exists(\n eb\n .selectFrom('public.tenant as billingPartner')\n .select('billingPartner.id')\n .whereRef(\n 'billingPartner.id',\n '=',\n 'tenant.calculatedBillingPartnerId'\n )\n .where('billingPartner.calculatedStatus', '=', 'active')\n ),\n ]),\n ]);\n}\n\nexport function whereTenantNotTestTeam(\n eb: TenantExpressionBuilder,\n testTeamId: string\n) {\n return eb.and([\n eb('tenant.id', '!=', testTeamId),\n eb.or([\n eb('tenant.partnerId', 'is', null),\n eb('tenant.partnerId', '!=', testTeamId),\n ]),\n eb.or([\n eb('tenant.billingPartnerId', 'is', null),\n eb('tenant.billingPartnerId', '!=', testTeamId),\n ]),\n ]);\n}\n\nexport function whereTenantShouldBePaid(\n eb: TenantExpressionBuilder,\n {\n includePartnerTeams = false,\n today = day().yyyymmdd(),\n }: {\n includePartnerTeams?: boolean;\n today?: Date | string;\n } = {}\n) {\n return eb.and([\n whereTenantActive(eb),\n eb('tenant.isOnboarding', '=', false),\n eb.or([\n eb('tenant.trialUntil', '<', today),\n eb('tenant.trialUntil', 'is', null),\n ]),\n ...(includePartnerTeams\n ? []\n : [eb('tenant.calculatedIsBillable', '=', true)]),\n ]);\n}\n"]}
|