Merge pull request #24 from LexaFrontDev/dev

LexaFrontDev · web-flow · commit 398e6079b45a · 2025-09-30T13:39:10.000+05:00
Dev
diff --git a/.env b/.env
@@ -1,8 +1,10 @@
 APP_ENV=dev
-APP_SECRET=25aeff0645dafb0ce3dc54218fd03bed
+APP_SECRET=
 
 DATABASE_URL="pgsql://TimerAppUser:user123@db:5432/TimerAppDatabase?serverVersion=13&charset=utf8"
-
+API_KEY=
+AI_MODEL=
+AI_URL=
 
 
 MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
@@ -22,9 +24,19 @@ JWT_PUBLIC_KEY_PATH=%kernel.project_dir%/config/jwt/public.pem
 JWT_PASSPHRASE=
 ###< lexik/jwt-authentication-bundle ###
 
-VITE_CACHE_DB_NAME=HabitAiCacheDev
-VITE_CACHE_STORE_NAME=cache
-VITE_GOOGLE_CLIENT_ID=643971601411-
+VITE_CACHE_DB_NAME=
+VITE_CACHE_STORE_NAME=
+VITE_GOOGLE_CLIENT_ID=
 VITE_GOOGLE_REDIRECT_URI=
 VITE_PUSH_PUBLIC_KEY=
 VITE_PUSH_PRIVATE_KEY=
+
+MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
+
+MAILER_DSN=null://null
+
+MERCURE_URL=https://example.com/.well-known/mercure
+
+MERCURE_PUBLIC_URL=https://example.com/.well-known/mercure
+
+MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ package-lock.json
 /public/bundles/
 /var/
 /vendor/
+/ignorefiles
 ###< symfony/framework-bundle ###
 
 ###> phpunit/phpunit ###
diff --git a/assets/app.js b/assets/app.js
@@ -7,4 +7,4 @@ import './bootstrap.js';
  */
 import './styles/app.scss';
 
