Skip to content

Commit 7a9d036

Browse files
TeaCoder52TeaCoder52
authored
Merge pull request #36 from teacoder-team/dev
Dev
2 parents c4670c4 + dcbdf12 commit 7a9d036

67 files changed

Lines changed: 576 additions & 403 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@nestjs/config": "^3.3.0",
3737
"@nestjs/core": "^10.4.8",
3838
"@nestjs/platform-express": "^10.4.8",
39-
"@nestjs/schedule": "^4.1.1",
39+
"@nestjs/schedule": "^6.0.0",
4040
"@nestjs/swagger": "^8.0.7",
4141
"@nestjs/throttler": "^6.4.0",
4242
"@prisma/client": "^6.12.0",
@@ -56,6 +56,7 @@
5656
"helmet": "^8.0.0",
5757
"hi-base32": "^0.5.1",
5858
"ioredis": "^5.4.1",
59+
"ip-cidr": "^4.0.2",
5960
"nestjs-cloudflare-captcha": "^0.0.10",
6061
"nestjs-yookassa": "^1.1.28",
6162
"otpauth": "^9.3.6",

‎prisma/generated/edge.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎prisma/generated/index-browser.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,6 @@ exports.Prisma.CommentScalarFieldEnum = {
279279

280280
exports.Prisma.SubscriptionScalarFieldEnum = {
281281
id: 'id',
282-
plan: 'plan',
283282
startedAt: 'startedAt',
284283
expiresAt: 'expiresAt',
285284
isActive: 'isActive',

‎prisma/generated/index.d.ts‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -17367,7 +17367,6 @@ export namespace Prisma {
1736717367

1736817368
export type SubscriptionMinAggregateOutputType = {
1736917369
id: string | null
17370-
plan: string | null
1737117370
startedAt: Date | null
1737217371
expiresAt: Date | null
1737317372
isActive: boolean | null
@@ -17378,7 +17377,6 @@ export namespace Prisma {
1737817377

1737917378
export type SubscriptionMaxAggregateOutputType = {
1738017379
id: string | null
17381-
plan: string | null
1738217380
startedAt: Date | null
1738317381
expiresAt: Date | null
1738417382
isActive: boolean | null
@@ -17389,7 +17387,6 @@ export namespace Prisma {
1738917387

1739017388
export type SubscriptionCountAggregateOutputType = {
1739117389
id: number
17392-
plan: number
1739317390
startedAt: number
1739417391
expiresAt: number
1739517392
isActive: number
@@ -17402,7 +17399,6 @@ export namespace Prisma {
1740217399

1740317400
export type SubscriptionMinAggregateInputType = {
1740417401
id?: true
17405-
plan?: true
1740617402
startedAt?: true
1740717403
expiresAt?: true
1740817404
isActive?: true
@@ -17413,7 +17409,6 @@ export namespace Prisma {
1741317409

1741417410
export type SubscriptionMaxAggregateInputType = {
1741517411
id?: true
17416-
plan?: true
1741717412
startedAt?: true
1741817413
expiresAt?: true
1741917414
isActive?: true
@@ -17424,7 +17419,6 @@ export namespace Prisma {
1742417419

1742517420
export type SubscriptionCountAggregateInputType = {
1742617421
id?: true
17427-
plan?: true
1742817422
startedAt?: true
1742917423
expiresAt?: true
1743017424
isActive?: true
@@ -17508,7 +17502,6 @@ export namespace Prisma {
1750817502

1750917503
export type SubscriptionGroupByOutputType = {
1751017504
id: string
17511-
plan: string
1751217505
startedAt: Date
1751317506
expiresAt: Date | null
1751417507
isActive: boolean
@@ -17536,7 +17529,6 @@ export namespace Prisma {
1753617529

1753717530
export type SubscriptionSelect<ExtArgs extends $Extensions.InternalArgs = $Extensions.DefaultArgs> = $Extensions.GetSelect<{
1753817531
id?: boolean
17539-
plan?: boolean
1754017532
startedAt?: boolean
1754117533
expiresAt?: boolean
1754217534
isActive?: boolean
@@ -17550,7 +17542,6 @@ export namespace Prisma {
1755017542

1755117543
export type SubscriptionSelectCreateManyAndReturn<ExtArgs extends $Extensions.InternalArgs = $Extensions.DefaultArgs> = $Extensions.GetSelect<{
1755217544
id?: boolean
17553-
plan?: boolean
1755417545
startedAt?: boolean
1755517546
expiresAt?: boolean
1755617547
isActive?: boolean
@@ -17563,7 +17554,6 @@ export namespace Prisma {
1756317554

1756417555
export type SubscriptionSelectScalar = {
1756517556
id?: boolean
17566-
plan?: boolean
1756717557
startedAt?: boolean
1756817558
expiresAt?: boolean
1756917559
isActive?: boolean
@@ -17572,7 +17562,7 @@ export namespace Prisma {
1757217562
updatedAt?: boolean
1757317563
}
1757417564

17575-
export type SubscriptionOmit<ExtArgs extends $Extensions.InternalArgs = $Extensions.DefaultArgs> = $Extensions.GetOmit<"id" | "plan" | "startedAt" | "expiresAt" | "isActive" | "userId" | "createdAt" | "updatedAt", ExtArgs["result"]["subscription"]>
17565+
export type SubscriptionOmit<ExtArgs extends $Extensions.InternalArgs = $Extensions.DefaultArgs> = $Extensions.GetOmit<"id" | "startedAt" | "expiresAt" | "isActive" | "userId" | "createdAt" | "updatedAt", ExtArgs["result"]["subscription"]>
1757617566
export type SubscriptionInclude<ExtArgs extends $Extensions.InternalArgs = $Extensions.DefaultArgs> = {
1757717567
user?: boolean | UserDefaultArgs<ExtArgs>
1757817568
payments?: boolean | Subscription$paymentsArgs<ExtArgs>
@@ -17590,7 +17580,6 @@ export namespace Prisma {
1759017580
}
1759117581
scalars: $Extensions.GetPayloadResult<{
1759217582
id: string
17593-
plan: string
1759417583
startedAt: Date
1759517584
expiresAt: Date | null
1759617585
isActive: boolean
@@ -17993,7 +17982,6 @@ export namespace Prisma {
1799317982
*/
1799417983
interface SubscriptionFieldRefs {
1799517984
readonly id: FieldRef<"Subscription", 'String'>
17996-
readonly plan: FieldRef<"Subscription", 'String'>
1799717985
readonly startedAt: FieldRef<"Subscription", 'DateTime'>
1799817986
readonly expiresAt: FieldRef<"Subscription", 'DateTime'>
1799917987
readonly isActive: FieldRef<"Subscription", 'Boolean'>
@@ -19721,7 +19709,6 @@ export namespace Prisma {
1972119709

1972219710
export const SubscriptionScalarFieldEnum: {
1972319711
id: 'id',
19724-
plan: 'plan',
1972519712
startedAt: 'startedAt',
1972619713
expiresAt: 'expiresAt',
1972719714
isActive: 'isActive',
@@ -21041,7 +21028,6 @@ export namespace Prisma {
2104121028
OR?: SubscriptionWhereInput[]
2104221029
NOT?: SubscriptionWhereInput | SubscriptionWhereInput[]
2104321030
id?: StringFilter<"Subscription"> | string
21044-
plan?: StringFilter<"Subscription"> | string
2104521031
startedAt?: DateTimeFilter<"Subscription"> | Date | string
2104621032
expiresAt?: DateTimeNullableFilter<"Subscription"> | Date | string | null
2104721033
isActive?: BoolFilter<"Subscription"> | boolean
@@ -21054,7 +21040,6 @@ export namespace Prisma {
2105421040

2105521041
export type SubscriptionOrderByWithRelationInput = {
2105621042
id?: SortOrder
21057-
plan?: SortOrder
2105821043
startedAt?: SortOrder
2105921044
expiresAt?: SortOrderInput | SortOrder
2106021045
isActive?: SortOrder
@@ -21071,7 +21056,6 @@ export namespace Prisma {
2107121056
AND?: SubscriptionWhereInput | SubscriptionWhereInput[]
2107221057
OR?: SubscriptionWhereInput[]
2107321058
NOT?: SubscriptionWhereInput | SubscriptionWhereInput[]
21074-
plan?: StringFilter<"Subscription"> | string
2107521059
startedAt?: DateTimeFilter<"Subscription"> | Date | string
2107621060
expiresAt?: DateTimeNullableFilter<"Subscription"> | Date | string | null
2107721061
isActive?: BoolFilter<"Subscription"> | boolean
@@ -21083,7 +21067,6 @@ export namespace Prisma {
2108321067

2108421068
export type SubscriptionOrderByWithAggregationInput = {
2108521069
id?: SortOrder
21086-
plan?: SortOrder
2108721070
startedAt?: SortOrder
2108821071
expiresAt?: SortOrderInput | SortOrder
2108921072
isActive?: SortOrder
@@ -21100,7 +21083,6 @@ export namespace Prisma {
2110021083
OR?: SubscriptionScalarWhereWithAggregatesInput[]
2110121084
NOT?: SubscriptionScalarWhereWithAggregatesInput | SubscriptionScalarWhereWithAggregatesInput[]
2110221085
id?: StringWithAggregatesFilter<"Subscription"> | string
21103-
plan?: StringWithAggregatesFilter<"Subscription"> | string
2110421086
startedAt?: DateTimeWithAggregatesFilter<"Subscription"> | Date | string
2110521087
expiresAt?: DateTimeNullableWithAggregatesFilter<"Subscription"> | Date | string | null
2110621088
isActive?: BoolWithAggregatesFilter<"Subscription"> | boolean
@@ -22350,7 +22332,6 @@ export namespace Prisma {
2235022332

2235122333
export type SubscriptionCreateInput = {
2235222334
id?: string
22353-
plan: string
2235422335
startedAt?: Date | string
2235522336
expiresAt?: Date | string | null
2235622337
isActive?: boolean
@@ -22362,7 +22343,6 @@ export namespace Prisma {
2236222343

2236322344
export type SubscriptionUncheckedCreateInput = {
2236422345
id?: string
22365-
plan: string
2236622346
startedAt?: Date | string
2236722347
expiresAt?: Date | string | null
2236822348
isActive?: boolean
@@ -22374,7 +22354,6 @@ export namespace Prisma {
2237422354

2237522355
export type SubscriptionUpdateInput = {
2237622356
id?: StringFieldUpdateOperationsInput | string
22377-
plan?: StringFieldUpdateOperationsInput | string
2237822357
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2237922358
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2238022359
isActive?: BoolFieldUpdateOperationsInput | boolean
@@ -22386,7 +22365,6 @@ export namespace Prisma {
2238622365

2238722366
export type SubscriptionUncheckedUpdateInput = {
2238822367
id?: StringFieldUpdateOperationsInput | string
22389-
plan?: StringFieldUpdateOperationsInput | string
2239022368
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2239122369
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2239222370
isActive?: BoolFieldUpdateOperationsInput | boolean
@@ -22398,7 +22376,6 @@ export namespace Prisma {
2239822376

2239922377
export type SubscriptionCreateManyInput = {
2240022378
id?: string
22401-
plan: string
2240222379
startedAt?: Date | string
2240322380
expiresAt?: Date | string | null
2240422381
isActive?: boolean
@@ -22409,7 +22386,6 @@ export namespace Prisma {
2240922386

2241022387
export type SubscriptionUpdateManyMutationInput = {
2241122388
id?: StringFieldUpdateOperationsInput | string
22412-
plan?: StringFieldUpdateOperationsInput | string
2241322389
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2241422390
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2241522391
isActive?: BoolFieldUpdateOperationsInput | boolean
@@ -22419,7 +22395,6 @@ export namespace Prisma {
2241922395

2242022396
export type SubscriptionUncheckedUpdateManyInput = {
2242122397
id?: StringFieldUpdateOperationsInput | string
22422-
plan?: StringFieldUpdateOperationsInput | string
2242322398
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2242422399
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2242522400
isActive?: BoolFieldUpdateOperationsInput | boolean
@@ -23471,7 +23446,6 @@ export namespace Prisma {
2347123446

2347223447
export type SubscriptionCountOrderByAggregateInput = {
2347323448
id?: SortOrder
23474-
plan?: SortOrder
2347523449
startedAt?: SortOrder
2347623450
expiresAt?: SortOrder
2347723451
isActive?: SortOrder
@@ -23482,7 +23456,6 @@ export namespace Prisma {
2348223456

2348323457
export type SubscriptionMaxOrderByAggregateInput = {
2348423458
id?: SortOrder
23485-
plan?: SortOrder
2348623459
startedAt?: SortOrder
2348723460
expiresAt?: SortOrder
2348823461
isActive?: SortOrder
@@ -23493,7 +23466,6 @@ export namespace Prisma {
2349323466

2349423467
export type SubscriptionMinOrderByAggregateInput = {
2349523468
id?: SortOrder
23496-
plan?: SortOrder
2349723469
startedAt?: SortOrder
2349823470
expiresAt?: SortOrder
2349923471
isActive?: SortOrder
@@ -25248,7 +25220,6 @@ export namespace Prisma {
2524825220

2524925221
export type SubscriptionCreateWithoutUserInput = {
2525025222
id?: string
25251-
plan: string
2525225223
startedAt?: Date | string
2525325224
expiresAt?: Date | string | null
2525425225
isActive?: boolean
@@ -25259,7 +25230,6 @@ export namespace Prisma {
2525925230

2526025231
export type SubscriptionUncheckedCreateWithoutUserInput = {
2526125232
id?: string
25262-
plan: string
2526325233
startedAt?: Date | string
2526425234
expiresAt?: Date | string | null
2526525235
isActive?: boolean
@@ -25555,7 +25525,6 @@ export namespace Prisma {
2555525525

2555625526
export type SubscriptionUpdateWithoutUserInput = {
2555725527
id?: StringFieldUpdateOperationsInput | string
25558-
plan?: StringFieldUpdateOperationsInput | string
2555925528
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2556025529
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2556125530
isActive?: BoolFieldUpdateOperationsInput | boolean
@@ -25566,7 +25535,6 @@ export namespace Prisma {
2556625535

2556725536
export type SubscriptionUncheckedUpdateWithoutUserInput = {
2556825537
id?: StringFieldUpdateOperationsInput | string
25569-
plan?: StringFieldUpdateOperationsInput | string
2557025538
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2557125539
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2557225540
isActive?: BoolFieldUpdateOperationsInput | boolean
@@ -27401,7 +27369,6 @@ export namespace Prisma {
2740127369

2740227370
export type SubscriptionCreateWithoutPaymentsInput = {
2740327371
id?: string
27404-
plan: string
2740527372
startedAt?: Date | string
2740627373
expiresAt?: Date | string | null
2740727374
isActive?: boolean
@@ -27412,7 +27379,6 @@ export namespace Prisma {
2741227379

2741327380
export type SubscriptionUncheckedCreateWithoutPaymentsInput = {
2741427381
id?: string
27415-
plan: string
2741627382
startedAt?: Date | string
2741727383
expiresAt?: Date | string | null
2741827384
isActive?: boolean
@@ -27496,7 +27462,6 @@ export namespace Prisma {
2749627462

2749727463
export type SubscriptionUpdateWithoutPaymentsInput = {
2749827464
id?: StringFieldUpdateOperationsInput | string
27499-
plan?: StringFieldUpdateOperationsInput | string
2750027465
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2750127466
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2750227467
isActive?: BoolFieldUpdateOperationsInput | boolean
@@ -27507,7 +27472,6 @@ export namespace Prisma {
2750727472

2750827473
export type SubscriptionUncheckedUpdateWithoutPaymentsInput = {
2750927474
id?: StringFieldUpdateOperationsInput | string
27510-
plan?: StringFieldUpdateOperationsInput | string
2751127475
startedAt?: DateTimeFieldUpdateOperationsInput | Date | string
2751227476
expiresAt?: NullableDateTimeFieldUpdateOperationsInput | Date | string | null
2751327477
isActive?: BoolFieldUpdateOperationsInput | boolean

0 commit comments

Comments
 (0)