11import { createPolicyMiddleware , Policy } from "@/modules/access" ;
22import { getLanguageByCodeReadModel } from "@/modules/languages/read-models/getLanguageByCodeReadModel" ;
33import {
4+ getLanguageApprovalActivityReadModel ,
45 getLanguageDashboardActivityReadModel ,
6+ LanguageApprovalActivityReadModel ,
57 type LanguageDashboardActivityEntryReadModel ,
68} from "@/modules/reporting" ;
79import { notFound } from "@tanstack/react-router" ;
@@ -19,6 +21,7 @@ const requestSchema = z.object({
1921
2022export interface LanguageDashboardRangeData {
2123 activity : LanguageDashboardActivityEntryReadModel [ ] ;
24+ approvalActivity : LanguageApprovalActivityReadModel [ ] ;
2225}
2326
2427export const getLanguageDashboardRangeData = createServerFn ( )
@@ -35,11 +38,24 @@ export const getLanguageDashboardRangeData = createServerFn()
3538 throw notFound ( ) ;
3639 }
3740
38- return {
39- activity : await getLanguageDashboardActivityReadModel ( {
41+ const granularity = data . range === "30d" ? "day" : "week" ;
42+ const range = data . range === "30d" ? 30 : 182 ;
43+
44+ const [ activity , approvalActivity ] = await Promise . all ( [
45+ await getLanguageDashboardActivityReadModel ( {
46+ languageId : language . id ,
47+ granularity,
48+ range,
49+ } ) ,
50+ await getLanguageApprovalActivityReadModel ( {
4051 languageId : language . id ,
41- granularity : data . range === "30d" ? "day" : "week" ,
42- range : data . range === "30d" ? 30 : 182 ,
52+ granularity,
53+ range,
4354 } ) ,
55+ ] ) ;
56+
57+ return {
58+ activity,
59+ approvalActivity,
4460 } ;
4561 } ) ;
0 commit comments