Merge pull request #475 from BinaryStudioAcademy/472-fix-selected-plan-style-enhancement

fix: Selected plan style enhancement cy-472

Author: NazarKovtun1

apps/frontend/src/modules/auth/slices/actions.ts

@@ -5,6 +5,7 @@ import { AppRoute, ErrorMessage } from "~/libs/enums/enums.js";
 import { HTTPError } from "~/libs/modules/http/http.js";
 import { StorageKey } from "~/libs/modules/storage/storage.js";
 import { type AsyncThunkConfig } from "~/libs/types/types.js";
+import { actions as planActions } from "~/modules/plans/plans.js";
 import {
 	type ForgotPasswordRequestDto,
 	type ResetPasswordRequestDto,
@@ -177,11 +178,13 @@ const logout = createAsyncThunk<null, undefined, AsyncThunkConfig>(
 
 		try {
 			await storage.drop(StorageKey.TOKEN);
+			await storage.drop(StorageKey.PLAN_ID);
 		} catch {
 			notifications.error(MESSAGES.AUTH.LOGOUT_FAILED);
 		}
 
 		dispatch(authSliceActions.resetAuthState());
+		dispatch(planActions.resetPlanState());
 
 		return null;
 	},

apps/frontend/src/modules/plans/slices/actions.ts

@@ -1,6 +1,6 @@
 import { createAsyncThunk } from "@reduxjs/toolkit";
 
-import { StorageKey } from "~/libs/modules/storage/storage.js";
+import { storage, StorageKey } from "~/libs/modules/storage/storage.js";
 import { type AsyncThunkConfig } from "~/libs/types/types.js";
 
 import {
@@ -77,7 +77,11 @@ const getPlan = createAsyncThunk<
 >(`${sliceName}/get`, async (_, { extra }) => {
 	const { planApi } = extra;
 
-	const plan = await planApi.getByUserId();
+	const currentPlanId = (await storage.get(StorageKey.PLAN_ID)) as string;
+
+	const plan = currentPlanId
+		? await planApi.findWithRelations(Number.parseInt(currentPlanId))
+		: await planApi.getByUserId();
 
 	return plan;
 });

apps/frontend/src/modules/plans/slices/plan.slice.ts

@@ -2,6 +2,7 @@ import { createSlice, isAnyOf, type PayloadAction } from "@reduxjs/toolkit";
 import { type TaskDto } from "shared";
 
 import { DataStatus, PlanStyle } from "~/libs/enums/enums.js";
+import { storage, StorageKey } from "~/libs/modules/storage/storage.js";
 import { type PlanStyleOption, type ValueOf } from "~/libs/types/types.js";
 
 import { type PlanWithCategoryDto } from "../libs/types/types.js";
@@ -166,8 +167,19 @@ const { actions, name, reducer } = createSlice({
 				].tasks.filter((task) => task.id !== taskId);
 			}
 		},
+		resetPlanState: (state) => {
+			state.dataStatus = initialState.dataStatus;
+			state.days = initialState.days;
+			state.pendingDayRegenerations = initialState.pendingDayRegenerations;
+			state.pendingTaskRegenerations = initialState.pendingTaskRegenerations;
+			state.plan = initialState.plan;
+			state.selectedStyle = initialState.selectedStyle;
+			state.userPlans = initialState.userPlans;
+			state.userPlansDataStatus = initialState.userPlansDataStatus;
+		},
 		setCurrentPlan: (state, action: PayloadAction<PlanWithCategoryDto>) => {
 			state.plan = action.payload;
+			void storage.set(StorageKey.PLAN_ID, action.payload.id.toString());
 		},
 		setSelectedStyle: (state, action: PayloadAction<PlanStyleOption>) => {
 			state.selectedStyle = action.payload;