frontend/src/hooks.server.ts

@@ -11,8 +11,7 @@ Sentry.init({
 });
 
 export const handle: Handle = sequence(Sentry.sentryHandle(), ({ event, resolve }) => {
-	const container = new Container(event.fetch);
+	event.locals.container ??= new Container(event.fetch);
-	event.locals.container = container;
 
 	return resolve(event);
 });

frontend/src/lib/auth/adapter/presenter/authBloc.ts

@@ -1,11 +1,7 @@
 import { AuthViewModel } from '$lib/auth/adapter/presenter/authViewModel';
 import { UserViewModel } from '$lib/auth/adapter/presenter/userViewModel';
 import type { GetCurrentUserUseCase } from '$lib/auth/application/useCase/getCurrentUserUseCase';
-import {
+import { StateFactory, type AsyncState } from '$lib/common/adapter/presenter/asyncState';
-	StateFactory,
-	StatusType,
-	type AsyncState,
-} from '$lib/common/adapter/presenter/asyncState';
 import { captureException } from '@sentry/sveltekit';
 import { get, writable } from 'svelte/store';
 
@@ -13,9 +9,7 @@ export type AuthState = AsyncState<AuthViewModel>;
 export type AuthEvent = CurrentUserLoadedEvent;
 
 export class AuthBloc {
-	private readonly state = writable<AuthState>({
+	private readonly state = writable<AuthState>(StateFactory.idle());
-		status: StatusType.Idle,
-	});
 
 	constructor(private readonly getCurrentUserUseCase: GetCurrentUserUseCase) {}
 

frontend/src/lib/image/adapter/presenter/imageBloc.ts

@@ -1,8 +1,4 @@
-import {
+import { StateFactory, type AsyncState } from '$lib/common/adapter/presenter/asyncState';
-	StateFactory,
-	StatusType,
-	type AsyncState,
-} from '$lib/common/adapter/presenter/asyncState';
 import { ImageInfoViewModel } from '$lib/image/adapter/presenter/imageInfoViewModel';
 import type { UploadImageUseCase } from '$lib/image/application/useCase/uploadImageUseCase';
 import { captureException } from '@sentry/sveltekit';
@@ -12,9 +8,7 @@ export type ImageInfoState = AsyncState<ImageInfoViewModel>;
 export type ImageEvent = ImageUploadedEvent;
 
 export class ImageBloc {
-	private readonly state = writable<ImageInfoState>({
+	private readonly state = writable<ImageInfoState>(StateFactory.idle());
-		status: StatusType.Idle,
-	});
 
 	constructor(private readonly uploadImageUseCase: UploadImageUseCase) {}
 

frontend/src/lib/post/adapter/presenter/postBloc.ts

@@ -1,8 +1,4 @@
-import {
+import { StateFactory, type AsyncState } from '$lib/common/adapter/presenter/asyncState';
-	StateFactory,
-	StatusType,
-	type AsyncState,
-} from '$lib/common/adapter/presenter/asyncState';
 import { PostViewModel } from '$lib/post/adapter/presenter/postViewModel';
 import type { CreatePostParams } from '$lib/post/application/gateway/postRepository';
 import type { CreatePostUseCase } from '$lib/post/application/useCase/createPostUseCase';
@@ -14,19 +10,14 @@ export type PostState = AsyncState<PostViewModel>;
 export type PostEvent = PostLoadedEvent | PostCreatedEvent;
 
 export class PostBloc {
-	private readonly state = writable<PostState>({
+	private readonly state = writable<PostState>(StateFactory.idle());
-		status: StatusType.Idle,
-	});
 
 	constructor(
 		private readonly getPostUseCase: GetPostUseCase,
 		private readonly createPostUseCase: CreatePostUseCase,
 		initialData?: PostViewModel
 	) {
-		this.state.set({
+		this.state.set(StateFactory.idle(initialData));
-			status: StatusType.Idle,
-			data: initialData,
-		});
 	}
 
 	get subscribe() {