Skip to content

Commit 8988bfc

Browse files
ZynovIIZynovII
committed
feat: use crud for fcm-tokens
1 parent 06fe4e7 commit 8988bfc

10 files changed

Lines changed: 174 additions & 186 deletions

File tree

‎configs/cron.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,33 @@
5353
"responseTemplate": "<%= `deleted: ${deleted.length}` %>"
5454
}
5555
},
56+
{
57+
"rule": "0 1 * * *",
58+
"method": "notification.fcm-token.remove",
59+
"description": "Cleanup 2 months old fcm tokens",
60+
"payload": {
61+
"params": {
62+
"query": {
63+
"where": {
64+
"updatedAt": {
65+
"<": "<%= new Date().setMonth(new Date().getMonth() - 2) %>"
66+
}
67+
}
68+
},
69+
"payload": {
70+
"authorization": {
71+
"filter": {
72+
"methodOptions": {
73+
"isAllowMultiple": true
74+
}
75+
}
76+
}
77+
}
78+
},
79+
"allowErrorCodes": [-33485],
80+
"responseTemplate": "<%= `deleted: ${deleted.length}` %>"
81+
}
82+
},
5683
{
5784
"rule": "* * * * *",
5885
"method": "notification.job.task.process",

‎microservices/authorization/migrations/permissions/list/methods/notification.json‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -325,22 +325,22 @@
325325
{
326326
"microservice": "notification",
327327
"method": "fcm-token.remove",
328-
"description": "Remove FCM token",
328+
"description": "Remove FcmToken by given condition",
329329
"allowGroup": [
330330
"admin"
331331
],
332332
"denyGroup": [],
333-
"createdAt": "2025-03-10T18:03:29.296Z",
334-
"modelIn": "notification.FcmTokenRemoveInput",
335-
"modelOut": "notification.FcmTokenRemoveOutput",
333+
"createdAt": "2025-03-17T09:02:17.638Z",
334+
"modelIn": "RemoveRequestParams",
335+
"modelOut": "notification.RemoveOutputParams.7e57e480187ae365dff017e73a6af35c",
336336
"methodFilters": []
337337
},
338338
{
339339
"microservice": "notification",
340340
"method": "fcm-token.save",
341341
"description": "Save FCM token for user",
342342
"allowGroup": [
343-
"admin"
343+
"user"
344344
],
345345
"denyGroup": [],
346346
"createdAt": "2025-03-10T18:03:29.296Z",
@@ -350,15 +350,41 @@
350350
},
351351
{
352352
"microservice": "notification",
353-
"method": "fcm-token.remove-user-tokens",
354-
"description": "Remove all FCM tokens for a user",
353+
"method": "fcm-token.list",
354+
"description": "Returns list of FcmToken by given condition",
355+
"allowGroup": [
356+
"admin"
357+
],
358+
"denyGroup": [],
359+
"createdAt": "2025-03-17T09:02:17.638Z",
360+
"modelIn": "ListRequestParams",
361+
"modelOut": "notification.ListOutputParams.07cb21604c24f47f2672215971731023",
362+
"methodFilters": []
363+
},
364+
{
365+
"microservice": "notification",
366+
"method": "fcm-token.view",
367+
"description": "Returns FcmToken by given condition",
368+
"allowGroup": [
369+
"admin"
370+
],
371+
"denyGroup": [],
372+
"createdAt": "2025-03-17T09:02:17.638Z",
373+
"modelIn": "ViewRequestParams",
374+
"modelOut": "notification.ViewOutputParams.c7183e89e574222a2a3d0fca89605104",
375+
"methodFilters": []
376+
},
377+
{
378+
"microservice": "notification",
379+
"method": "fcm-token.count",
380+
"description": "Returns count of FcmToken by given condition",
355381
"allowGroup": [
356382
"admin"
357383
],
358384
"denyGroup": [],
359-
"createdAt": "2025-03-10T19:45:43.110Z",
360-
"modelIn": "notification.FcmTokenRemoveUserTokensInput",
361-
"modelOut": "notification.FcmTokenRemoveUserTokensOutput",
385+
"createdAt": "2025-03-17T09:02:17.638Z",
386+
"modelIn": "CountRequestParams",
387+
"modelOut": "CountOutputParams",
362388
"methodFilters": []
363389
}
364390
]

‎microservices/authorization/migrations/permissions/list/models/notification.json‎

