[optimize] simplify View Entity definations of Check Event model

Signed-off-by: South Drifter <shiy2008@gmail.com>
kaiyuanshe · Jan 7, 2025 · 821d47d · 821d47d
1 parent 1da5ba4
commit 821d47d
Showing 1 changed file with 11 additions and 24 deletions.
diff --git a/src/model/CheckEvent.ts b/src/model/CheckEvent.ts
@@ -97,18 +97,12 @@ export class CheckEventChunk implements ListChunk<CheckEvent> {
         connection
             .createQueryBuilder()
             .from(CheckEvent, 'ce')
-            .groupBy('ce.user.id, ce.activityId')
+            .groupBy('ce.activityId')
             .select('ce.activityId', 'activityId')
-            .addSelect('ce.user.id', 'userId')
             .addSelect('ce.activityName', 'activityName')
             .addSelect('COUNT(ce.id)', 'checkCount')
 })
-export class UserActivityCheckInSummary {
-    @ViewColumn()
-    @IsInt()
-    @Min(1)
-    userId: number;
-
+export class ActivityCheckInSummary {
     @ViewColumn()
     @IsString()
     activityId: string;
@@ -121,35 +115,28 @@ export class UserActivityCheckInSummary {
     @IsInt()
     @Min(0)
     checkCount: number;
-
-    @Type(() => User)
-    @ValidateNested()
-    user: User;
 }
 
 @ViewEntity({
     expression: connection =>
         connection
             .createQueryBuilder()
             .from(CheckEvent, 'ce')
-            .groupBy('ce.activityId')
+            .groupBy('ce.user.id, ce.activityId')
             .select('ce.activityId', 'activityId')
+            .addSelect('ce.user.id', 'userId')
             .addSelect('ce.activityName', 'activityName')
             .addSelect('COUNT(ce.id)', 'checkCount')
 })
-export class ActivityCheckInSummary {
-    @ViewColumn()
-    @IsString()
-    activityId: string;
-
-    @ViewColumn()
-    @IsString()
-    activityName: string;
-
+export class UserActivityCheckInSummary extends ActivityCheckInSummary {
     @ViewColumn()
     @IsInt()
-    @Min(0)
-    checkCount: number;
+    @Min(1)
+    userId: number;
+
+    @Type(() => User)
+    @ValidateNested()
+    user: User;
 }
 
 @ViewEntity({