lifestyle development
This commit is contained in:
84
app/home/(user)/(dashboard)/life-style/page.tsx
Normal file
84
app/home/(user)/(dashboard)/life-style/page.tsx
Normal file
@@ -0,0 +1,84 @@
|
||||
import React from 'react';
|
||||
|
||||
import { createUserAnalysesApi } from '@/packages/features/user-analyses/src/server/api';
|
||||
import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
|
||||
import { Circle } from 'lucide-react';
|
||||
|
||||
import { cn } from '@kit/ui/lib/utils';
|
||||
import { PageBody } from '@kit/ui/makerkit/page';
|
||||
import { Trans } from '@kit/ui/makerkit/trans';
|
||||
import { Skeleton } from '@kit/ui/shadcn/skeleton';
|
||||
|
||||
import { createI18nServerInstance } from '~/lib/i18n/i18n.server';
|
||||
import { withI18n } from '~/lib/i18n/with-i18n';
|
||||
import {
|
||||
PageViewAction,
|
||||
createPageViewLog,
|
||||
} from '~/lib/services/audit/pageView.service';
|
||||
|
||||
import { HomeLayoutPageHeader } from '../../_components/home-page-header';
|
||||
import { loadLifeStyle } from '../../_lib/server/load-life-style';
|
||||
import { loadCurrentUserAccount } from '../../_lib/server/load-user-account';
|
||||
|
||||
export async function generateMetadata() {
|
||||
const { t } = await createI18nServerInstance();
|
||||
|
||||
return {
|
||||
title: t('common:lifeStyle.title'),
|
||||
};
|
||||
}
|
||||
|
||||
async function LifeStylePage() {
|
||||
const supabaseClient = getSupabaseServerClient();
|
||||
const userAnalysesApi = createUserAnalysesApi(supabaseClient);
|
||||
|
||||
const analysisResponses = await userAnalysesApi.getAllUserAnalysisResponses();
|
||||
console.log('analysisResponses', analysisResponses);
|
||||
const { account } = await loadCurrentUserAccount();
|
||||
if (!account) {
|
||||
return null;
|
||||
}
|
||||
const data = await loadLifeStyle(account);
|
||||
|
||||
await createPageViewLog({
|
||||
accountId: account.id,
|
||||
action: PageViewAction.VIEW_LIFE_STYLE,
|
||||
});
|
||||
|
||||
if (!data.lifestyle) {
|
||||
return <Skeleton className="mt-10 h-10 w-full" />;
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<HomeLayoutPageHeader
|
||||
title={<Trans i18nKey={'common:lifeStyle.title'} />}
|
||||
description=""
|
||||
/>
|
||||
|
||||
<PageBody>
|
||||
<div className="mt-8">
|
||||
{data.lifestyle.map(({ title, description, score }, index) => (
|
||||
<React.Fragment key={`${index}-${title}`}>
|
||||
<div
|
||||
key={`${index}-${title}`}
|
||||
className="flex items-center gap-2"
|
||||
>
|
||||
<h3>{title}</h3>
|
||||
<Circle
|
||||
className={cn('text-success fill-success size-6', {
|
||||
'text-warning fill-warning': score === 1,
|
||||
'text-destructive fill-destructive': score === 2,
|
||||
})}
|
||||
/>
|
||||
</div>
|
||||
<p className="font-regular py-4">{description}</p>
|
||||
</React.Fragment>
|
||||
))}
|
||||
</div>
|
||||
</PageBody>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
export default withI18n(LifeStylePage);
|
||||
@@ -18,14 +18,14 @@ const AIBlocks = async ({ account }: { account: AccountWithParams }) => {
|
||||
return <OrderAnalysesPackageCard />;
|
||||
}
|
||||
|
||||
const { analyses, countryCode } = await loadAnalyses();
|
||||
const { analyses } = await loadAnalyses();
|
||||
|
||||
if (analyses.length === 0) {
|
||||
return (
|
||||
<>
|
||||
<OrderAnalysesPackageCard />
|
||||
<Suspense fallback={<RecommendationsSkeleton />}>
|
||||
<LifeStyleCard />
|
||||
<Suspense fallback={<RecommendationsSkeleton amount={1} />}>
|
||||
<LifeStyleCard account={account} />
|
||||
</Suspense>
|
||||
</>
|
||||
);
|
||||
@@ -33,7 +33,7 @@ const AIBlocks = async ({ account }: { account: AccountWithParams }) => {
|
||||
|
||||
return (
|
||||
<Suspense fallback={<RecommendationsSkeleton />}>
|
||||
<LifeStyleCard />
|
||||
<LifeStyleCard account={account} />
|
||||
<Recommendations account={account} />
|
||||
</Suspense>
|
||||
);
|
||||
|
||||
@@ -2,16 +2,34 @@
|
||||
|
||||
import React from 'react';
|
||||
|
||||
import { Card } from '@kit/ui/shadcn/card';
|
||||
import Link from 'next/link';
|
||||
|
||||
import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
|
||||
import { pathsConfig } from '@/packages/shared/src/config';
|
||||
import { ChevronRight } from 'lucide-react';
|
||||
|
||||
import { Trans } from '@kit/ui/makerkit/trans';
|
||||
import { Button } from '@kit/ui/shadcn/button';
|
||||
import { Card, CardHeader } from '@kit/ui/shadcn/card';
|
||||
|
||||
import { loadLifeStyle } from '../../_lib/server/load-life-style';
|
||||
|
||||
const LifeStyleCard = async () => {
|
||||
const data = await loadLifeStyle();
|
||||
const LifeStyleCard = async ({ account }: { account: AccountWithParams }) => {
|
||||
const data = await loadLifeStyle(account);
|
||||
|
||||
return (
|
||||
<Card variant="gradient-success" className="flex flex-col justify-between">
|
||||
Test
|
||||
<CardHeader className="flex-row justify-between">
|
||||
<h5>
|
||||
<Trans i18nKey="dashboard:heroCard.lifeStyle.title" />
|
||||
</h5>
|
||||
<Link href={pathsConfig.app.lifeStyle}>
|
||||
<Button size="icon" variant="outline" className="px-2 text-black">
|
||||
<ChevronRight className="size-4 stroke-2" />
|
||||
</Button>
|
||||
</Link>
|
||||
</CardHeader>
|
||||
<span className="text-primary p-4 text-sm">{data.summary}</span>
|
||||
</Card>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -11,7 +11,7 @@ import {
|
||||
} from '@kit/ui/shadcn/card';
|
||||
import { Skeleton } from '@kit/ui/skeleton';
|
||||
|
||||
const RecommendationsSkeleton = () => {
|
||||
const RecommendationsSkeleton = ({ amount = 2 }: { amount?: number }) => {
|
||||
const emptyData = [
|
||||
{
|
||||
title: '1',
|
||||
@@ -20,18 +20,12 @@ const RecommendationsSkeleton = () => {
|
||||
variant: { id: '' },
|
||||
price: 1,
|
||||
},
|
||||
{
|
||||
title: '2',
|
||||
description: '',
|
||||
subtitle: '',
|
||||
variant: { id: '' },
|
||||
price: 1,
|
||||
},
|
||||
];
|
||||
return Array.from({ length: amount }, (_, index) => {
|
||||
const { title, description, subtitle } = emptyData[0]!;
|
||||
|
||||
return (
|
||||
<div className="xs:grid-cols-3 mt-4 grid gap-6">
|
||||
{emptyData.map(({ title, description, subtitle }) => (
|
||||
<Skeleton key={title}>
|
||||
<Skeleton key={title + index}>
|
||||
<Card>
|
||||
<CardHeader className="flex-row">
|
||||
<div
|
||||
@@ -66,9 +60,8 @@ const RecommendationsSkeleton = () => {
|
||||
</CardFooter>
|
||||
</Card>
|
||||
</Skeleton>
|
||||
))}
|
||||
</div>
|
||||
);
|
||||
});
|
||||
};
|
||||
|
||||
export default RecommendationsSkeleton;
|
||||
|
||||
18
app/home/(user)/_components/ai/types.ts
Normal file
18
app/home/(user)/_components/ai/types.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
import { Database } from '@/packages/supabase/src/database.types';
|
||||
|
||||
export interface ILifeStyleResponse {
|
||||
lifestyle: {
|
||||
title: string;
|
||||
description: string;
|
||||
score: 0 | 1 | 2;
|
||||
}[];
|
||||
summary: string | null;
|
||||
}
|
||||
|
||||
export enum PROMPT_NAME {
|
||||
LIFE_STYLE = 'Life Style',
|
||||
ANALYSIS_RECOMMENDATIONS = 'Analysis Recommendations',
|
||||
}
|
||||
|
||||
export type AnalysisResponses =
|
||||
Database['medreport']['Functions']['get_latest_analysis_response_elements_for_current_user']['Returns'];
|
||||
@@ -63,13 +63,12 @@ export default function OrderItemsTable({
|
||||
return (
|
||||
<>
|
||||
<Table className="border-separate rounded-lg border p-2 sm:hidden">
|
||||
<TableBody>
|
||||
{items
|
||||
.sort((a, b) =>
|
||||
(a.created_at ?? '') > (b.created_at ?? '') ? -1 : 1,
|
||||
)
|
||||
.map((orderItem) => (
|
||||
<div key={`${orderItem.id}-mobile`}>
|
||||
<TableBody key={`${orderItem.id}-mobile`}>
|
||||
<MobileTableRow
|
||||
titleKey={title}
|
||||
value={orderItem.product_title || ''}
|
||||
@@ -109,9 +108,8 @@ export default function OrderItemsTable({
|
||||
)}
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
</div>
|
||||
))}
|
||||
</TableBody>
|
||||
))}
|
||||
</Table>
|
||||
|
||||
<Table className="hidden border-separate rounded-lg border sm:block">
|
||||
|
||||
108
app/home/(user)/_lib/server/ai-actions.ts
Normal file
108
app/home/(user)/_lib/server/ai-actions.ts
Normal file
@@ -0,0 +1,108 @@
|
||||
'use server';
|
||||
|
||||
import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
|
||||
import { createUserAnalysesApi } from '@/packages/features/user-analyses/src/server/api';
|
||||
import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
|
||||
import OpenAI from 'openai';
|
||||
|
||||
import PersonalCode from '~/lib/utils';
|
||||
|
||||
import {
|
||||
AnalysisResponses,
|
||||
ILifeStyleResponse,
|
||||
PROMPT_NAME,
|
||||
} from '../../_components/ai/types';
|
||||
|
||||
async function getLatestResponseTime(items: AnalysisResponses) {
|
||||
if (!items?.length) return null;
|
||||
|
||||
let latest = null;
|
||||
for (const it of items) {
|
||||
const d = new Date(it.response_time);
|
||||
const t = d.getTime();
|
||||
if (!Number.isNaN(t) && (latest === null || t > latest.getTime())) {
|
||||
latest = d;
|
||||
}
|
||||
}
|
||||
return latest;
|
||||
}
|
||||
|
||||
export async function updateLifeStyle({
|
||||
account,
|
||||
}: {
|
||||
account: AccountWithParams;
|
||||
}): Promise<ILifeStyleResponse> {
|
||||
const LIFE_STYLE_PROMPT_ID = process.env.PROMPT_ID_LIFE_STYLE;
|
||||
if (!LIFE_STYLE_PROMPT_ID || !account?.personal_code) {
|
||||
return {
|
||||
lifestyle: [],
|
||||
summary: null,
|
||||
};
|
||||
}
|
||||
|
||||
const openAIClient = new OpenAI();
|
||||
const supabaseClient = getSupabaseServerClient();
|
||||
const userAnalysesApi = createUserAnalysesApi(supabaseClient);
|
||||
|
||||
const analysisResponses = await userAnalysesApi.getAllUserAnalysisResponses();
|
||||
const { gender, age } = PersonalCode.parsePersonalCode(account.personal_code);
|
||||
const weight = account.accountParams?.weight || 'unknown';
|
||||
const height = account.accountParams?.height || 'unknown';
|
||||
const isSmoker = !!account.accountParams?.isSmoker;
|
||||
|
||||
const latestResponseTime = await getLatestResponseTime(analysisResponses);
|
||||
const latestISO = latestResponseTime
|
||||
? new Date(latestResponseTime).toISOString()
|
||||
: new Date('2025').toISOString();
|
||||
|
||||
try {
|
||||
const response = await openAIClient.responses.create({
|
||||
store: false,
|
||||
prompt: {
|
||||
id: LIFE_STYLE_PROMPT_ID,
|
||||
variables: {
|
||||
gender: gender.value,
|
||||
age: age.toString(),
|
||||
weight: weight.toString(),
|
||||
height: height.toString(),
|
||||
cholesterol: '',
|
||||
ldl: '',
|
||||
hdl: '',
|
||||
vitamind: '',
|
||||
is_smoker: isSmoker.toString(),
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
await supabaseClient
|
||||
.schema('medreport')
|
||||
.from('ai_responses')
|
||||
.insert({
|
||||
account_id: account.id,
|
||||
prompt_name: PROMPT_NAME.LIFE_STYLE,
|
||||
prompt_id: LIFE_STYLE_PROMPT_ID,
|
||||
input: JSON.stringify({
|
||||
gender: gender.value,
|
||||
age: age.toString(),
|
||||
weight: weight.toString(),
|
||||
cholesterol: '',
|
||||
ldl: '',
|
||||
hdl: '',
|
||||
vitamind: '',
|
||||
is_smoker: isSmoker.toString(),
|
||||
}),
|
||||
latest_data_change: latestISO,
|
||||
response: response.output_text,
|
||||
});
|
||||
|
||||
const json = JSON.parse(response.output_text);
|
||||
|
||||
return json;
|
||||
} catch (error) {
|
||||
console.error('Error calling OpenAI: ', error);
|
||||
return {
|
||||
lifestyle: [],
|
||||
summary: null,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,41 +1,49 @@
|
||||
import { cache } from 'react';
|
||||
|
||||
import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
|
||||
import OpenAI from 'openai';
|
||||
import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
|
||||
|
||||
import PersonalCode from '~/lib/utils';
|
||||
import { ILifeStyleResponse, PROMPT_NAME } from '../../_components/ai/types';
|
||||
import { updateLifeStyle } from './ai-actions';
|
||||
|
||||
const failedResponse = {
|
||||
lifeStyle: null,
|
||||
lifestyle: [],
|
||||
summary: null,
|
||||
};
|
||||
|
||||
async function lifeStyleLoader(account: AccountWithParams) {
|
||||
async function lifeStyleLoader(
|
||||
account: AccountWithParams,
|
||||
): Promise<ILifeStyleResponse> {
|
||||
if (!account?.personal_code) {
|
||||
return failedResponse;
|
||||
}
|
||||
|
||||
const openAIClient = new OpenAI();
|
||||
const { gender, age } = PersonalCode.parsePersonalCode(account.personal_code);
|
||||
try {
|
||||
const response = await openAIClient.responses.create({
|
||||
store: false,
|
||||
prompt: {
|
||||
id: analysesRecommendationsPromptId,
|
||||
variables: {
|
||||
analyses: JSON.stringify(formattedAnalyses),
|
||||
results: JSON.stringify(formattedAnalysisResponses),
|
||||
gender: gender.value,
|
||||
age: age.toString(),
|
||||
weight: weight.toString(),
|
||||
},
|
||||
},
|
||||
});
|
||||
const lifeStylePromptId = process.env.PROMPT_ID_LIFE_STYLE;
|
||||
|
||||
return response;
|
||||
} catch (error) {
|
||||
console.error('Error calling OpenAI: ', error);
|
||||
if (!lifeStylePromptId) {
|
||||
return failedResponse;
|
||||
}
|
||||
|
||||
const supabaseClient = getSupabaseServerClient();
|
||||
const { data, error } = await supabaseClient
|
||||
.schema('medreport')
|
||||
.from('ai_responses')
|
||||
.select('response')
|
||||
.eq('account_id', account.id)
|
||||
.eq('prompt_name', PROMPT_NAME.LIFE_STYLE)
|
||||
.order('latest_data_change', { ascending: false, nullsFirst: false })
|
||||
.limit(1)
|
||||
.maybeSingle();
|
||||
|
||||
if (error) {
|
||||
console.error('Error fetching AI response from DB: ', error);
|
||||
return failedResponse;
|
||||
}
|
||||
|
||||
if (data?.response) {
|
||||
return JSON.parse(data.response as string);
|
||||
} else {
|
||||
return await updateLifeStyle({ account });
|
||||
}
|
||||
}
|
||||
export const loadLifeStyle = cache(lifeStyleLoader);
|
||||
|
||||
@@ -8,6 +8,7 @@ import OpenAI from 'openai';
|
||||
|
||||
import PersonalCode from '~/lib/utils';
|
||||
|
||||
import { PROMPT_NAME } from '../../_components/ai/types';
|
||||
import { OrderAnalysisCard } from '../../_components/order-analyses-cards';
|
||||
|
||||
export const loadRecommendations = cache(recommendationsLoader);
|
||||
@@ -120,7 +121,7 @@ async function recommendationsLoader(
|
||||
.from('ai_responses')
|
||||
.insert({
|
||||
account_id: account.id,
|
||||
prompt_name: 'Analysis Recommendations',
|
||||
prompt_name: PROMPT_NAME.ANALYSIS_RECOMMENDATIONS,
|
||||
prompt_id: analysesRecommendationsPromptId,
|
||||
input: JSON.stringify({
|
||||
analyses: formattedAnalyses,
|
||||
|
||||
@@ -7,6 +7,7 @@ export enum PageViewAction {
|
||||
VIEW_ORDER_ANALYSIS = 'VIEW_ORDER_ANALYSIS',
|
||||
VIEW_TEAM_ACCOUNT_DASHBOARD = 'VIEW_TEAM_ACCOUNT_DASHBOARD',
|
||||
VIEW_TTO_SERVICE_BOOKING = 'VIEW_TTO_SERVICE_BOOKING',
|
||||
VIEW_LIFE_STYLE = 'VIEW_LIFE_STYLE',
|
||||
}
|
||||
|
||||
export const createPageViewLog = async ({
|
||||
|
||||
@@ -40,6 +40,7 @@ const PathsSchema = z.object({
|
||||
completedJobs: z.string().min(1),
|
||||
openJobs: z.string().min(1),
|
||||
analysisDetails: z.string().min(1),
|
||||
lifeStyle: z.string().min(1),
|
||||
}),
|
||||
});
|
||||
|
||||
@@ -83,6 +84,7 @@ const pathsConfig = PathsSchema.parse({
|
||||
completedJobs: '/doctor/completed-jobs',
|
||||
openJobs: '/doctor/open-jobs',
|
||||
analysisDetails: 'doctor/analysis',
|
||||
lifeStyle: '/home/life-style',
|
||||
},
|
||||
} satisfies z.infer<typeof PathsSchema>);
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import {
|
||||
Bike,
|
||||
FileLineChart,
|
||||
HeartPulse,
|
||||
LineChart,
|
||||
@@ -53,6 +54,12 @@ const routes = [
|
||||
Icon: <Stethoscope className={iconClasses} />,
|
||||
end: true,
|
||||
},
|
||||
{
|
||||
label: 'common:routes.lifeStyle',
|
||||
path: pathsConfig.app.lifeStyle,
|
||||
Icon: <Bike className={iconClasses} />,
|
||||
end: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
] satisfies z.infer<typeof NavigationConfigSchema>['routes'];
|
||||
|
||||
@@ -84,7 +84,8 @@
|
||||
"preferences": "Eelistused",
|
||||
"security": "Turvalisus",
|
||||
"admin": "Admin",
|
||||
"accounts": "Kontod"
|
||||
"accounts": "Kontod",
|
||||
"lifeStyle": "Elustiil"
|
||||
},
|
||||
"roles": {
|
||||
"owner": {
|
||||
@@ -150,5 +151,8 @@
|
||||
"no": "Ei",
|
||||
"preferNotToAnswer": "Eelistan mitte vastata",
|
||||
"book": "Broneeri",
|
||||
"change": "Muuda"
|
||||
"change": "Muuda",
|
||||
"lifeStyle": {
|
||||
"title": "Elustiili soovitused"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,9 @@
|
||||
"orderPackage": {
|
||||
"title": "Telli analüüside pakett",
|
||||
"description": "Võrdle erinevate pakettide vahel ja vali endale sobiv"
|
||||
},
|
||||
"lifeStyle": {
|
||||
"title": "Elustiili soovitused"
|
||||
}
|
||||
},
|
||||
"recommendations": {
|
||||
|
||||
Reference in New Issue
Block a user