Lines changed: 51 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"task": "notification.Task",
112112
"recipient": "notification.Recipient"
113113
},
114-
"createdAt": "2022-04-14T05:34:31.136Z"
114+
"createdAt": "2025-03-17T09:02:17.638Z"
115115
},
116116
{
117117
"microservice": "notification",
@@ -128,7 +128,7 @@
128128
}
129129
}
130130
},
131-
"createdAt": "2022-04-14T05:34:31.136Z"
131+
"createdAt": "2025-03-17T09:02:17.638Z"
132132
},
133133
{
134134
"microservice": "notification",
@@ -807,8 +807,8 @@
807807
},
808808
{
809809
"microservice": "notification",
810-
"alias": "notification.FcmTokenRemoveInput",
811-
"title": "Fcm Token Remove Input",
810+
"alias": "notification.FcmToken",
811+
"title": "Fcm Token",
812812
"schema": {
813813
"token": {
814814
"in": {
@@ -817,32 +817,34 @@
817817
"out": {
818818
"admin": "allow"
819819
}
820-
}
821-
},
822-
"createdAt": "2025-03-10T18:03:29.296Z"
823-
},
824-
{
825-
"microservice": "notification",
826-
"alias": "notification.FcmTokenRemoveOutput",
827-
"title": "Fcm Token Remove Output",
828-
"schema": {
829-
"success": {
820+
},
821+
"userId": {
822+
"in": {
823+
"user": {
824+
"condition": "Fields: user owner"
825+
}
826+
},
827+
"out": {
828+
"admin": "allow"
829+
}
830+
},
831+
"userAgent": {
830832
"in": {
831833
"admin": "allow"
832834
},
833835
"out": {
834836
"admin": "allow"
835837
}
836-
}
837-
},
838-
"createdAt": "2025-03-10T18:03:29.296Z"
839-
},
840-
{
841-
"microservice": "notification",
842-
"alias": "notification.FcmTokenRemoveUserTokensInput",
843-
"title": "Fcm Token Remove User Tokens Input",
844-
"schema": {
845-
"userId": {
838+
},
839+
"createdAt": {
840+
"in": {
841+
"admin": "allow"
842+
},
843+
"out": {
844+
"admin": "allow"
845+
}
846+
},
847+
"updatedAt": {
846848
"in": {
847849
"admin": "allow"
848850
},
@@ -851,14 +853,15 @@
851853
}
852854
}
853855
},
854-
"createdAt": "2025-03-10T19:45:43.110Z"
856+
"createdAt": "2025-03-17T09:02:17.638Z"
855857
},
856858
{
857859
"microservice": "notification",
858-
"alias": "notification.FcmTokenRemoveUserTokensOutput",
859-
"title": "Fcm Token Remove User Tokens Output",
860+
"alias": "notification.ListOutputParams.07cb21604c24f47f2672215971731023",
861+
"title": "List Output Params",
860862
"schema": {
861-
"success": {
863+
"list": "notification.FcmToken",
864+
"count": {
862865
"in": {
863866
"admin": "allow"
864867
},
@@ -867,6 +870,25 @@
867870
}
868871
}
869872
},
870-
"createdAt": "2025-03-10T19:45:43.110Z"
873+
"createdAt": "2025-03-17T09:02:17.638Z"
874+
},
875+
{
876+
"microservice": "notification",
877+
"alias": "notification.ViewOutputParams.c7183e89e574222a2a3d0fca89605104",
878+
"title": "View Output Params",
879+
"schema": {
880+
"entity": "notification.FcmToken"
881+
},
882+
"createdAt": "2025-03-17T09:02:17.638Z"
883+
},
884+
{
885+
"microservice": "notification",
886+
"alias": "notification.RemoveOutputParams.7e57e480187ae365dff017e73a6af35c",
887+
"title": "Remove Output Params",
888+
"schema": {
889+
"deleted": "notification.FcmToken",
890+
"entities": "notification.FcmToken"
891+
},
892+
"createdAt": "2025-03-17T09:02:17.638Z"
871893
}
872894
]