-console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');
+
diff --git a/assets/react/Router.tsx b/assets/react/Router.tsx
@@ -41,12 +41,10 @@ const RouterDom = () => {
             try {
                 const res = await fetch('/api/auth/check');
                 const data = await res.json();
-                console.log(data);
                 const ok = res.ok;
                 setIsAuthenticated(ok);
 
                 if(ok){
-                    console.log('Зов пениса');
                     subscribePush();
                 }
 
@@ -83,7 +81,6 @@ const RouterDom = () => {
 
 
     const getPlatform = () => {
-        console.log('Дошли')
         const ua = navigator.userAgent;
 
         let os = 'Unknown OS';
@@ -100,7 +97,6 @@ const RouterDom = () => {
         else if (/Safari/.test(ua) && !/Chrome/.test(ua)) browser = 'Safari';
         else if (/Edg/.test(ua)) browser = 'Edge';
         else if (/OPR/.test(ua)) browser = 'Opera';
-        console.log('тоже')
         return `${browser}_${os}`;
     };
 
@@ -121,9 +117,7 @@ const RouterDom = () => {
                     return;
                 }
             }
-            console.log('Service Worker зарегистрирован:');
             const registration = await navigator.serviceWorker.register('/serviceWorker/ServiceWorker.js');
-            console.log('Service Worker зарегистрирован:', registration);
 
             const subscription = await registration.pushManager.subscribe({
                 userVisibleOnly: true,
@@ -136,7 +130,7 @@ const RouterDom = () => {
                 keys: subscription.toJSON().keys
             };
 
-            console.log('Отправляем данные подписки:', pushData);
+
 
             await fetch('/api/save/subscription/web', {
                 method: 'POST',
diff --git a/assets/react/Services/Ctn/RequestServices.tsx b/assets/react/Services/Ctn/RequestServices.tsx
@@ -24,14 +24,29 @@ export class RequestServices {
         return response.json() as Promise<R>;
     }
 
-    async get<R>(fetchUrl: string, method: string = "GET", body?: any, accessMassiveKey?: string): Promise<R[] | R | false> {
+    async get<R>(fetchUrl: string, method: string = "GET", body?: any): Promise<R | false> {
+        try {
+            const data = await this._request<R>(fetchUrl, method, method !== "GET" ? body : undefined);
+            return data;
+        } catch (e) {
+            await this.logError("Ошибка GET-запроса", { fetchUrl, error: e });
+            return false;
+        }
+    }
+
+    async getArray<R>(fetchUrl: string, method: string = "GET", body?: any, accessMassiveKey?: string): Promise<R[] | false> {
         try {
             let data = await this._request<R | R[]>(fetchUrl, method, method !== "GET" ? body : undefined);
 
             if (accessMassiveKey && typeof data === "object" && !Array.isArray(data)) {
                 data = (data as any)[accessMassiveKey];
             }
 
+            if (!Array.isArray(data)) {
+                if (data == null) return [];
+                return [data as R];
+            }
+
             return data;
         } catch (e) {
             await this.logError("Ошибка GET-запроса", { fetchUrl, error: e });
diff --git a/assets/react/Services/Habits/HabitsPageLogic.tsx b/assets/react/Services/Habits/HabitsPageLogic.tsx
@@ -44,7 +44,7 @@ export const useHabitsLogic = (habitsService: HabitsService) => {
             return setHabits([]);
         }
         setIsLoading(false);
-        setHabits(result || []);
+        setHabits(result);
     };
 
     const fetchHabitsStatistic = async () => {
@@ -56,7 +56,6 @@ export const useHabitsLogic = (habitsService: HabitsService) => {
         }
 
 
-        console.log(statistic)
         setIsLoading(false);
         setHabitsStatistic(statistic || [])
     }
@@ -71,7 +70,7 @@ export const useHabitsLogic = (habitsService: HabitsService) => {
         }
 
         setIsLoading(false);
-        setTemplates(templates || [])
+        setTemplates(templates)
     }
 
     const saveHabitProgress = async (habitId: number, countProgress: number) => {
diff --git a/assets/react/Services/Habits/HabitsService.tsx b/assets/react/Services/Habits/HabitsService.tsx
@@ -44,12 +44,12 @@ export class HabitsService {
     }
 
 
-    async getHabitsAll(limit: number = 50, offset: number = 0): Promise<DataType[] | false | DataType> {
-        return await this.reqService.get<DataType>(`habits`, `/api/get/Habits/all?limit=${limit}&offset=${offset}`, 'GET');
+    async getHabitsAll(limit: number = 50, offset: number = 0): Promise<DataType[] | false> {
+        return await this.reqService.getArray<DataType>(`habits`, `/api/get/Habits/all?limit=${limit}&offset=${offset}`, 'GET');
     }
 
-    async getHabitsTemplatesAll():  Promise<HabitTemplate[] | false | HabitTemplate>{
-        return await this.reqService.get<HabitTemplate>(`habits_templates`, `/api/Habits/templates/all`, 'GET');
+    async getHabitsTemplatesAll():  Promise<HabitTemplate[] | false>{
+        return await this.reqService.getArray<HabitTemplate>(`habits_templates`, `/api/Habits/templates/all`, 'GET');
     }
 
     async getHabitsStatisticAll():  Promise<any | false>{
diff --git a/assets/react/Services/Pomodoro/PomodoroTimer.tsx b/assets/react/Services/Pomodoro/PomodoroTimer.tsx
@@ -105,7 +105,7 @@ export const usePomodoroTimer = (PomodoroUseCase: PomodoroService) => {
                 timeEnd: Math.floor(Date.now() / 1000),
                 created_date: Math.floor(Date.now() / 1000),
             };
-            console.log(pomodoroData);
+
             await PomodoroUseCase.createPomodro(pomodoroData);
         }
 
diff --git a/assets/react/Services/Tasks/TasksService.tsx b/assets/react/Services/Tasks/TasksService.tsx
@@ -27,7 +27,6 @@ export class TasksService {
             '/api/list/tasks/all',
             'GET',
             undefined,
-            'result'
         );
 
         return response;
diff --git a/assets/react/pages/Pomodor/PomodoroPage.tsx b/assets/react/pages/Pomodor/PomodoroPage.tsx
@@ -30,7 +30,15 @@ const langUseCase = new LangStorageUseCase(langStorage);
 
 
 const Pomodoro = () => {
-    const [dataPomodoro, setDataPomodoro] = useState<PomodoroData | null>(null);
+    const [dataPomodoro, setDataPomodoro] = useState<PomodoroData>({
+        todayPomos: 0,
+        todayFocusTime: 0,
+        totalPomodorCount: 0,
+        habitsList: [],
+        tasksList: [],
+        pomodorHistory: [],
+    });
+
     const [activeTab, setActiveTab] = useState('Pomodoro');
     const [langCode, setLangCode] = useState('en');
     const { t, i18n } = useTranslation('translation');
@@ -97,7 +105,7 @@ const Pomodoro = () => {
     };
 
 
-    if (!translationsLoaded || !dataPomodoro) return <Loading />;
+    if (!translationsLoaded) return <Loading />;
 
 
     const { todayPomos, todayFocusTime, totalPomodorCount, habitsList, tasksList, pomodorHistory } = dataPomodoro;
diff --git a/assets/react/pages/Tasks/TasksPage.tsx b/assets/react/pages/Tasks/TasksPage.tsx
@@ -142,7 +142,6 @@ const TasksPage: React.FC = () => {
                 setLoading(true);
                 const allTasksResult = await tasksService.getTasksAll();
                 setAllTasks(Array.isArray(allTasksResult) ? allTasksResult : []);
-                console.log(allTasks)
             } catch (err: any) {
                 setError(err.message);
                 setAllTasks([]);
diff --git a/assets/react/pages/chunk/Habits/HabitsModal.tsx b/assets/react/pages/chunk/Habits/HabitsModal.tsx
@@ -64,8 +64,6 @@ const HabitModal: React.FC<HabitModalProps> = ({habitTemplates, onClose, onEdit,
 
     useEffect(() => {
         if (edit && editData) {
-            console.log('То что содержить edit data')
-            console.log(editData);
             const notificationRaw = editData.notification_date || '';
             const timeOnly = notificationRaw.length >= 5 ? notificationRaw.substring(0, 5) : '';
 
@@ -87,7 +85,6 @@ const HabitModal: React.FC<HabitModalProps> = ({habitTemplates, onClose, onEdit,
                 purposeCount: editData.count,
                 date: editData.date
             });
-            console.log(data);
             setStep(2);
         }
     }, [edit, editData]);
@@ -237,7 +234,6 @@ const HabitModal: React.FC<HabitModalProps> = ({habitTemplates, onClose, onEdit,
         if (!validateStep(step) || !editData?.habit_id) return;
 
         const payload: EditDataType = {
-            cacheId: data.cacheId,
             habitId: editData.habit_id,
             title: data.title,
             quote: data.quote,
diff --git a/assets/react/ui/props/Habits/PomodoroData.tsx b/assets/react/ui/props/Habits/PomodoroData.tsx
@@ -1,5 +1,4 @@
 export type PomodoroData = {
-    cacheId: number;
     todayPomos: number;
     todayFocusTime: number;
     totalPomodorCount: number;
diff --git a/composer.json b/composer.json
@@ -106,7 +106,7 @@
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-doctrine": "^2.0",
         "phpstan/phpstan-symfony": "*",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10",
         "symfony/browser-kit": "6.4.*",
         "symfony/css-selector": "6.4.*",
         "symfony/debug-bundle": "6.4.*",
diff --git a/config/bundles.php b/config/bundles.php
@@ -17,4 +17,4 @@
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     Gesdinet\JWTRefreshTokenBundle\GesdinetJWTRefreshTokenBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
-];
+];
diff --git a/config/services.yaml b/config/services.yaml
@@ -28,3 +28,10 @@ services:
     App\Infrastructure\Service\FilterCriteriaApply\FilterApplicator\ApplyFilter:
         arguments:
             $criterionAppliers: !tagged_iterator app.criterion_applier
+
+    App\Infrastructure\Service\AiService\AiIntegration:
+        arguments:
+            $apiKey: '%env(API_KEY)%'
+            $headerName: '%env(AI_MODEL)%'
+            $aiUrl: '%env(AI_URL)%'
+
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -26,7 +26,7 @@ services:
     environment:
       XDEBUG_MODE: "${XDEBUG_MODE:-off}"
       TEST_DATABASE_URL: pgsql://TimerAppUser:user123@db:5432/TimerAppDatabase?serverVersion=13&charset=utf8
-      TEST_ELASTICSEARCH_INDEX_PREFIX: test_questionnaire_
+      TEST_ELASTICSEARCH_INDEX_PREFIX: test_timer_app_
     extra_hosts:
       - host.docker.internal:host-gateway
   db:
@@ -35,7 +35,7 @@ services:
   db_test:
     image: postgres:13
     ports:
-      - '11009:5432'
+      - '11010:5432'
     container_name: timer_app_pgsql_test
     restart: unless-stopped
     environment:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -39,5 +39,9 @@
     </listeners>
 
     <extensions>
+        <bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension">
+            <parameter name="clock-mock-namespaces" value="App" />
+            <parameter name="dns-mock-namespaces" value="App" />
+        </bootstrap>
     </extensions>
 </phpunit>
diff --git a/public/serviceWorker/ServiceWorker.js b/public/serviceWorker/ServiceWorker.js
@@ -1,10 +1,8 @@
 self.addEventListener('install', (event) => {
-    console.log('Service Worker установлен');
     event.waitUntil(self.skipWaiting());
 });
 
 self.addEventListener('activate', (event) => {
-    console.log('Service Worker активирован');
     event.waitUntil(self.clients.claim());
 });
 
diff --git a/src/Domain/Service/AiService/AiInterface.php b/src/Domain/Service/AiService/AiInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Domain\Service\AiService;
+
+interface AiInterface
+{
+    /**
+     * @return array<string, mixed> Возвращает декодированный JSON как массив
+     */
+    public function integration(string $prompt): array;
+
+    public function generateText(string $prompt): string;
+}
diff --git a/src/Infrastructure/Service/AiService/AiIntegration.php b/src/Infrastructure/Service/AiService/AiIntegration.php
diff --git a/templates/base.html.twig b/templates/base.html.twig
diff --git a/tests/Service/IntegrationTest/AiIntergrationTest.php b/tests/Service/IntegrationTest/AiIntergrationTest.php

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export const useHabitsLogic = (habitsService: HabitsService) => {`
`44`	`44`	`return setHabits([]);`
`45`	`45`	`}`
`46`	`46`	`setIsLoading(false);`
`47`		`- setHabits(result \|\| []);`
	`47`	`+ setHabits(result);`
`48`	`48`	`};`
`49`	`49`
`50`	`50`	`const fetchHabitsStatistic = async () => {`
`@@ -56,7 +56,6 @@ export const useHabitsLogic = (habitsService: HabitsService) => {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`
`59`		`- console.log(statistic)`
`60`	`59`	`setIsLoading(false);`
`61`	`60`	`setHabitsStatistic(statistic \|\| [])`
`62`	`61`	`}`
`@@ -71,7 +70,7 @@ export const useHabitsLogic = (habitsService: HabitsService) => {`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`setIsLoading(false);`
`74`		`- setTemplates(templates \|\| [])`
	`73`	`+ setTemplates(templates)`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`const saveHabitProgress = async (habitId: number, countProgress: number) => {`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ export class HabitsService {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`
`47`		`- async getHabitsAll(limit: number = 50, offset: number = 0): Promise<DataType[] \| false \| DataType> {`
`48`		- return await this.reqService.get<DataType>(`habits`, `/api/get/Habits/all?limit=${limit}&offset=${offset}`, 'GET');
	`47`	`+ async getHabitsAll(limit: number = 50, offset: number = 0): Promise<DataType[] \| false> {`
	`48`	+ return await this.reqService.getArray<DataType>(`habits`, `/api/get/Habits/all?limit=${limit}&offset=${offset}`, 'GET');
`49`	`49`	`}`
`50`	`50`
`51`		`- async getHabitsTemplatesAll(): Promise<HabitTemplate[] \| false \| HabitTemplate>{`
`52`		- return await this.reqService.get<HabitTemplate>(`habits_templates`, `/api/Habits/templates/all`, 'GET');
	`51`	`+ async getHabitsTemplatesAll(): Promise<HabitTemplate[] \| false>{`
	`52`	+ return await this.reqService.getArray<HabitTemplate>(`habits_templates`, `/api/Habits/templates/all`, 'GET');
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`async getHabitsStatisticAll(): Promise<any \| false>{`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ export const usePomodoroTimer = (PomodoroUseCase: PomodoroService) => {`
`105`	`105`	`timeEnd: Math.floor(Date.now() / 1000),`
`106`	`106`	`created_date: Math.floor(Date.now() / 1000),`
`107`	`107`	`};`
`108`		`- console.log(pomodoroData);`
	`108`	`+`
`109`	`109`	`await PomodoroUseCase.createPomodro(pomodoroData);`
`110`	`110`	`}`
`111`	`111`