refactor: Getting rid of commands

Author: unlight

README.md

@@ -27,7 +27,6 @@ For more information on how to this works with other frontends/backends, head ov
 
 ### Architecture notes
 
-- use case it is command in application/feature/commands
 - src/components: reusable ui components
 
 ## Getting started
@@ -46,6 +45,7 @@ npm run dev
 
 ## Todo
 
+- get rid of commands
 - get rid of class-validator (use zod)
 - switch to react location
 - https://realworld-docs.netlify.app/docs/specs/backend-specs/endpoints

package.json

@@ -29,21 +29,21 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.35.0",
-    "react-router-dom": "^6.3.0",
+    "react-router-dom": "^6.4.0",
     "recoil": "^0.7.5",
     "rsts": "^1.0.0"
   },
   "devDependencies": {
     "@kyleshevlin/eslint-plugin": "^1.3.0",
     "@testing-library/react": "^13.4.0",
-    "@types/react": "^18.0.19",
+    "@types/react": "^18.0.20",
     "@types/react-dom": "^18.0.6",
     "@types/react-router-dom": "^5.3.3",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
     "@vitejs/plugin-react-refresh": "^1.3.6",
     "@vitest/coverage-c8": "^0.23.2",
-    "autoprefixer": "^10.4.10",
+    "autoprefixer": "^10.4.11",
     "cssnano": "^5.1.13",
     "cssnano-preset-default": "^5.2.12",
     "eslint": "^8.23.1",

prettier.config.cjs

@@ -1,5 +1,5 @@
 module.exports = {
-  printWidth: 88,
+  printWidth: 80,
   trailingComma: 'all',
   tabWidth: 2,
   semi: true,

src/application/api/user.service.ts

@@ -7,6 +7,7 @@ import type {
 } from '@application/user';
 import ky from 'ky';
 import { inject } from 'njct';
+import { Err, Ok, Result } from 'rsts';
 
 import { AppConfig } from './types';
 
@@ -27,14 +28,26 @@ export class UserService implements IUserService {
     ),
   ) {}
 
-  async register(user: {
+  async register(data: {
     username: string;
     password: string;
     email: string;
-  }): Promise<void> {
+  }): Promise<Result<User>> {
     const url = `${this.config.apiBase}/users`;
-    const result = await this.http.post(url, { json: { user } }).json<{ user: User }>();
-    this.sessionService.update(result.user.token);
+    let user: User;
+
+    try {
+      user = await this.http
+        .post(url, { json: { user: data } })
+        .json<{ user: User }>()
+        .then(r => r.user);
+    } catch (cause) {
+      return Err(new Error('UserRegistration', { cause }));
+    }
+
+    this.sessionService.update(user.token);
+
+    return Ok(user);
   }
 
   isLoggedIn(): boolean {
@@ -49,8 +62,12 @@ export class UserService implements IUserService {
     return result.user;
   }
 
-  async updateCurrentUser(user: UserSettingsInput) {
-    return this.http
+  async updateCurrentUser(data: UserSettingsInput): Promise<Result<User>> {
+    if (!data.password) {
+      delete data.password;
+    }
+    // eslint-disable-next-line sonarjs/prefer-immediate-return
+    const result = await this.http
       .extend(this.authorization())
       .extend({
         hooks: {
@@ -65,9 +82,12 @@ export class UserService implements IUserService {
           ],
         },
       })
-      .put(`${this.config.apiBase}/user`, { json: { user } })
+      .put(`${this.config.apiBase}/user`, { json: { user: data } })
       .json<{ user: User }>()
-      .then(result => result.user);
+      .then(result => Ok(result.user))
+      .catch(cause => Err(new Error('UpdateCurrentUser', { cause })));
+
+    return result;
   }
 
   async getProfile(name: string) {

src/application/profile/index.ts

@@ -1,4 +1,3 @@
 export { FollowUserCommand } from './commands/follow-user.command';
 export { UnfollowUserCommand } from './commands/unfollow-user.command';
 export type { Profile } from './interfaces';
-export { GetProfileHandler } from './queries';

src/application/profile/queries/get-profile.handler.ts

@@ -1,12 +1,13 @@
+import { Result } from 'rsts';
 import { ObjectType } from 'simplytyped';
 
 import { Profile } from '../profile';
 import { User, UserCreateInput, UserSettingsInput } from './models';
 
 export interface UserService {
-  register(data: ObjectType<UserCreateInput>): Promise<void>;
+  register(data: ObjectType<UserCreateInput>): Promise<Result<User>>;
   getCurrentUser(): Promise<User>;
-  updateCurrentUser(data: UserSettingsInput): Promise<User>;
+  updateCurrentUser(data: UserSettingsInput): Promise<Result<User>>;
   getProfile(name: string): Promise<Profile>;
   followUser(username: string): Promise<Profile>;
   unfollowUser(username: string): Promise<Profile>;

src/application/profile/queries/index.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useRecoilValue } from 'recoil';
 
-import { isLoading } from './is-loading.atom';
+import { isLoading } from './isLoading.atom';
 import { Loading } from './Loading';
 
 export function Loader() {

src/application/user/commands/index.ts

@@ -1,3 +1,3 @@
-export { isLoading } from './is-loading.atom';
+export { isLoading } from './isLoading.atom';
 export { Loader } from './Loader';
 export { Loading } from './Loading';

src/application/user/commands/user-register.command.ts

@@ -1,93 +1,9 @@
-import { ArticleList } from '@application';
-import {
-  FollowUserCommand,
-  GetProfileHandler,
-  Profile as ApplicationProfile,
-} from '@application/profile';
-import { UnfollowUserCommand } from '@application/profile/commands/unfollow-user.command';
-import { isLoading } from '@components/Loader';
-import { useRequest } from 'ahooks';
-import React, { useCallback, useEffect, useState } from 'react';
-import { useParams } from 'react-router-dom';
-import { useSetRecoilState } from 'recoil';
-import { Result } from 'rsts';
+import React from 'react';
 
 import { ArticlePreview } from '../article/Article';
+import { useProfile } from './useProfile';
 import { UserInfo } from './UserInfo';
 
-async function fetchProfile(name: string) {
-  const result = await new GetProfileHandler().execute(name);
-  if (result.isErr()) {
-    throw new Error('Fetch profile error');
-  }
-  return result.unwrap();
-}
-
-function useProfile() {
-  const setIsLoading = useSetRecoilState(isLoading);
-  const { username } = useParams() as { username: string };
-  const [serverError, setServerError] = useState('');
-  const [{ profile, articleList, toggleFollowInProgress }, setProfile] = useState<{
-    profile?: ApplicationProfile;
-    articleList?: ArticleList;
-    toggleFollowInProgress: boolean;
-  }>({
-    toggleFollowInProgress: false,
-  });
-
-  const { run } = useRequest(fetchProfile, {
-    manual: true,
-    onBefore: () => {
-      setIsLoading(true);
-    },
-    onSuccess: data => {
-      setProfile({
-        profile: data.profile,
-        articleList: data.articleList,
-        toggleFollowInProgress,
-      });
-    },
-    onError: error => {
-      setServerError(error.message);
-    },
-    onFinally: () => {
-      setIsLoading(false);
-    },
-  });
-
-  useEffect(() => {
-    run(username);
-  }, [run, username]);
-
-  const toggleFollow = useCallback(async () => {
-    const name = profile?.username;
-    if (name) {
-      setProfile({
-        profile,
-        articleList,
-        toggleFollowInProgress: true,
-      });
-
-      let result: Result<ApplicationProfile, Error>;
-      if (profile.following) {
-        const command = new UnfollowUserCommand();
-        result = await command.execute(name);
-      } else {
-        const command = new FollowUserCommand();
-        result = await command.execute(name);
-      }
-
-      setProfile({
-        profile: result.unwrap(),
-        articleList,
-        toggleFollowInProgress: false,
-      });
-    }
-  }, [profile, articleList]);
-
-  return { serverError, profile, articleList, toggleFollow, toggleFollowInProgress };
-}
-
 export function Profile() {
   const { profile, articleList, serverError, toggleFollow, toggleFollowInProgress } =
     useProfile();