‎microservices/notification/migrations/1742223121658-use-userid-and-useragent-as-pk.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { MigrationInterface, QueryRunner } from 'typeorm';
2+
3+
export default class useUseridAndUseragentAsPk1742223121658 implements MigrationInterface {
4+
name = 'useUseridAndUseragentAsPk1742223121658';
5+
6+
public async up(queryRunner: QueryRunner): Promise<void> {
7+
await queryRunner.query(`DROP INDEX "public"."IDX_fcm_token_userId"`);
8+
await queryRunner.query(`DROP INDEX "public"."IDX_fcm_token_token"`);
9+
await queryRunner.query(`ALTER TABLE "fcm_token" DROP CONSTRAINT IF EXISTS "PK_fcm_token"`);
10+
await queryRunner.query(`UPDATE "fcm_token"
11+
SET "userAgent" = ''
12+
WHERE "userAgent" IS NULL`);
13+
await queryRunner.query(`ALTER TABLE "fcm_token"
14+
ALTER COLUMN "userAgent" SET NOT NULL`);
15+
await queryRunner.query(`ALTER TABLE "fcm_token"
16+
ADD CONSTRAINT "PK_fcm_token_new" PRIMARY KEY ("userId", "userAgent")`);
17+
await queryRunner.query(`ALTER TABLE "fcm_token"
18+
ADD CONSTRAINT "UQ_fcm_token_token" UNIQUE ("token")`);
19+
}
20+
21+
public async down(queryRunner: QueryRunner): Promise<void> {
22+
await queryRunner.query(`ALTER TABLE "fcm_token" DROP CONSTRAINT "UQ_fcm_token_token"`);
23+
await queryRunner.query(`ALTER TABLE "fcm_token" DROP CONSTRAINT "PK_fcm_token_new"`);
24+
await queryRunner.query(`ALTER TABLE "fcm_token"
25+
ALTER COLUMN "userAgent" DROP NOT NULL`);
26+
await queryRunner.query(`ALTER TABLE "fcm_token"
27+
ADD CONSTRAINT "PK_fcm_token" PRIMARY KEY ("token")`);
28+
await queryRunner.query(`CREATE UNIQUE INDEX "IDX_fcm_token_token" ON "fcm_token" ("token") `);
29+
await queryRunner.query(`CREATE INDEX "IDX_fcm_token_userId" ON "fcm_token" ("userId") `);
30+
}
31+
}

‎microservices/notification/src/entities/fcm-token.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
import { IsTypeormDate, IsUndefinable } from '@lomray/microservice-helpers';
1+
import { IsTypeormDate } from '@lomray/microservice-helpers';
22
import { IsString, Length } from 'class-validator';
33
import { JSONSchema } from 'class-validator-jsonschema';
4-
import { Entity, Column, CreateDateColumn, Index, UpdateDateColumn, PrimaryColumn } from 'typeorm';
4+
import { Entity, Column, CreateDateColumn, UpdateDateColumn, PrimaryColumn, Unique } from 'typeorm';
55

66
@JSONSchema({
77
title: 'FCM Token',
88
})
99
@Entity()
1010
class FcmToken {
11-
@PrimaryColumn({ type: 'varchar', length: 255 })
11+
@Column({ type: 'varchar', length: 255 })
1212
@Length(1, 255)
1313
@IsString()
14+
@Unique(['token'])
1415
token: string;
1516

16-
@Index('IDX_fcm_token_userId', ['userId'])
17-
@Column({ type: 'varchar', length: 36 })
17+
@PrimaryColumn({ type: 'varchar', length: 36 })
1818
@Length(1, 36)
1919
@IsString()
2020
userId: string;
2121

22-
@Column({ type: 'varchar', length: 255, nullable: true })
22+
@Column({ type: 'varchar', length: 255 })
2323
@Length(1, 255)
2424
@IsString()
25-
@IsUndefinable()
26-
userAgent?: string;
25+
@PrimaryColumn()
26+
userAgent: string;
2727

2828
@IsTypeormDate()
2929
@CreateDateColumn()

‎microservices/notification/src/methods/fcm-token/crud.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Endpoint } from '@lomray/microservice-helpers';
2+
import { getRepository } from 'typeorm';
3+
import FcmToken from '@entities/fcm-token';
4+
5+
/**
6+
* CRUD controller for FCMToken entities
7+
*/
8+
const crud = Endpoint.controller(() => getRepository(FcmToken), {
9+
restore: false,
10+
create: false,
11+
});
12+
13+
export default crud;

‎microservices/notification/src/methods/fcm-token/remove-user-tokens.ts‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)