modify color and background image in desktop version

check if the accounts, categories, and tags used exist when creating a transaction template
code refactor
2025-08-31 00:20:17 +08:00 · 2025-08-30 01:22:40 +08:00 · 2025-08-30 00:40:33 +08:00 · 2025-08-30 00:07:43 +08:00 · 2025-08-29 00:53:23 +08:00 · 2025-08-29 00:43:34 +08:00
849 changed files with 143036 additions and 43638 deletions
@@ -1,13 +0,0 @@
-module.exports = {
-    'root': true,
-    'env': {
-        'node': true
-    },
-    'extends': [
-        'eslint:recommended',
-        'plugin:vue/vue3-essential'
-    ],
-    'rules': {
-        'vue/no-use-v-if-with-v-for': 'off'
-    }
-}
@@ -0,0 +1,17 @@
+name: Deploy Docker Image
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Execute custom script
+        run: |
+          cat >> deploy.sh <<EOF
+          #!/bin/sh
+          ${{ vars.CUSTOM_DEPLOY_SCRIPTS }}
+          EOF
+          chmod +x deploy.sh
+          ./deploy.sh
@@ -10,11 +10,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ secrets.DOCKER_REPO }}/mayswind/ezbookkeeping
@@ -24,10 +24,12 @@ jobs:
            type=raw,value=latest

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:qemu-v8.1.5

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      - name: Set up the environment
        run: |
@@ -44,7 +46,7 @@ jobs:
          chmod +x docker/custom-frontend-pre-setup.sh

      - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          file: Dockerfile
          context: .
@@ -52,5 +54,8 @@ jobs:
          push: true
          build-args: |
            RELEASE_BUILD=1
+            BUILD_PIPELINE=1
+            CHECK_3RD_API=${{ vars.CHECK_3RD_API }}
+            SKIP_TESTS=${{ vars.SKIP_TESTS }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -10,11 +10,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ secrets.DOCKER_REPO }}/mayswind/ezbookkeeping
@@ -24,10 +24,12 @@ jobs:
            type=sha,format=short,prefix=SNAPSHOT-

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:qemu-v8.1.5

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      - name: Set up the environment
        run: |
@@ -44,11 +46,15 @@ jobs:
          chmod +x docker/custom-frontend-pre-setup.sh

      - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          file: Dockerfile
          context: .
          platforms: ${{ vars.BUILD_SNAPSHOT_PLATFORMS }}
          push: true
+          build-args: |
+            BUILD_PIPELINE=1
+            CHECK_3RD_API=${{ vars.CHECK_3RD_API }}
+            SKIP_TESTS=${{ vars.SKIP_TESTS }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -10,11 +10,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ secrets.DOCKER_USERNAME }}/ezbookkeeping
@@ -24,19 +24,21 @@ jobs:
            type=raw,value=latest

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:qemu-v8.1.5

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          file: Dockerfile
          context: .
@@ -48,5 +50,8 @@ jobs:
          push: true
          build-args: |
            RELEASE_BUILD=1
+            BUILD_PIPELINE=1
+            CHECK_3RD_API=${{ vars.CHECK_3RD_API }}
+            SKIP_TESTS=${{ vars.SKIP_TESTS }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -10,11 +10,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
        with:
          images: |
            ${{ secrets.DOCKER_USERNAME }}/ezbookkeeping
@@ -23,19 +23,21 @@ jobs:
            type=raw,value=latest-snapshot

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:qemu-v8.1.5

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3

      - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

      - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
        with:
          file: Dockerfile
          context: .
@@ -45,5 +47,9 @@ jobs:
            linux/arm/v7
            linux/arm/v6
          push: true
+          build-args: |
+            BUILD_PIPELINE=1
+            CHECK_3RD_API=${{ vars.CHECK_3RD_API }}
+            SKIP_TESTS=${{ vars.SKIP_TESTS }}
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
@@ -11,18 +11,22 @@ jobs:
    steps:
      -
        name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
      -
        name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      -
        name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
        with:
          file: Dockerfile
          context: .
          platforms: linux/amd64
          push: false
+          build-args: |
+            BUILD_PIPELINE=1
+            CHECK_3RD_API=${{ vars.CHECK_3RD_API }}
+            SKIP_TESTS=${{ vars.SKIP_TESTS }}
@@ -144,3 +144,6 @@ dist/
 # Visual Studio Code
 .vscode/
 *.code-workspace
+
+# Roo Code
+.roo/
@@ -1,7 +1,13 @@
 # Build backend binary file
-FROM golang:1.21.12-alpine3.20 AS be-builder
+FROM golang:1.24.5-alpine3.22 AS be-builder
 ARG RELEASE_BUILD
+ARG BUILD_PIPELINE
+ARG CHECK_3RD_API
+ARG SKIP_TESTS
 ENV RELEASE_BUILD=$RELEASE_BUILD
+ENV BUILD_PIPELINE=$BUILD_PIPELINE
+ENV CHECK_3RD_API=$CHECK_3RD_API
+ENV SKIP_TESTS=$SKIP_TESTS
 WORKDIR /go/src/github.com/mayswind/ezbookkeeping
 COPY . .
 RUN docker/backend-build-pre-setup.sh
@@ -9,9 +15,11 @@ RUN apk add git gcc g++ libc-dev
 RUN ./build.sh backend

 # Build frontend files
-FROM --platform=$BUILDPLATFORM node:18.20.3-alpine3.20 AS fe-builder
+FROM --platform=$BUILDPLATFORM node:22.18.0-alpine3.22 AS fe-builder
 ARG RELEASE_BUILD
+ARG BUILD_PIPELINE
 ENV RELEASE_BUILD=$RELEASE_BUILD
+ENV BUILD_PIPELINE=$BUILD_PIPELINE
 WORKDIR /go/src/github.com/mayswind/ezbookkeeping
 COPY . .
 RUN docker/frontend-build-pre-setup.sh
@@ -19,7 +27,7 @@ RUN apk add git
 RUN ./build.sh frontend

 # Package docker image
-FROM alpine:3.20.1
+FROM alpine:3.22.1
 LABEL maintainer="MaysWind <i@mayswind.net>"
 RUN addgroup -S -g 1000 ezbookkeeping && adduser -S -G ezbookkeeping -u 1000 ezbookkeeping
 RUN apk --no-cache add tzdata
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2024 MaysWind (i@mayswind.net)
+Copyright (c) 2020-2025 MaysWind (i@mayswind.net)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -2,36 +2,52 @@
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/mayswind/ezbookkeeping/blob/master/LICENSE)
 [![Latest Build](https://img.shields.io/github/actions/workflow/status/mayswind/ezbookkeeping/docker-snapshot.yml?branch=main)](https://github.com/mayswind/ezbookkeeping/actions)
 [![Go Report](https://goreportcard.com/badge/github.com/mayswind/ezbookkeeping)](https://goreportcard.com/report/github.com/mayswind/ezbookkeeping)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/mayswind/ezbookkeeping)
 [![Latest Docker Image Size](https://img.shields.io/docker/image-size/mayswind/ezbookkeeping.svg?style=flat)](https://hub.docker.com/r/mayswind/ezbookkeeping)
 [![Latest Release](https://img.shields.io/github/release/mayswind/ezbookkeeping.svg?style=flat)](https://github.com/mayswind/ezbookkeeping/releases)

-## Introduction
-ezBookkeeping is a lightweight personal bookkeeping app hosted by yourself. It can be deployed on almost all platforms, including Windows, macOS and Linux on x86, amd64 and ARM architectures. You can even deploy it on an raspberry device. It also supports many different databases, including sqlite and mysql. With docker, you can just deploy it via one command without complicated configuration.
+[![Recommend By HelloGitHub](https://api.hellogithub.com/v1/widgets/recommend.svg?rid=ded5af09da574ec1811ddb154f1b2093&claim_uid=LT7EZxeBukCnh0K)](https://hellogithub.com/en/repository/mayswind/ezbookkeeping)

-Online Demo: [https://ezbookkeeping-demo.mayswind.net](https://ezbookkeeping-demo.mayswind.net)
+## Introduction
+ezBookkeeping is a lightweight, self-hosted personal finance app with a user-friendly interface and powerful bookkeeping features. It's easy to deploy, and you can start it with just one single Docker command. Designed to be resource-efficient and highly scalable, it can run smoothly on devices as small as a Raspberry Pi, or scale up to NAS, MicroServers, and even large cluster environments.
+
+ezBookkeeping offers tailored interfaces for both mobile and desktop devices. With support for PWA (Progressive Web Apps), you can even [add it to your mobile home screen](https://raw.githubusercontent.com/wiki/mayswind/ezbookkeeping/img/mobile/add_to_home_screen.gif) and use it like a native app.
+
+Live Demo: [https://ezbookkeeping-demo.mayswind.net](https://ezbookkeeping-demo.mayswind.net)

 ## Features
-1. Open source & Self-hosted
-2. Lightweight & Fast
-3. Easy to install
-    * Docker support
-    * Multiple database support (SQLite, MySQL, PostgreSQL, etc.)
-    * Multiple operation system & hardware support (Windows, macOS, Linux & x86, amd64, ARM)
-4. User-friendly interface
-    * Both desktop and mobile UI
-    * Close to native app experience (for mobile device)
-    * Two-level account & two-level category support
-    * Plentiful preset categories
-    * Geographic location and map support
-    * Searching & filtering history records
-    * Data statistics
-    * Dark theme
-5. Multiple currency support & automatically updating exchange rates
-6. Multiple timezone support
-7. Multi-language support
-8. Two-factor authentication
-9. Application lock (PIN code / WebAuthn)
-10. Data export
+- **Open Source & Self-Hosted**
+    - Built for privacy and control
+- **Lightweight & Fast**
+    - Optimized for performance, runs smoothly even on low-resource environments
+- **Easy Installation**
+    - Docker-ready
+    - Supports SQLite, MySQL, PostgreSQL
+    - Cross-platform (Windows, macOS, Linux)
+    - Works on x86, amd64, ARM architectures
+- **User-Friendly Interface**
+    - UI optimized for both mobile and desktop
+    - PWA support for native-like mobile experience
+    - Dark mode
+- **AI-Powered Features**
+    - Supports MCP (Model Context Protocol) for AI integration
+- **Powerful Bookkeeping**
+    - Two-level accounts and categories
+    - Attach images to transactions
+    - Location tracking with maps
+    - Recurring transactions
+    - Advanced filtering, search, visualization, and analysis
+- **Localization & Globalization**
+    - Multi-language and multi-currency support
+    - Automatic exchange rates
+    - Multi-timezone awareness
+    - Custom formats for dates, numbers, and currencies
+- **Security**
+    - Two-factor authentication (2FA)
+    - Login rate limiting
+    - Application lock (PIN code / WebAuthn)
+- **Data Import/Export**
+    - Supports CSV, OFX, QFX, QIF, IIF, Camt.053, MT940, GnuCash, Firefly III, Beancount, and more

 ## Screenshots
 ### Desktop Version
@@ -41,19 +57,19 @@ Online Demo: [https://ezbookkeeping-demo.mayswind.net](https://ezbookkeeping-dem
 [![ezBookkeeping](https://raw.githubusercontent.com/wiki/mayswind/ezbookkeeping/img/mobile/en.png)](https://raw.githubusercontent.com/wiki/mayswind/ezbookkeeping/img/mobile/en.png)

 ## Installation
-### Ship with docker
+### Run with Docker
 Visit [Docker Hub](https://hub.docker.com/r/mayswind/ezbookkeeping) to see all images and tags.

-Latest Release:
+**Latest Release:**

    $ docker run -p8080:8080 mayswind/ezbookkeeping

-Latest Daily Build:
+**Latest Daily Build:**

    $ docker run -p8080:8080 mayswind/ezbookkeeping:latest-snapshot

-### Install from binary
-Latest release: [https://github.com/mayswind/ezbookkeeping/releases](https://github.com/mayswind/ezbookkeeping/releases)
+### Install from Binary
+Download the latest release: [https://github.com/mayswind/ezbookkeeping/releases](https://github.com/mayswind/ezbookkeeping/releases)

 **Linux / macOS**

@@ -63,9 +79,9 @@ Latest release: [https://github.com/mayswind/ezbookkeeping/releases](https://git

    > .\ezbookkeeping.exe server run

-ezBookkeeping will listen at port 8080 as default. Then you can visit `http://{YOUR_HOST_ADDRESS}:8080/` .
+By default, ezBookkeeping listens on port 8080. You can then visit `http://{YOUR_HOST_ADDRESS}:8080/` .

-### Build from source
+### Build from Source
 Make sure you have [Golang](https://golang.org/), [GCC](http://gcc.gnu.org/), [Node.js](https://nodejs.org/) and [NPM](https://www.npmjs.com/) installed. Then download the source code, and follow these steps:

 **Linux / macOS**
@@ -80,15 +96,48 @@ All the files will be packaged in `ezbookkeeping.tar.gz`.

 All the files will be packaged in `ezbookkeeping.zip`.

-You can also build docker image, make sure you have [docker](https://www.docker.com/) installed, then follow these steps:
+You can also build a Docker image. Make sure you have [Docker](https://www.docker.com/) installed, then follow these steps:

 **Linux**

    $ ./build.sh docker

-## Documents
+## Contributing
+We welcome contributions of all kinds.
+
+Found a bug? [Submit an issue](https://github.com/mayswind/ezbookkeeping/issues)
+
+Want to contribute code? Feel free to fork and send a pull request.
+
+Contributions of all kinds — bug reports, feature suggestions, documentation improvements, or code — are highly appreciated.
+
+Check out our [Contributor Graph](https://github.com/mayswind/ezbookkeeping/graphs/contributors) to see the amazing people who’ve already helped.
+
+## Translating
+Help make ezBookkeeping accessible to users around the world. If you want to contribute a translation, please refer to our [translation guide](https://ezbookkeeping.mayswind.net/translating).
+
+Currently available translations:
+
+| Tag | Language | Contributors |
+| --- | --- | --- |
+| de | Deutsch | [@chrgm](https://github.com/chrgm) |
+| en | English | / |
+| es | Español | [@Miguelonlonlon](https://github.com/Miguelonlonlon) |
+| it | Italiano | [@waron97](https://github.com/waron97) |
+| ja | 日本語 | [@tkymmm](https://github.com/tkymmm) |
+| nl | Nederlands | [@automagic](https://github.com/automagics) |
+| pt-BR | Português (Brasil) | [@thecodergus](https://github.com/thecodergus) |
+| ru | Русский | [@artegoser](https://github.com/artegoser) |
+| uk | Українська | [@nktlitvinenko](https://github.com/nktlitvinenko) |
+| vi | Tiếng Việt | [@f97](https://github.com/f97) |
+| zh-Hans | 中文 (简体) | / |
+| zh-Hant | 中文 (繁體) | / |
+
+Don't see your language? Help us add it.
+
+## Documentation
 1. [English](http://ezbookkeeping.mayswind.net)
-1. [简体中文 (Simplified Chinese)](http://ezbookkeeping.mayswind.net/zh_Hans)
+1. [中文 (简体)](http://ezbookkeeping.mayswind.net/zh_Hans)

 ## License
 [MIT](https://github.com/mayswind/ezbookkeeping/blob/master/LICENSE)
@@ -3,6 +3,7 @@
 set "TYPE="
 set "NO_LINT=0"
 set "NO_TEST=0"
+set "SKIP_TESTS=%SKIP_TESTS%"
 set "RELEASE=%RELEASE_BUILD%"
 set "RELEASE_TYPE=unknown"
 set "VERSION="
@@ -56,7 +57,7 @@ goto :pre_parse_args
    echo     /r, --release           Build release (The script will use environment variable "RELEASE_BUILD" to detect whether this is release building by default)
    echo     /o, --output ^<filename^> Package file name (For "package" type only)
    echo     --no-lint               Do not execute lint check before building
-    echo     --no-test               Do not execute unit testing before building
+    echo     --no-test               Do not execute unit testing before building (You can use environment variable "SKIP_TESTS" to skip specified tests)
    echo     /h, --help              Show help
    goto :eof

@@ -111,7 +112,7 @@ goto :pre_parse_args
    set VERSION=%VERSION: =%
    set VERSION=%VERSION:,=%
    set VERSION=%VERSION:"=%
-    for /f %%x in ('git rev-parse --short HEAD') do set "COMMIT_HASH=%%x"
+    for /f %%x in ('git rev-parse --short^=7 HEAD') do set "COMMIT_HASH=%%x"
    call :set_unixtime BUILD_UNIXTIME
    call :set_date BUILD_DATE

@@ -139,7 +140,13 @@ goto :pre_parse_args
    if "%NO_TEST%"=="0" (
        echo Executing backend unit testing...
        call go clean -cache
+
+        if "%SKIP_TESTS%"=="" (
            call go test .\... -v
+        ) else (
+            echo (Skip unit test "%SKIP_TESTS%")
+            call go test .\... -v -skip "%SKIP_TESTS%"
+        )

        if !errorlevel! neq 0 (
            call :echo_red "Error: Failed to pass unit testing"
@@ -184,6 +191,17 @@ goto :pre_parse_args
        )
    )

+    if "%NO_TEST%"=="0" (
+        echo Executing frontend unit testing...
+
+        call npm run test
+
+        if !errorlevel! neq 0 (
+            call :echo_red "Error: Failed to pass unit testing"
+            goto :end
+        )
+    )
+
    endlocal

    echo Building frontend files(%RELEASE_TYPE%)...
@@ -3,6 +3,7 @@
 TYPE=""
 NO_LINT="0"
 NO_TEST="0"
+SKIP_TESTS="${SKIP_TESTS}"
 RELEASE=${RELEASE_BUILD:-"0"}
 RELEASE_TYPE="unknown"
 VERSION=""
@@ -43,7 +44,7 @@ Options:
    -o, --output <filename> Package file name (For "package" type only)
    -t, --tag               Docker tag (For "docker" type only)
    --no-lint               Do not execute lint check before building
-    --no-test               Do not execute unit testing before building
+    --no-test               Do not execute unit testing before building (You can use environment variable "SKIP_TESTS" to skip specified tests)
    -h, --help              Show help
 EOF
 }
@@ -116,7 +117,7 @@ check_type_dependencies() {

 set_build_parameters() {
    VERSION="$(grep '"version": ' package.json | awk -F ':' '{print $2}' | tr -d ' ' | tr -d ',' | tr -d '"')"
-    COMMIT_HASH="$(git rev-parse --short HEAD)"
+    COMMIT_HASH="$(git rev-parse --short=7 HEAD)"
    BUILD_UNIXTIME="$(date '+%s')"
 }

@@ -137,7 +138,13 @@ build_backend() {
    if [ "$NO_TEST" = "0" ]; then
        echo "Executing backend unit testing..."
        go clean -cache
+
+        if [ -z "$SKIP_TESTS" ]; then
            go test ./... -v
+        else
+            echo "(Skip unit test \"$SKIP_TESTS\")"
+            go test ./... -v -skip "$SKIP_TESTS"
+        fi

        if [ "$?" != "0" ]; then
            echo_red "Error: Failed to pass unit testing"
@@ -172,6 +179,17 @@ build_frontend() {
        fi
    fi

+    if [ "$NO_TEST" = "0" ]; then
+        echo "Executing frontend unit testing..."
+
+        npm run test
+
+        if [ "$?" != "0" ]; then
+            echo_red "Error: Failed to pass unit testing"
+            exit 1
+        fi
+    fi
+
    echo "Building frontend files ($RELEASE_TYPE)..."

    if [ "$RELEASE" = "0" ]; then
@@ -0,0 +1,16 @@
+package cmd
+
+import (
+	"context"
+
+	"github.com/urfave/cli/v3"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+)
+
+func bindAction(fn core.CliHandlerFunc) cli.ActionFunc {
+	return func(ctx context.Context, cmd *cli.Command) error {
+		c := core.WrapCilContext(ctx, cmd)
+		return fn(c)
+	}
+}
@@ -0,0 +1,100 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/urfave/cli/v3"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/cron"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+)
+
+// CronJobs represents the cron command
+var CronJobs = &cli.Command{
+	Name:  "cron",
+	Usage: "ezBookkeeping cron job utilities",
+	Commands: []*cli.Command{
+		{
+			Name:   "list",
+			Usage:  "List all enabled cron jobs",
+			Action: bindAction(listAllCronJobs),
+		},
+		{
+			Name:   "run",
+			Usage:  "Run specified cron job",
+			Action: bindAction(runCronJob),
+			Flags: []cli.Flag{
+				&cli.StringFlag{
+					Name:     "name",
+					Aliases:  []string{"n"},
+					Required: true,
+					Usage:    "Cron job name",
+				},
+			},
+		},
+	},
+}
+
+func listAllCronJobs(c *core.CliContext) error {
+	config, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	err = cron.InitializeCronJobSchedulerContainer(c, config, false)
+
+	if err != nil {
+		log.CliErrorf(c, "[cron_jobs.listAllCronJobs] initializes cron job scheduler failed, because %s", err.Error())
+		return err
+	}
+
+	cronJobs := cron.Container.GetAllJobs()
+
+	if len(cronJobs) < 1 {
+		log.CliErrorf(c, "[cron_jobs.listAllCronJobs] there are no enabled cron jobs")
+		return err
+	}
+
+	for i := 0; i < len(cronJobs); i++ {
+		if i > 0 {
+			fmt.Printf("---\n")
+		}
+
+		cronJob := cronJobs[i]
+
+		fmt.Printf("[Name] %s\n", cronJob.Name)
+		fmt.Printf("[Description] %s\n", cronJob.Description)
+		fmt.Printf("[Interval] Every %s\n", cronJob.Period.GetInterval())
+	}
+
+	return nil
+}
+
+func runCronJob(c *core.CliContext) error {
+	config, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	err = cron.InitializeCronJobSchedulerContainer(c, config, false)
+
+	if err != nil {
+		log.CliErrorf(c, "[cron_jobs.runCronJob] initializes cron job scheduler failed, because %s", err.Error())
+		return err
+	}
+
+	jobName := c.String("name")
+	err = cron.Container.SyncRunJobNow(jobName)
+
+	if err != nil {
+		log.CliErrorf(c, "[cron_jobs.runCronJob] failed to run cron job \"%s\", because %s", jobName, err.Error())
+		return err
+	}
+
+	log.CliInfof(c, "[cron_jobs.runCronJob] run cron job \"%s\" successfully", jobName)
+
+	return nil
+}
@@ -1,8 +1,9 @@
 package cmd

 import (
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"

+	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/datastore"
 	"github.com/mayswind/ezbookkeeping/pkg/log"
 	"github.com/mayswind/ezbookkeeping/pkg/models"
@@ -12,36 +13,36 @@ import (
 var Database = &cli.Command{
 	Name:  "database",
 	Usage: "ezBookkeeping database maintenance",
-	Subcommands: []*cli.Command{
+	Commands: []*cli.Command{
 		{
 			Name:   "update",
 			Usage:  "Update database structure",
-			Action: updateDatabaseStructure,
+			Action: bindAction(updateDatabaseStructure),
 		},
 	},
 }

-func updateDatabaseStructure(c *cli.Context) error {
+func updateDatabaseStructure(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
 		return err
 	}

-	log.BootInfof("[database.updateDatabaseStructure] starting maintaining")
+	log.CliInfof(c, "[database.updateDatabaseStructure] starting maintaining")

-	err = updateAllDatabaseTablesStructure()
+	err = updateAllDatabaseTablesStructure(c)

 	if err != nil {
-		log.BootErrorf("[database.updateDatabaseStructure] update database table structure failed, because %s", err.Error())
+		log.CliErrorf(c, "[database.updateDatabaseStructure] update database table structure failed, because %s", err.Error())
 		return err
 	}

-	log.BootInfof("[database.updateDatabaseStructure] all tables maintained successfully")
+	log.CliInfof(c, "[database.updateDatabaseStructure] all tables maintained successfully")
 	return nil
 }

-func updateAllDatabaseTablesStructure() error {
+func updateAllDatabaseTablesStructure(c *core.CliContext) error {
 	var err error

 	err = datastore.Container.UserStore.SyncStructs(new(models.User))
@@ -50,7 +51,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] user table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] user table maintained successfully")

 	err = datastore.Container.UserStore.SyncStructs(new(models.TwoFactor))

@@ -58,7 +59,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] two-factor table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] two-factor table maintained successfully")

 	err = datastore.Container.UserStore.SyncStructs(new(models.TwoFactorRecoveryCode))

@@ -66,7 +67,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] two-factor recovery code table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] two-factor recovery code table maintained successfully")

 	err = datastore.Container.TokenStore.SyncStructs(new(models.TokenRecord))

@@ -74,7 +75,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] token record table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] token record table maintained successfully")

 	err = datastore.Container.UserDataStore.SyncStructs(new(models.Account))

@@ -82,7 +83,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] account table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] account table maintained successfully")

 	err = datastore.Container.UserDataStore.SyncStructs(new(models.Transaction))

@@ -90,7 +91,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] transaction table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] transaction table maintained successfully")

 	err = datastore.Container.UserDataStore.SyncStructs(new(models.TransactionCategory))

@@ -98,7 +99,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] transaction category table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] transaction category table maintained successfully")

 	err = datastore.Container.UserDataStore.SyncStructs(new(models.TransactionTag))

@@ -106,7 +107,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] transaction tag table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] transaction tag table maintained successfully")

 	err = datastore.Container.UserDataStore.SyncStructs(new(models.TransactionTagIndex))

@@ -114,7 +115,7 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] transaction tag index table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] transaction tag index table maintained successfully")

 	err = datastore.Container.UserDataStore.SyncStructs(new(models.TransactionTemplate))

@@ -122,7 +123,31 @@ func updateAllDatabaseTablesStructure() error {
 		return err
 	}

-	log.BootInfof("[database.updateAllDatabaseTablesStructure] transaction template table maintained successfully")
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] transaction template table maintained successfully")
+
+	err = datastore.Container.UserDataStore.SyncStructs(new(models.TransactionPictureInfo))
+
+	if err != nil {
+		return err
+	}
+
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] transaction picture table maintained successfully")
+
+	err = datastore.Container.UserDataStore.SyncStructs(new(models.UserCustomExchangeRate))
+
+	if err != nil {
+		return err
+	}
+
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] user custom exchange rate table maintained successfully")
+
+	err = datastore.Container.UserDataStore.SyncStructs(new(models.UserApplicationCloudSetting))
+
+	if err != nil {
+		return err
+	}
+
+	log.BootInfof(c, "[database.updateAllDatabaseTablesStructure] user application cloud settings table maintained successfully")

 	return nil
 }
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"os"

-	"github.com/urfave/cli/v2"
-
+	"github.com/mayswind/ezbookkeeping/pkg/avatars"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/datastore"
 	"github.com/mayswind/ezbookkeeping/pkg/duplicatechecker"
 	"github.com/mayswind/ezbookkeeping/pkg/exchangerates"
@@ -17,7 +17,7 @@ import (
 	"github.com/mayswind/ezbookkeeping/pkg/uuid"
 )

-func initializeSystem(c *cli.Context) (*settings.Config, error) {
+func initializeSystem(c *core.CliContext) (*settings.Config, error) {
 	var err error
 	configFilePath := c.String("conf-path")
 	isDisableBootLog := c.Bool("no-boot-log")
@@ -25,26 +25,26 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {
 	if configFilePath != "" {
 		if _, err = os.Stat(configFilePath); err != nil {
 			if !isDisableBootLog {
-				log.BootErrorf("[initializer.initializeSystem] cannot load configuration from custom config path %s, because file not exists", configFilePath)
+				log.BootErrorf(c, "[initializer.initializeSystem] cannot load configuration from custom config path %s, because file not exists", configFilePath)
 			}
 			return nil, err
 		}

 		if !isDisableBootLog {
-			log.BootInfof("[initializer.initializeSystem] will loading configuration from custom config path %s", configFilePath)
+			log.BootInfof(c, "[initializer.initializeSystem] will loading configuration from custom config path %s", configFilePath)
 		}
 	} else {
 		configFilePath, err = settings.GetDefaultConfigFilePath()

 		if err != nil {
 			if !isDisableBootLog {
-				log.BootErrorf("[initializer.initializeSystem] cannot get default configuration path, because %s", err.Error())
+				log.BootErrorf(c, "[initializer.initializeSystem] cannot get default configuration path, because %s", err.Error())
 			}
 			return nil, err
 		}

 		if !isDisableBootLog {
-			log.BootInfof("[initializer.initializeSystem] will load configuration from default config path %s", configFilePath)
+			log.BootInfof(c, "[initializer.initializeSystem] will load configuration from default config path %s", configFilePath)
 		}
 	}

@@ -52,13 +52,13 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] cannot load configuration, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] cannot load configuration, because %s", err.Error())
 		}
 		return nil, err
 	}

 	if config.SecretKeyNoSet {
-		log.BootWarnf("[initializer.initializeSystem] \"secret_key\" in config file is not set, please change it to keep your user data safe")
+		log.BootWarnf(c, "[initializer.initializeSystem] \"secret_key\" in config file is not set, please change it to keep your user data safe")
 	}

 	settings.SetCurrentConfig(config)
@@ -67,7 +67,7 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] initializes data store failed, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] initializes data store failed, because %s", err.Error())
 		}
 		return nil, err
 	}
@@ -76,7 +76,7 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] sets logger configuration failed, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] sets logger configuration failed, because %s", err.Error())
 		}
 		return nil, err
 	}
@@ -85,7 +85,7 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] initializes object storage failed, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] initializes object storage failed, because %s", err.Error())
 		}
 		return nil, err
 	}
@@ -94,7 +94,7 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] initializes uuid generator failed, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] initializes uuid generator failed, because %s", err.Error())
 		}
 		return nil, err
 	}
@@ -103,7 +103,16 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] initializes duplicate checker failed, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] initializes duplicate checker failed, because %s", err.Error())
+		}
+		return nil, err
+	}
+
+	err = avatars.InitializeAvatarProvider(config)
+
+	if err != nil {
+		if !isDisableBootLog {
+			log.BootErrorf(c, "[initializer.initializeSystem] initializes avatar provider failed, because %s", err.Error())
 		}
 		return nil, err
 	}
@@ -112,7 +121,7 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] initializes mailer failed, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] initializes mailer failed, because %s", err.Error())
 		}
 		return nil, err
 	}
@@ -121,7 +130,7 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {

 	if err != nil {
 		if !isDisableBootLog {
-			log.BootErrorf("[initializer.initializeSystem] initializes exchange rates data source failed, because %s", err.Error())
+			log.BootErrorf(c, "[initializer.initializeSystem] initializes exchange rates data source failed, because %s", err.Error())
 		}
 		return nil, err
 	}
@@ -129,7 +138,7 @@ func initializeSystem(c *cli.Context) (*settings.Config, error) {
 	cfgJson, _ := json.Marshal(getConfigWithoutSensitiveData(config))

 	if !isDisableBootLog {
-		log.BootInfof("[initializer.initializeSystem] has loaded configuration %s", cfgJson)
+		log.BootInfof(c, "[initializer.initializeSystem] has loaded configuration %s", cfgJson)
 	}

 	return config, nil
@@ -149,5 +158,9 @@ func getConfigWithoutSensitiveData(config *settings.Config) *settings.Config {
 	clonedConfig.SecretKey = "****"
 	clonedConfig.AmapApplicationSecret = "****"

+	if clonedConfig.WebDAVConfig != nil {
+		clonedConfig.WebDAVConfig.Password = "****"
+	}
+
 	return clonedConfig
 }
@@ -3,8 +3,9 @@ package cmd
 import (
 	"fmt"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"

+	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/utils"
 )

@@ -12,11 +13,11 @@ import (
 var SecurityUtils = &cli.Command{
 	Name:  "security",
 	Usage: "ezBookkeeping security utilities",
-	Subcommands: []*cli.Command{
+	Commands: []*cli.Command{
 		{
 			Name:   "gen-secret-key",
 			Usage:  "Generate a random secret key",
-			Action: genSecretKey,
+			Action: bindAction(genSecretKey),
 			Flags: []cli.Flag{
 				&cli.IntFlag{
 					Name:        "length",
@@ -30,7 +31,7 @@ var SecurityUtils = &cli.Command{
 	},
 }

-func genSecretKey(c *cli.Context) error {
+func genSecretKey(c *core.CliContext) error {
 	length := c.Int("length")

 	if length <= 0 {
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"os"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"

 	clis "github.com/mayswind/ezbookkeeping/pkg/cli"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/log"
 	"github.com/mayswind/ezbookkeeping/pkg/models"
@@ -17,11 +18,11 @@ import (
 var UserData = &cli.Command{
 	Name:  "userdata",
 	Usage: "ezBookkeeping user data maintenance",
-	Subcommands: []*cli.Command{
+	Commands: []*cli.Command{
 		{
 			Name:   "user-add",
 			Usage:  "Add new user",
-			Action: addNewUser,
+			Action: bindAction(addNewUser),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -58,7 +59,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-get",
 			Usage:  "Get specified user info",
-			Action: getUserInfo,
+			Action: bindAction(getUserInfo),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -71,7 +72,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-modify-password",
 			Usage:  "Modify user password",
-			Action: modifyUserPassword,
+			Action: bindAction(modifyUserPassword),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -90,7 +91,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-enable",
 			Usage:  "Enable specified user",
-			Action: enableUser,
+			Action: bindAction(enableUser),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -103,7 +104,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-disable",
 			Usage:  "Disable specified user",
-			Action: disableUser,
+			Action: bindAction(disableUser),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -113,10 +114,67 @@ var UserData = &cli.Command{
 				},
 			},
 		},
+		{
+			Name:   "user-set-restrict-features",
+			Usage:  "Set restrictions of user features",
+			Action: bindAction(setUserFeatureRestriction),
+			Flags: []cli.Flag{
+				&cli.StringFlag{
+					Name:     "username",
+					Aliases:  []string{"n"},
+					Required: true,
+					Usage:    "Specific user name",
+				},
+				&cli.StringFlag{
+					Name:     "features",
+					Aliases:  []string{"t"},
+					Required: true,
+					Usage:    "Specific feature types (feature types separated by commas)",
+				},
+			},
+		},
+		{
+			Name:   "user-add-restrict-features",
+			Usage:  "Add restrictions of user features",
+			Action: bindAction(addUserFeatureRestriction),
+			Flags: []cli.Flag{
+				&cli.StringFlag{
+					Name:     "username",
+					Aliases:  []string{"n"},
+					Required: true,
+					Usage:    "Specific user name",
+				},
+				&cli.StringFlag{
+					Name:     "features",
+					Aliases:  []string{"t"},
+					Required: true,
+					Usage:    "Specific feature types (feature types separated by commas)",
+				},
+			},
+		},
+		{
+			Name:   "user-remove-restrict-features",
+			Usage:  "Remove restrictions of user features",
+			Action: bindAction(removeUserFeatureRestriction),
+			Flags: []cli.Flag{
+				&cli.StringFlag{
+					Name:     "username",
+					Aliases:  []string{"n"},
+					Required: true,
+					Usage:    "Specific user name",
+				},
+				&cli.StringFlag{
+					Name:     "features",
+					Aliases:  []string{"t"},
+					Required: true,
+					Usage:    "Specific feature types (feature types separated by commas)",
+				},
+			},
+		},
 		{
 			Name:   "user-resend-verify-email",
 			Usage:  "Resend user verify email",
-			Action: resendUserVerifyEmail,
+			Action: bindAction(resendUserVerifyEmail),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -129,7 +187,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-set-email-verified",
 			Usage:  "Set user email address verified",
-			Action: setUserEmailVerified,
+			Action: bindAction(setUserEmailVerified),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -142,7 +200,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-set-email-unverified",
 			Usage:  "Set user email address unverified",
-			Action: setUserEmailUnverified,
+			Action: bindAction(setUserEmailUnverified),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -155,7 +213,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-delete",
 			Usage:  "Delete specified user",
-			Action: deleteUser,
+			Action: bindAction(deleteUser),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -168,7 +226,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-2fa-disable",
 			Usage:  "Disable user 2fa setting",
-			Action: disableUser2FA,
+			Action: bindAction(disableUser2FA),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -181,7 +239,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "user-session-list",
 			Usage:  "List all user sessions",
-			Action: listUserTokens,
+			Action: bindAction(listUserTokens),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -191,10 +249,42 @@ var UserData = &cli.Command{
 				},
 			},
 		},
+		{
+			Name:   "user-session-new",
+			Usage:  "Create new session for user",
+			Action: bindAction(createNewUserToken),
+			Flags: []cli.Flag{
+				&cli.StringFlag{
+					Name:     "username",
+					Aliases:  []string{"n"},
+					Required: true,
+					Usage:    "Specific user name",
+				},
+				&cli.StringFlag{
+					Name:     "type",
+					Aliases:  []string{"t"},
+					Required: false,
+					Usage:    "Specific token type, supports \"normal\" and \"mcp\", default is \"normal\"",
+				},
+			},
+		},
+		{
+			Name:   "user-session-revoke",
+			Usage:  "Revoke the specified user session",
+			Action: bindAction(revokeUserToken),
+			Flags: []cli.Flag{
+				&cli.StringFlag{
+					Name:     "token",
+					Aliases:  []string{"t"},
+					Required: false,
+					Usage:    "Specific token content",
+				},
+			},
+		},
 		{
 			Name:   "user-session-clear",
 			Usage:  "Clear user all sessions",
-			Action: clearUserTokens,
+			Action: bindAction(clearUserTokens),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -207,7 +297,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "send-password-reset-mail",
 			Usage:  "Send password reset mail",
-			Action: sendPasswordResetMail,
+			Action: bindAction(sendPasswordResetMail),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -220,7 +310,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "transaction-check",
 			Usage:  "Check whether user all transactions and accounts are correct",
-			Action: checkUserTransactionAndAccount,
+			Action: bindAction(checkUserTransactionAndAccount),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -233,7 +323,7 @@ var UserData = &cli.Command{
 		{
 			Name:   "transaction-tag-index-fix-transaction-time",
 			Usage:  "Fix the transaction tag index data which does not have transaction time",
-			Action: fixTransactionTagIndexNotHaveTransactionTime,
+			Action: bindAction(fixTransactionTagIndexNotHaveTransactionTime),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -243,10 +333,35 @@ var UserData = &cli.Command{
 				},
 			},
 		},
+		{
+			Name:   "transaction-import",
+			Usage:  "Import transactions to specified user",
+			Action: bindAction(importUserTransaction),
+			Flags: []cli.Flag{
+				&cli.StringFlag{
+					Name:     "username",
+					Aliases:  []string{"n"},
+					Required: true,
+					Usage:    "Specific user name",
+				},
+				&cli.StringFlag{
+					Name:     "file",
+					Aliases:  []string{"f"},
+					Required: true,
+					Usage:    "Specific import file path (e.g. transaction.csv)",
+				},
+				&cli.StringFlag{
+					Name:     "type",
+					Aliases:  []string{"t"},
+					Required: true,
+					Usage:    "Import file type (supports \"ezbookkeeping_csv\", \"ezbookkeeping_tsv\")",
+				},
+			},
+		},
 		{
 			Name:   "transaction-export",
 			Usage:  "Export user all transactions to file",
-			Action: exportUserTransaction,
+			Action: bindAction(exportUserTransaction),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "username",
@@ -271,7 +386,7 @@ var UserData = &cli.Command{
 	},
 }

-func addNewUser(c *cli.Context) error {
+func addNewUser(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -287,7 +402,7 @@ func addNewUser(c *cli.Context) error {
 	user, err := clis.UserData.AddNewUser(c, username, email, nickname, password, defaultCurrency)

 	if err != nil {
-		log.BootErrorf("[user_data.addNewUser] error occurs when adding new user")
+		log.CliErrorf(c, "[user_data.addNewUser] error occurs when adding new user")
 		return err
 	}

@@ -296,7 +411,7 @@ func addNewUser(c *cli.Context) error {
 	return nil
 }

-func getUserInfo(c *cli.Context) error {
+func getUserInfo(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -307,7 +422,7 @@ func getUserInfo(c *cli.Context) error {
 	user, err := clis.UserData.GetUserByUsername(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.getUserInfo] error occurs when getting user data")
+		log.CliErrorf(c, "[user_data.getUserInfo] error occurs when getting user data")
 		return err
 	}

@@ -316,7 +431,7 @@ func getUserInfo(c *cli.Context) error {
 	return nil
 }

-func modifyUserPassword(c *cli.Context) error {
+func modifyUserPassword(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -328,16 +443,16 @@ func modifyUserPassword(c *cli.Context) error {
 	err = clis.UserData.ModifyUserPassword(c, username, password)

 	if err != nil {
-		log.BootErrorf("[user_data.modifyUserPassword] error occurs when modifying user password")
+		log.CliErrorf(c, "[user_data.modifyUserPassword] error occurs when modifying user password")
 		return err
 	}

-	log.BootInfof("[user_data.modifyUserPassword] password of user \"%s\" has been changed", username)
+	log.CliInfof(c, "[user_data.modifyUserPassword] password of user \"%s\" has been changed", username)

 	return nil
 }

-func sendPasswordResetMail(c *cli.Context) error {
+func sendPasswordResetMail(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -348,16 +463,16 @@ func sendPasswordResetMail(c *cli.Context) error {
 	err = clis.UserData.SendPasswordResetMail(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.sendPasswordResetMail] error occurs when sending password reset email")
+		log.CliErrorf(c, "[user_data.sendPasswordResetMail] error occurs when sending password reset email")
 		return err
 	}

-	log.BootInfof("[user_data.sendPasswordResetMail] a password reset email for user \"%s\" has been sent", username)
+	log.CliInfof(c, "[user_data.sendPasswordResetMail] a password reset email for user \"%s\" has been sent", username)

 	return nil
 }

-func enableUser(c *cli.Context) error {
+func enableUser(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -368,16 +483,16 @@ func enableUser(c *cli.Context) error {
 	err = clis.UserData.EnableUser(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.enableUser] error occurs when setting user enabled")
+		log.CliErrorf(c, "[user_data.enableUser] error occurs when setting user enabled")
 		return err
 	}

-	log.BootInfof("[user_data.enableUser] user \"%s\" has been set enabled", username)
+	log.CliInfof(c, "[user_data.enableUser] user \"%s\" has been set enabled", username)

 	return nil
 }

-func disableUser(c *cli.Context) error {
+func disableUser(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -388,16 +503,91 @@ func disableUser(c *cli.Context) error {
 	err = clis.UserData.DisableUser(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.disableUser] error occurs when setting user disabled")
+		log.CliErrorf(c, "[user_data.disableUser] error occurs when setting user disabled")
 		return err
 	}

-	log.BootInfof("[user_data.disableUser] user \"%s\" has been set disabled", username)
+	log.CliInfof(c, "[user_data.disableUser] user \"%s\" has been set disabled", username)

 	return nil
 }

-func resendUserVerifyEmail(c *cli.Context) error {
+func setUserFeatureRestriction(c *core.CliContext) error {
+	_, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	username := c.String("username")
+	featureRestriction := core.ParseUserFeatureRestrictions(c.String("features"))
+	err = clis.UserData.SetUserFeatureRestrictions(c, username, featureRestriction)
+
+	if err != nil {
+		log.CliErrorf(c, "[user_data.setUserFeatureRestriction] error occurs when setting user feature restriction")
+		return err
+	}
+
+	log.CliInfof(c, "[user_data.setUserFeatureRestriction] user \"%s\" has been set new feature restriction", username)
+
+	return nil
+}
+
+func addUserFeatureRestriction(c *core.CliContext) error {
+	_, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	username := c.String("username")
+	featureRestriction := core.ParseUserFeatureRestrictions(c.String("features"))
+
+	if featureRestriction < 1 {
+		log.CliErrorf(c, "[user_data.addUserFeatureRestriction] nothing has been modified")
+		return nil
+	}
+
+	err = clis.UserData.AddUserFeatureRestrictions(c, username, featureRestriction)
+
+	if err != nil {
+		log.CliErrorf(c, "[user_data.addUserFeatureRestriction] error occurs when adding user feature restriction")
+		return err
+	}
+
+	log.CliInfof(c, "[user_data.addUserFeatureRestriction] user \"%s\" has been add new feature restriction", username)
+
+	return nil
+}
+
+func removeUserFeatureRestriction(c *core.CliContext) error {
+	_, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	username := c.String("username")
+	featureRestriction := core.ParseUserFeatureRestrictions(c.String("features"))
+
+	if featureRestriction < 1 {
+		log.CliErrorf(c, "[user_data.removeUserFeatureRestriction] nothing has been modified")
+		return nil
+	}
+
+	err = clis.UserData.RemoveUserFeatureRestrictions(c, username, featureRestriction)
+
+	if err != nil {
+		log.CliErrorf(c, "[user_data.removeUserFeatureRestriction] error occurs when removing user feature restriction")
+		return err
+	}
+
+	log.CliInfof(c, "[user_data.removeUserFeatureRestriction] user \"%s\" has been removed new feature restriction", username)
+
+	return nil
+}
+
+func resendUserVerifyEmail(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -408,16 +598,16 @@ func resendUserVerifyEmail(c *cli.Context) error {
 	err = clis.UserData.ResendVerifyEmail(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.resendUserVerifyEmail] error occurs when resending user verify email")
+		log.CliErrorf(c, "[user_data.resendUserVerifyEmail] error occurs when resending user verify email")
 		return err
 	}

-	log.BootInfof("[user_data.resendUserVerifyEmail] verify email for user \"%s\" has been resent", username)
+	log.CliInfof(c, "[user_data.resendUserVerifyEmail] verify email for user \"%s\" has been resent", username)

 	return nil
 }

-func setUserEmailVerified(c *cli.Context) error {
+func setUserEmailVerified(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -428,16 +618,16 @@ func setUserEmailVerified(c *cli.Context) error {
 	err = clis.UserData.SetUserEmailVerified(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.setUserEmailVerified] error occurs when setting user email address verified")
+		log.CliErrorf(c, "[user_data.setUserEmailVerified] error occurs when setting user email address verified")
 		return err
 	}

-	log.BootInfof("[user_data.setUserEmailVerified] user \"%s\" email address has been set verified", username)
+	log.CliInfof(c, "[user_data.setUserEmailVerified] user \"%s\" email address has been set verified", username)

 	return nil
 }

-func setUserEmailUnverified(c *cli.Context) error {
+func setUserEmailUnverified(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -448,16 +638,16 @@ func setUserEmailUnverified(c *cli.Context) error {
 	err = clis.UserData.SetUserEmailUnverified(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.setUserEmailUnverified] error occurs when setting user email address unverified")
+		log.CliErrorf(c, "[user_data.setUserEmailUnverified] error occurs when setting user email address unverified")
 		return err
 	}

-	log.BootInfof("[user_data.setUserEmailUnverified] user \"%s\" email address has been set unverified", username)
+	log.CliInfof(c, "[user_data.setUserEmailUnverified] user \"%s\" email address has been set unverified", username)

 	return nil
 }

-func deleteUser(c *cli.Context) error {
+func deleteUser(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -468,16 +658,16 @@ func deleteUser(c *cli.Context) error {
 	err = clis.UserData.DeleteUser(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.deleteUser] error occurs when deleting user")
+		log.CliErrorf(c, "[user_data.deleteUser] error occurs when deleting user")
 		return err
 	}

-	log.BootInfof("[user_data.deleteUser] user \"%s\" has been deleted", username)
+	log.CliInfof(c, "[user_data.deleteUser] user \"%s\" has been deleted", username)

 	return nil
 }

-func disableUser2FA(c *cli.Context) error {
+func disableUser2FA(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -488,16 +678,16 @@ func disableUser2FA(c *cli.Context) error {
 	err = clis.UserData.DisableUserTwoFactorAuthorization(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.disableUser2FA] error occurs when disabling user two-factor authorization")
+		log.CliErrorf(c, "[user_data.disableUser2FA] error occurs when disabling user two-factor authorization")
 		return err
 	}

-	log.BootInfof("[user_data.disableUser2FA] two-factor authorization of user \"%s\" has been disabled", username)
+	log.CliInfof(c, "[user_data.disableUser2FA] two-factor authorization of user \"%s\" has been disabled", username)

 	return nil
 }

-func listUserTokens(c *cli.Context) error {
+func listUserTokens(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -508,7 +698,7 @@ func listUserTokens(c *cli.Context) error {
 	tokens, err := clis.UserData.ListUserTokens(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.listUserTokens] error occurs when getting user tokens")
+		log.CliErrorf(c, "[user_data.listUserTokens] error occurs when getting user tokens")
 		return err
 	}

@@ -523,7 +713,59 @@ func listUserTokens(c *cli.Context) error {
 	return nil
 }

-func clearUserTokens(c *cli.Context) error {
+func createNewUserToken(c *core.CliContext) error {
+	_, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	username := c.String("username")
+	tokenType := c.String("type")
+
+	if tokenType == "" {
+		tokenType = "normal"
+	}
+
+	if tokenType != "normal" && tokenType != "mcp" {
+		log.CliErrorf(c, "[user_data.createNewUserToken] token type is invalid")
+		return nil
+	}
+
+	token, tokenString, err := clis.UserData.CreateNewUserToken(c, username, tokenType)
+
+	if err != nil {
+		log.CliErrorf(c, "[user_data.createNewUserToken] error occurs when creating user token")
+		return err
+	}
+
+	printTokenInfo(token)
+	fmt.Printf("[NewToken] %s\n", tokenString)
+
+	return nil
+}
+
+func revokeUserToken(c *core.CliContext) error {
+	_, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	token := c.String("token")
+	err = clis.UserData.RevokeUserToken(c, token)
+
+	if err != nil {
+		log.CliErrorf(c, "[user_data.revokeUserToken] error occurs when revoking user token")
+		return err
+	}
+
+	log.CliInfof(c, "[user_data.revokeUserToken] the specified user token has been revoked successfully")
+
+	return nil
+}
+
+func clearUserTokens(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -534,16 +776,16 @@ func clearUserTokens(c *cli.Context) error {
 	err = clis.UserData.ClearUserTokens(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.clearUserTokens] error occurs when clearing user tokens")
+		log.CliErrorf(c, "[user_data.clearUserTokens] error occurs when clearing user tokens")
 		return err
 	}

-	log.BootInfof("[user_data.clearUserTokens] all tokens of user \"%s\" has been cleared", username)
+	log.CliInfof(c, "[user_data.clearUserTokens] all tokens of user \"%s\" has been cleared", username)

 	return nil
 }

-func checkUserTransactionAndAccount(c *cli.Context) error {
+func checkUserTransactionAndAccount(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -552,21 +794,21 @@ func checkUserTransactionAndAccount(c *cli.Context) error {

 	username := c.String("username")

-	log.BootInfof("[user_data.checkUserTransactionAndAccount] starting checking user \"%s\" data", username)
+	log.CliInfof(c, "[user_data.checkUserTransactionAndAccount] starting checking user \"%s\" data", username)

 	_, err = clis.UserData.CheckTransactionAndAccount(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.checkUserTransactionAndAccount] error occurs when checking user data")
+		log.CliErrorf(c, "[user_data.checkUserTransactionAndAccount] error occurs when checking user data")
 		return err
 	}

-	log.BootInfof("[user_data.checkUserTransactionAndAccount] user transactions and accounts data has been checked successfully, there is no problem with user data")
+	log.CliInfof(c, "[user_data.checkUserTransactionAndAccount] user transactions and accounts data has been checked successfully, there is no problem with user data")

 	return nil
 }

-func fixTransactionTagIndexNotHaveTransactionTime(c *cli.Context) error {
+func fixTransactionTagIndexNotHaveTransactionTime(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -575,21 +817,21 @@ func fixTransactionTagIndexNotHaveTransactionTime(c *cli.Context) error {

 	username := c.String("username")

-	log.BootInfof("[user_data.fixTransactionTagIndexNotHaveTransactionTime] starting fixing user \"%s\" transaction tag index data", username)
+	log.CliInfof(c, "[user_data.fixTransactionTagIndexNotHaveTransactionTime] starting fixing user \"%s\" transaction tag index data", username)

 	_, err = clis.UserData.FixTransactionTagIndexWithTransactionTime(c, username)

 	if err != nil {
-		log.BootErrorf("[user_data.fixTransactionTagIndexNotHaveTransactionTime] error occurs when fixing user data")
+		log.CliErrorf(c, "[user_data.fixTransactionTagIndexNotHaveTransactionTime] error occurs when fixing user data")
 		return err
 	}

-	log.BootInfof("[user_data.fixTransactionTagIndexNotHaveTransactionTime] user transaction tag index data has been fixed successfully")
+	log.CliInfof(c, "[user_data.fixTransactionTagIndexNotHaveTransactionTime] user transaction tag index data has been fixed successfully")

 	return nil
 }

-func exportUserTransaction(c *cli.Context) error {
+func exportUserTransaction(c *core.CliContext) error {
 	_, err := initializeSystem(c)

 	if err != nil {
@@ -600,40 +842,93 @@ func exportUserTransaction(c *cli.Context) error {
 	filePath := c.String("file")
 	fileType := c.String("type")

-	if fileType != "" && fileType != "csv" && fileType != "tsv" {
-		log.BootErrorf("[user_data.exportUserTransaction] export file type is not supported")
+	if fileType == "" {
+		fileType = "csv"
+	}
+
+	if fileType != "csv" && fileType != "tsv" {
+		log.CliErrorf(c, "[user_data.exportUserTransaction] export file type is not supported")
 		return errs.ErrNotSupported
 	}

 	if filePath == "" {
-		log.BootErrorf("[user_data.exportUserTransaction] export file path is unspecified")
+		log.CliErrorf(c, "[user_data.exportUserTransaction] export file path is unspecified")
 		return os.ErrNotExist
 	}

 	fileExists, err := utils.IsExists(filePath)

 	if fileExists {
-		log.BootErrorf("[user_data.exportUserTransaction] specified file path already exists")
+		log.CliErrorf(c, "[user_data.exportUserTransaction] specified file path already exists")
 		return os.ErrExist
 	}

-	log.BootInfof("[user_data.exportUserTransaction] starting exporting user \"%s\" data", username)
+	log.CliInfof(c, "[user_data.exportUserTransaction] starting exporting user \"%s\" data", username)

 	content, err := clis.UserData.ExportTransaction(c, username, fileType)

 	if err != nil {
-		log.BootErrorf("[user_data.exportUserTransaction] error occurs when exporting user data")
+		log.CliErrorf(c, "[user_data.exportUserTransaction] error occurs when exporting user data")
 		return err
 	}

 	err = utils.WriteFile(filePath, content)

 	if err != nil {
-		log.BootErrorf("[user_data.exportUserTransaction] failed to write to %s", filePath)
+		log.CliErrorf(c, "[user_data.exportUserTransaction] failed to write to %s", filePath)
 		return err
 	}

-	log.BootInfof("[user_data.exportUserTransaction] user transactions have been exported to %s", filePath)
+	log.CliInfof(c, "[user_data.exportUserTransaction] user transactions have been exported to %s", filePath)
+
+	return nil
+}
+
+func importUserTransaction(c *core.CliContext) error {
+	_, err := initializeSystem(c)
+
+	if err != nil {
+		return err
+	}
+
+	username := c.String("username")
+	filePath := c.String("file")
+	filetype := c.String("type")
+
+	if filePath == "" {
+		log.CliErrorf(c, "[user_data.importUserTransaction] import file path is not specified")
+		return os.ErrNotExist
+	}
+
+	fileExists, err := utils.IsExists(filePath)
+
+	if !fileExists {
+		log.CliErrorf(c, "[user_data.importUserTransaction] import file does not exist")
+		return os.ErrExist
+	}
+
+	if filetype != "ezbookkeeping_csv" && filetype != "ezbookkeeping_tsv" {
+		log.CliErrorf(c, "[user_data.importUserTransaction] unknown file type \"%s\"", filetype)
+		return errs.ErrImportFileTypeNotSupported
+	}
+
+	data, err := os.ReadFile(filePath)
+
+	if err != nil {
+		log.CliErrorf(c, "[user_data.importUserTransaction] failed to load import file")
+		return err
+	}
+
+	log.CliInfof(c, "[user_data.importUserTransaction] start importing transactions to user \"%s\"", username)
+
+	err = clis.UserData.ImportTransaction(c, username, filetype, data)
+
+	if err != nil {
+		log.CliErrorf(c, "[user_data.importUserTransaction] error occurs when importing user data")
+		return err
+	}
+
+	log.CliInfof(c, "[user_data.importUserTransaction] transactions have been imported to user \"%s\"", username)

 	return nil
 }
@@ -650,16 +945,23 @@ func printUserInfo(user *models.User) {
 	fmt.Printf("[Language] %s\n", user.Language)
 	fmt.Printf("[DefaultCurrency] %s\n", user.DefaultCurrency)
 	fmt.Printf("[FirstDayOfWeek] %s (%d)\n", user.FirstDayOfWeek, user.FirstDayOfWeek)
+	fmt.Printf("[FiscalYearStart] %s (%d)\n", user.FiscalYearStart, user.FiscalYearStart)
+	fmt.Printf("[CalendarDisplayType] %s (%d)\n", user.CalendarDisplayType, user.CalendarDisplayType)
+	fmt.Printf("[DateDisplayType] %s (%d)\n", user.DateDisplayType, user.DateDisplayType)
 	fmt.Printf("[LongDateFormat] %s (%d)\n", user.LongDateFormat, user.LongDateFormat)
 	fmt.Printf("[ShortDateFormat] %s (%d)\n", user.ShortDateFormat, user.ShortDateFormat)
 	fmt.Printf("[LongTimeFormat] %s (%d)\n", user.LongTimeFormat, user.LongTimeFormat)
 	fmt.Printf("[ShortTimeFormat] %s (%d)\n", user.ShortTimeFormat, user.ShortTimeFormat)
+	fmt.Printf("[FiscalYearFormat] %s (%d)\n", user.FiscalYearFormat, user.FiscalYearFormat)
+	fmt.Printf("[CurrencyDisplayType] %s (%d)\n", user.CurrencyDisplayType, user.CurrencyDisplayType)
+	fmt.Printf("[NumeralSystem] %s (%d)\n", user.NumeralSystem, user.NumeralSystem)
 	fmt.Printf("[DecimalSeparator] %s (%d)\n", user.DecimalSeparator, user.DecimalSeparator)
 	fmt.Printf("[DigitGroupingSymbol] %s (%d)\n", user.DigitGroupingSymbol, user.DigitGroupingSymbol)
 	fmt.Printf("[DigitGrouping] %s (%d)\n", user.DigitGrouping, user.DigitGrouping)
-	fmt.Printf("[CurrencyDisplayType] %s (%d)\n", user.CurrencyDisplayType, user.CurrencyDisplayType)
+	fmt.Printf("[CoordinateDisplayType] %s (%d)\n", user.CoordinateDisplayType, user.CoordinateDisplayType)
 	fmt.Printf("[ExpenseAmountColor] %s (%d)\n", user.ExpenseAmountColor, user.ExpenseAmountColor)
 	fmt.Printf("[IncomeAmountColor] %s (%d)\n", user.IncomeAmountColor, user.IncomeAmountColor)
+	fmt.Printf("[FeatureRestriction] %s (%d)\n", user.FeatureRestriction, user.FeatureRestriction)
 	fmt.Printf("[Deleted] %t\n", user.Deleted)
 	fmt.Printf("[EmailVerified] %t\n", user.EmailVerified)
 	fmt.Printf("[CreatedAt] %s (%d)\n", utils.FormatUnixTimeToLongDateTimeInServerTimezone(user.CreatedUnixTime), user.CreatedUnixTime)
@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"net"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"

+	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/mail"
 	"github.com/mayswind/ezbookkeeping/pkg/requestid"
@@ -17,11 +18,11 @@ import (
 var Utilities = &cli.Command{
 	Name:  "utility",
 	Usage: "ezBookkeeping utilities",
-	Subcommands: []*cli.Command{
+	Commands: []*cli.Command{
 		{
 			Name:   "parse-default-request-id",
 			Usage:  "Parse a request id which is generated by default request generator and show the details",
-			Action: parseRequestId,
+			Action: bindAction(parseRequestId),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "id",
@@ -33,7 +34,7 @@ var Utilities = &cli.Command{
 		{
 			Name:   "send-test-mail",
 			Usage:  "Send an email to specified e-mail address",
-			Action: sendTestMail,
+			Action: bindAction(sendTestMail),
 			Flags: []cli.Flag{
 				&cli.StringFlag{
 					Name:     "to",
@@ -45,15 +46,15 @@ var Utilities = &cli.Command{
 	},
 }

-func parseRequestId(c *cli.Context) error {
+func parseRequestId(c *core.CliContext) error {
 	config, err := initializeSystem(c)

 	if err != nil {
 		return err
 	}

-	err = requestid.InitializeRequestIdGenerator(config)
-	defaultGenerator, err := requestid.NewDefaultRequestIdGenerator(config)
+	err = requestid.InitializeRequestIdGenerator(c, config)
+	defaultGenerator, err := requestid.NewDefaultRequestIdGenerator(c, config)

 	if err != nil {
 		return err
@@ -73,20 +74,20 @@ func parseRequestId(c *cli.Context) error {
 	return nil
 }

-func sendTestMail(c *cli.Context) error {
+func sendTestMail(c *core.CliContext) error {
 	config, err := initializeSystem(c)

 	if err != nil {
 		return err
 	}

-	if !config.EnableSMTP || mail.Container.Current == nil {
+	if !config.EnableSMTP {
 		return errs.ErrSMTPServerNotEnabled
 	}

 	toAddress := c.String("to")

-	err = mail.Container.Current.SendMail(&mail.MailMessage{
+	err = mail.Container.SendMail(&mail.MailMessage{
 		To:      toAddress,
 		Subject: "ezBookkeeping test e-mail",
 		Body:    "This is a test e-mail",
@@ -2,6 +2,7 @@ package cmd

 import (
 	"fmt"
+	"net/http"
 	"path/filepath"
 	"time"

@@ -11,12 +12,14 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 	"github.com/go-playground/validator/v10"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"

 	"github.com/mayswind/ezbookkeeping/pkg/api"
 	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/cron"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/mcp"
 	"github.com/mayswind/ezbookkeeping/pkg/middlewares"
 	"github.com/mayswind/ezbookkeeping/pkg/requestid"
 	"github.com/mayswind/ezbookkeeping/pkg/settings"
@@ -28,47 +31,61 @@ import (
 var WebServer = &cli.Command{
 	Name:  "server",
 	Usage: "ezBookkeeping web server operation",
-	Subcommands: []*cli.Command{
+	Commands: []*cli.Command{
 		{
 			Name:   "run",
 			Usage:  "Run ezBookkeeping web server",
-			Action: startWebServer,
+			Action: bindAction(startWebServer),
 		},
 	},
 }

-func startWebServer(c *cli.Context) error {
+func startWebServer(c *core.CliContext) error {
 	config, err := initializeSystem(c)

 	if err != nil {
 		return err
 	}

-	log.BootInfof("[webserver.startWebServer] static root path is %s", config.StaticRootPath)
+	log.BootInfof(c, "[webserver.startWebServer] static root path is %s", config.StaticRootPath)

 	if config.AutoUpdateDatabase {
-		err = updateAllDatabaseTablesStructure()
+		err = updateAllDatabaseTablesStructure(c)

 		if err != nil {
-			log.BootErrorf("[webserver.startWebServer] update database table structure failed, because %s", err.Error())
+			log.BootErrorf(c, "[webserver.startWebServer] update database table structure failed, because %s", err.Error())
 			return err
 		}
 	}

-	err = requestid.InitializeRequestIdGenerator(config)
+	err = requestid.InitializeRequestIdGenerator(c, config)

 	if err != nil {
-		log.BootErrorf("[webserver.startWebServer] initializes requestid generator failed, because %s", err.Error())
+		log.BootErrorf(c, "[webserver.startWebServer] initializes requestid generator failed, because %s", err.Error())
 		return err
 	}

-	serverInfo := fmt.Sprintf("current server id is %d, current instance id is %d", requestid.Container.Current.GetCurrentServerUniqId(), requestid.Container.Current.GetCurrentInstanceUniqId())
+	err = mcp.InitializeMCPHandlers(config)
+
+	if err != nil {
+		log.BootErrorf(c, "[webserver.startWebServer] initializes mcp handlers failed, because %s", err.Error())
+		return err
+	}
+
+	err = cron.InitializeCronJobSchedulerContainer(c, config, true)
+
+	if err != nil {
+		log.BootErrorf(c, "[webserver.startWebServer] initializes cron job scheduler failed, because %s", err.Error())
+		return err
+	}
+
+	serverInfo := fmt.Sprintf("current server id is %d, current instance id is %d", requestid.Container.GetCurrentServerUniqId(), requestid.Container.GetCurrentInstanceUniqId())
 	uuidServerInfo := ""
 	if config.UuidGeneratorType == settings.InternalUuidGeneratorType {
 		uuidServerInfo = fmt.Sprintf(", current uuid server id is %d", config.UuidServerId)
 	}

-	log.BootInfof("[webserver.startWebServer] %s%s", serverInfo, uuidServerInfo)
+	log.BootInfof(c, "[webserver.startWebServer] %s%s", serverInfo, uuidServerInfo)

 	if config.Mode == settings.MODE_PRODUCTION {
 		gin.SetMode(gin.ReleaseMode)
@@ -90,11 +107,14 @@ func startWebServer(c *cli.Context) error {
 		_ = v.RegisterValidation("validCurrency", validators.ValidCurrency)
 		_ = v.RegisterValidation("validHexRGBColor", validators.ValidHexRGBColor)
 		_ = v.RegisterValidation("validAmountFilter", validators.ValidAmountFilter)
+		_ = v.RegisterValidation("validFiscalYearStart", validators.ValidateFiscalYearStart)
 	}

 	router.NoRoute(bindApi(api.Default.ApiNotFound))
 	router.NoMethod(bindApi(api.Default.MethodNotAllowed))

+	serverSettingsCacheStore := persistence.NewInMemoryStore(time.Minute)
+
 	router.StaticFile("/", filepath.Join(config.StaticRootPath, "index.html"))
 	router.Static("/js", filepath.Join(config.StaticRootPath, "js"))
 	router.Static("/css", filepath.Join(config.StaticRootPath, "css"))
@@ -106,12 +126,14 @@ func startWebServer(c *cli.Context) error {
 	router.StaticFile("favicon.png", filepath.Join(config.StaticRootPath, "favicon.png"))
 	router.StaticFile("touchicon.png", filepath.Join(config.StaticRootPath, "touchicon.png"))
 	router.StaticFile("manifest.json", filepath.Join(config.StaticRootPath, "manifest.json"))
+	router.StaticFile("sw.js", filepath.Join(config.StaticRootPath, "sw.js"))
+	router.GET("/server_settings.js", bindCachedJs(api.ServerSettings.ServerSettingsJavascriptHandler, serverSettingsCacheStore))

-	mobileEntryRoute := router.Group("/mobile")
-	mobileEntryRoute.Use(bindMiddleware(middlewares.ServerSettingsCookie(config)))
-	{
-		mobileEntryRoute.StaticFile("/", filepath.Join(config.StaticRootPath, "mobile.html"))
+	for i := 0; i < len(workboxFileNames); i++ {
+		router.StaticFile("/"+workboxFileNames[i], filepath.Join(config.StaticRootPath, workboxFileNames[i]))
 	}
+
+	router.StaticFile("/mobile", filepath.Join(config.StaticRootPath, "mobile.html"))
 	router.Static("/mobile/js", filepath.Join(config.StaticRootPath, "js"))
 	router.Static("/mobile/css", filepath.Join(config.StaticRootPath, "css"))
 	router.Static("/mobile/img", filepath.Join(config.StaticRootPath, "img"))
@@ -121,16 +143,13 @@ func startWebServer(c *cli.Context) error {
 	router.StaticFile("/mobile/touchicon.png", filepath.Join(config.StaticRootPath, "touchicon.png"))
 	router.StaticFile("/mobile/manifest.json", filepath.Join(config.StaticRootPath, "manifest.json"))
 	router.StaticFile("/mobile/sw.js", filepath.Join(config.StaticRootPath, "sw.js"))
+	router.GET("/mobile/server_settings.js", bindCachedJs(api.ServerSettings.ServerSettingsJavascriptHandler, serverSettingsCacheStore))

 	for i := 0; i < len(workboxFileNames); i++ {
 		router.StaticFile("/mobile/"+workboxFileNames[i], filepath.Join(config.StaticRootPath, workboxFileNames[i]))
 	}

-	desktopEntryRoute := router.Group("/desktop")
-	desktopEntryRoute.Use(bindMiddleware(middlewares.ServerSettingsCookie(config)))
-	{
-		desktopEntryRoute.StaticFile("/", filepath.Join(config.StaticRootPath, "desktop.html"))
-	}
+	router.StaticFile("/desktop", filepath.Join(config.StaticRootPath, "desktop.html"))
 	router.Static("/desktop/js", filepath.Join(config.StaticRootPath, "js"))
 	router.Static("/desktop/css", filepath.Join(config.StaticRootPath, "css"))
 	router.Static("/desktop/img", filepath.Join(config.StaticRootPath, "img"))
@@ -140,12 +159,13 @@ func startWebServer(c *cli.Context) error {
 	router.StaticFile("/desktop/touchicon.png", filepath.Join(config.StaticRootPath, "touchicon.png"))
 	router.StaticFile("/desktop/manifest.json", filepath.Join(config.StaticRootPath, "manifest.json"))
 	router.StaticFile("/desktop/sw.js", filepath.Join(config.StaticRootPath, "sw.js"))
+	router.GET("/desktop/server_settings.js", bindCachedJs(api.ServerSettings.ServerSettingsJavascriptHandler, serverSettingsCacheStore))

 	for i := 0; i < len(workboxFileNames); i++ {
 		router.StaticFile("/desktop/"+workboxFileNames[i], filepath.Join(config.StaticRootPath, workboxFileNames[i]))
 	}

-	if config.AvatarProvider == settings.InternalAvatarProvider {
+	if config.AvatarProvider == core.USER_AVATAR_PROVIDER_INTERNAL {
 		avatarRoute := router.Group("/avatar")
 		avatarRoute.Use(bindMiddleware(middlewares.JWTAuthorizationByQueryString))
 		{
@@ -153,12 +173,15 @@ func startWebServer(c *cli.Context) error {
 		}
 	}

-	router.GET("/healthz.json", bindApi(api.Healths.HealthStatusHandler))
-
-	if config.Mode == settings.MODE_DEVELOPMENT {
-		devRoute := router.Group("/dev")
-		devRoute.GET("/cookies", bindMiddleware(middlewares.ServerSettingsCookie(config)))
+	if config.EnableTransactionPictures {
+		pictureRoute := router.Group("/pictures")
+		pictureRoute.Use(bindMiddleware(middlewares.JWTAuthorizationByQueryString))
+		{
+			pictureRoute.GET("/:fileName", bindImage(api.TransactionPictures.TransactionPictureGetHandler))
 		}
+	}
+
+	router.GET("/healthz.json", bindApi(api.Healths.HealthStatusHandler))

 	proxyRoute := router.Group("/proxy")
 	proxyRoute.Use(bindMiddleware(middlewares.JWTAuthorizationByQueryString))
@@ -198,6 +221,27 @@ func startWebServer(c *cli.Context) error {
 		qrCodeRoute.GET("/mobile_url.png", bindCachedImage(api.QrCodes.MobileUrlQrCodeHandler, qrCodeCacheStore))
 	}

+	if config.EnableMCPServer {
+		mcpRoute := router.Group("/mcp")
+		mcpRoute.Use(bindMiddleware(middlewares.RequestId(config)))
+		mcpRoute.Use(bindMiddleware(middlewares.RequestLog))
+		mcpRoute.Use(bindMiddleware(middlewares.MCPServerIpLimit(config)))
+		mcpRoute.Use(bindMiddleware(middlewares.JWTMCPAuthorization))
+		{
+			mcpRoute.POST("", bindJSONRPCApi(map[string]core.JSONRPCApiHandlerFunc{
+				"initialize":     api.ModelContextProtocols.InitializeHandler,
+				"resources/list": api.ModelContextProtocols.ListResourcesHandler,
+				"resources/read": api.ModelContextProtocols.ReadResourceHandler,
+				"tools/list":     api.ModelContextProtocols.ListToolsHandler,
+				"tools/call":     api.ModelContextProtocols.CallToolHandler,
+				"ping":           api.ModelContextProtocols.PingHandler,
+			}, map[string]int{
+				"notifications/initialized": http.StatusAccepted,
+			}))
+			mcpRoute.GET("", bindApi(api.Default.MethodNotAllowed))
+		}
+	}
+
 	apiRoute := router.Group("/api")

 	apiRoute.Use(bindMiddleware(middlewares.RequestId(config)))
@@ -245,6 +289,7 @@ func startWebServer(c *cli.Context) error {
 		{
 			// Tokens
 			apiV1Route.GET("/tokens/list.json", bindApi(api.Tokens.TokenListHandler))
+			apiV1Route.POST("/tokens/generate/mcp.json", bindApi(api.Tokens.TokenGenerateMCPHandler))
 			apiV1Route.POST("/tokens/revoke.json", bindApi(api.Tokens.TokenRevokeHandler))
 			apiV1Route.POST("/tokens/revoke_all.json", bindApi(api.Tokens.TokenRevokeAllHandler))
 			apiV1Route.POST("/tokens/refresh.json", bindApiWithTokenUpdate(api.Tokens.TokenRefreshHandler, config))
@@ -253,7 +298,7 @@ func startWebServer(c *cli.Context) error {
 			apiV1Route.GET("/users/profile/get.json", bindApi(api.Users.UserProfileHandler))
 			apiV1Route.POST("/users/profile/update.json", bindApiWithTokenUpdate(api.Users.UserUpdateProfileHandler, config))

-			if config.AvatarProvider == settings.InternalAvatarProvider {
+			if config.AvatarProvider == core.USER_AVATAR_PROVIDER_INTERNAL {
 				apiV1Route.POST("/users/avatar/update.json", bindApi(api.Users.UserUpdateAvatarHandler))
 				apiV1Route.POST("/users/avatar/remove.json", bindApi(api.Users.UserRemoveAvatarHandler))
 			}
@@ -262,6 +307,11 @@ func startWebServer(c *cli.Context) error {
 				apiV1Route.POST("/users/verify_email/resend.json", bindApi(api.Users.UserSendVerifyEmailByLoginedUserHandler))
 			}

+			// Application Cloud Settings
+			apiV1Route.GET("/users/settings/cloud/get.json", bindApi(api.UserApplicationCloudSettings.ApplicationSettingsGetHandler))
+			apiV1Route.POST("/users/settings/cloud/update.json", bindApi(api.UserApplicationCloudSettings.ApplicationSettingsUpdateHandler))
+			apiV1Route.POST("/users/settings/cloud/disable.json", bindApi(api.UserApplicationCloudSettings.ApplicationSettingsDisableHandler))
+
 			// Two-Factor Authorization
 			if config.EnableTwoFactor {
 				apiV1Route.GET("/users/2fa/status.json", bindApi(api.TwoFactorAuthorizations.TwoFactorStatusHandler))
@@ -273,7 +323,8 @@ func startWebServer(c *cli.Context) error {

 			// Data
 			apiV1Route.GET("/data/statistics.json", bindApi(api.DataManagements.DataStatisticsHandler))
-			apiV1Route.POST("/data/clear.json", bindApi(api.DataManagements.ClearDataHandler))
+			apiV1Route.POST("/data/clear/all.json", bindApi(api.DataManagements.ClearAllDataHandler))
+			apiV1Route.POST("/data/clear/transactions.json", bindApi(api.DataManagements.ClearAllTransactionsHandler))

 			if config.EnableDataExport {
 				apiV1Route.GET("/data/export.csv", bindCsv(api.DataManagements.ExportDataToEzbookkeepingCSVHandler))
@@ -288,11 +339,13 @@ func startWebServer(c *cli.Context) error {
 			apiV1Route.POST("/accounts/hide.json", bindApi(api.Accounts.AccountHideHandler))
 			apiV1Route.POST("/accounts/move.json", bindApi(api.Accounts.AccountMoveHandler))
 			apiV1Route.POST("/accounts/delete.json", bindApi(api.Accounts.AccountDeleteHandler))
+			apiV1Route.POST("/accounts/sub_account/delete.json", bindApi(api.Accounts.SubAccountDeleteHandler))

 			// Transactions
 			apiV1Route.GET("/transactions/count.json", bindApi(api.Transactions.TransactionCountHandler))
 			apiV1Route.GET("/transactions/list.json", bindApi(api.Transactions.TransactionListHandler))
 			apiV1Route.GET("/transactions/list/by_month.json", bindApi(api.Transactions.TransactionMonthListHandler))
+			apiV1Route.GET("/transactions/reconciliation_statements.json", bindApi(api.Transactions.TransactionReconciliationStatementHandler))
 			apiV1Route.GET("/transactions/statistics.json", bindApi(api.Transactions.TransactionStatisticsHandler))
 			apiV1Route.GET("/transactions/statistics/trends.json", bindApi(api.Transactions.TransactionStatisticsTrendsHandler))
 			apiV1Route.GET("/transactions/amounts.json", bindApi(api.Transactions.TransactionAmountsHandler))
@@ -301,6 +354,19 @@ func startWebServer(c *cli.Context) error {
 			apiV1Route.POST("/transactions/modify.json", bindApi(api.Transactions.TransactionModifyHandler))
 			apiV1Route.POST("/transactions/delete.json", bindApi(api.Transactions.TransactionDeleteHandler))

+			if config.EnableDataImport {
+				apiV1Route.POST("/transactions/parse_dsv_file.json", bindApi(api.Transactions.TransactionParseImportDsvFileDataHandler))
+				apiV1Route.POST("/transactions/parse_import.json", bindApi(api.Transactions.TransactionParseImportFileHandler))
+				apiV1Route.POST("/transactions/import.json", bindApi(api.Transactions.TransactionImportHandler))
+				apiV1Route.GET("/transactions/import/process.json", bindApi(api.Transactions.TransactionImportProcessHandler))
+			}
+
+			// Transaction Pictures
+			if config.EnableTransactionPictures {
+				apiV1Route.POST("/transaction/pictures/upload.json", bindApi(api.TransactionPictures.TransactionPictureUploadHandler))
+				apiV1Route.POST("/transaction/pictures/remove_unused.json", bindApi(api.TransactionPictures.TransactionPictureRemoveUnusedHandler))
+			}
+
 			// Transaction Categories
 			apiV1Route.GET("/transaction/categories/list.json", bindApi(api.TransactionCategories.CategoryListHandler))
 			apiV1Route.GET("/transaction/categories/get.json", bindApi(api.TransactionCategories.CategoryGetHandler))
@@ -315,6 +381,7 @@ func startWebServer(c *cli.Context) error {
 			apiV1Route.GET("/transaction/tags/list.json", bindApi(api.TransactionTags.TagListHandler))
 			apiV1Route.GET("/transaction/tags/get.json", bindApi(api.TransactionTags.TagGetHandler))
 			apiV1Route.POST("/transaction/tags/add.json", bindApi(api.TransactionTags.TagCreateHandler))
+			apiV1Route.POST("/transaction/tags/add_batch.json", bindApi(api.TransactionTags.TagCreateBatchHandler))
 			apiV1Route.POST("/transaction/tags/modify.json", bindApi(api.TransactionTags.TagModifyHandler))
 			apiV1Route.POST("/transaction/tags/hide.json", bindApi(api.TransactionTags.TagHideHandler))
 			apiV1Route.POST("/transaction/tags/move.json", bindApi(api.TransactionTags.TagMoveHandler))
@@ -331,26 +398,31 @@ func startWebServer(c *cli.Context) error {

 			// Exchange Rates
 			apiV1Route.GET("/exchange_rates/latest.json", bindApi(api.ExchangeRates.LatestExchangeRateHandler))
+			apiV1Route.POST("/exchange_rates/user_custom/update.json", bindApi(api.ExchangeRates.UserCustomExchangeRateUpdateHandler))
+			apiV1Route.POST("/exchange_rates/user_custom/delete.json", bindApi(api.ExchangeRates.UserCustomExchangeRateDeleteHandler))
+
+			// System
+			apiV1Route.GET("/systems/version.json", bindApi(api.Systems.VersionHandler))
 		}
 	}

 	listenAddr := fmt.Sprintf("%s:%d", config.HttpAddr, config.HttpPort)

 	if config.Protocol == settings.SCHEME_SOCKET {
-		log.BootInfof("[webserver.startWebServer] will run at socks:%s", config.UnixSocketPath)
+		log.BootInfof(c, "[webserver.startWebServer] will run at socks:%s", config.UnixSocketPath)
 		err = router.RunUnix(config.UnixSocketPath)
 	} else if config.Protocol == settings.SCHEME_HTTP {
-		log.BootInfof("[webserver.startWebServer] will run at http://%s", listenAddr)
+		log.BootInfof(c, "[webserver.startWebServer] will run at http://%s", listenAddr)
 		err = router.Run(listenAddr)
 	} else if config.Protocol == settings.SCHEME_HTTPS {
-		log.BootInfof("[webserver.startWebServer] will run at https://%s", listenAddr)
+		log.BootInfof(c, "[webserver.startWebServer] will run at https://%s", listenAddr)
 		err = router.RunTLS(listenAddr, config.CertFile, config.CertKeyFile)
 	} else {
 		err = errs.ErrInvalidProtocol
 	}

 	if err != nil {
-		log.BootErrorf("[webserver.startWebServer] cannot start, because %s", err)
+		log.BootErrorf(c, "[webserver.startWebServer] cannot start, because %s", err)
 		return err
 	}

@@ -359,13 +431,13 @@ func startWebServer(c *cli.Context) error {

 func bindMiddleware(fn core.MiddlewareHandlerFunc) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		fn(core.WrapContext(c))
+		fn(core.WrapWebContext(c))
 	}
 }

 func bindApi(fn core.ApiHandlerFunc) gin.HandlerFunc {
 	return func(ginCtx *gin.Context) {
-		c := core.WrapContext(ginCtx)
+		c := core.WrapWebContext(ginCtx)
 		result, err := fn(c)

 		if err != nil {
@@ -378,7 +450,7 @@ func bindApi(fn core.ApiHandlerFunc) gin.HandlerFunc {

 func bindApiWithTokenUpdate(fn core.ApiHandlerFunc, config *settings.Config) gin.HandlerFunc {
 	return func(ginCtx *gin.Context) {
-		c := core.WrapContext(ginCtx)
+		c := core.WrapWebContext(ginCtx)
 		result, err := fn(c)

 		if err == nil && config.MapProvider == settings.AmapProvider && config.AmapSecurityVerificationMethod == settings.AmapSecurityVerificationInternalProxyMethod {
@@ -393,9 +465,72 @@ func bindApiWithTokenUpdate(fn core.ApiHandlerFunc, config *settings.Config) gin
 	}
 }

+func bindJSONRPCApi(fns map[string]core.JSONRPCApiHandlerFunc, skipMethods map[string]int) gin.HandlerFunc {
+	return func(ginCtx *gin.Context) {
+		c := core.WrapWebContext(ginCtx)
+
+		var jsonRPCRequest core.JSONRPCRequest
+		reqErr := c.ShouldBindBodyWithJSON(&jsonRPCRequest)
+
+		if reqErr != nil {
+			utils.PrintJSONRPCErrorResult(c, nil, errs.NewIncompleteOrIncorrectSubmissionError(reqErr))
+			return
+		}
+
+		if skipMethods != nil {
+			httpStatusCode, exists := skipMethods[jsonRPCRequest.Method]
+
+			if exists {
+				c.AbortWithStatus(httpStatusCode)
+				return
+			}
+		}
+
+		fn, exists := fns[jsonRPCRequest.Method]
+
+		if !exists {
+			utils.PrintJSONRPCErrorResult(c, &jsonRPCRequest, errs.ErrApiNotFound)
+			return
+		}
+
+		result, err := fn(c, &jsonRPCRequest)
+
+		if err != nil {
+			utils.PrintJSONRPCErrorResult(c, &jsonRPCRequest, err)
+		} else {
+			utils.PrintJSONRPCSuccessResult(c, &jsonRPCRequest, result)
+		}
+	}
+}
+
+func bindEventStreamApi(fn core.EventStreamApiHandlerFunc) gin.HandlerFunc {
+	return func(ginCtx *gin.Context) {
+		c := core.WrapWebContext(ginCtx)
+		utils.SetEventStreamHeader(c)
+		err := fn(c)
+
+		if err != nil {
+			utils.WriteEventStreamJsonErrorResult(c, err)
+		}
+	}
+}
+
+func bindCachedJs(fn core.DataHandlerFunc, store persistence.CacheStore) gin.HandlerFunc {
+	return cache.CachePage(store, time.Minute, func(ginCtx *gin.Context) {
+		c := core.WrapWebContext(ginCtx)
+		result, _, err := fn(c)
+
+		if err != nil {
+			utils.PrintDataErrorResult(c, "text/javascript", err)
+		} else {
+			utils.PrintDataSuccessResult(c, "text/javascript", "", result)
+		}
+	})
+}
+
 func bindCsv(fn core.DataHandlerFunc) gin.HandlerFunc {
 	return func(ginCtx *gin.Context) {
-		c := core.WrapContext(ginCtx)
+		c := core.WrapWebContext(ginCtx)
 		result, fileName, err := fn(c)

 		if err != nil {
@@ -408,7 +543,7 @@ func bindCsv(fn core.DataHandlerFunc) gin.HandlerFunc {

 func bindTsv(fn core.DataHandlerFunc) gin.HandlerFunc {
 	return func(ginCtx *gin.Context) {
-		c := core.WrapContext(ginCtx)
+		c := core.WrapWebContext(ginCtx)
 		result, fileName, err := fn(c)

 		if err != nil {
@@ -421,7 +556,7 @@ func bindTsv(fn core.DataHandlerFunc) gin.HandlerFunc {

 func bindImage(fn core.ImageHandlerFunc) gin.HandlerFunc {
 	return func(ginCtx *gin.Context) {
-		c := core.WrapContext(ginCtx)
+		c := core.WrapWebContext(ginCtx)
 		result, contentType, err := fn(c)

 		if err != nil {
@@ -434,7 +569,7 @@ func bindImage(fn core.ImageHandlerFunc) gin.HandlerFunc {

 func bindCachedImage(fn core.ImageHandlerFunc, store persistence.CacheStore) gin.HandlerFunc {
 	return cache.CachePage(store, time.Minute, func(ginCtx *gin.Context) {
-		c := core.WrapContext(ginCtx)
+		c := core.WrapWebContext(ginCtx)
 		result, contentType, err := fn(c)

 		if err != nil {
@@ -447,7 +582,7 @@ func bindCachedImage(fn core.ImageHandlerFunc, store persistence.CacheStore) gin

 func bindProxy(fn core.ProxyHandlerFunc) gin.HandlerFunc {
 	return func(ginCtx *gin.Context) {
-		c := core.WrapContext(ginCtx)
+		c := core.WrapWebContext(ginCtx)
 		proxy, err := fn(c)

 		if err != nil {
@@ -37,6 +37,13 @@ enable_gzip = false
 # Set to true to log each request and execution time
 log_request = true

+[mcp]
+# Set to true to enable MCP (Model Context Protocol) server (via http / https web server) for AI/LLM access
+enable_mcp = false
+
+# MCP server allowed remote IPs, a comma-separated list of allowed remote IPs (asterisk * for any addresses, e.g. 192.168.1.* means any IPs in the 192.168.1.x subnet), leave blank to allow all remote IPs
+mcp_allowed_remote_ips =
+
 [database]
 # Either "mysql", "postgres" or "sqlite3"
 type = sqlite3
@@ -108,7 +115,7 @@ log_file_max_size = 104857600
 log_file_max_days = 7

 [storage]
-# Object storage type, supports "local_filesystem" and "minio" currently
+# Object storage type, supports "local_filesystem", "minio" and "webdav" currently
 type = local_filesystem

 # For "local_filesystem" storage only, the storage root path (relative or absolute path)
@@ -132,6 +139,28 @@ minio_bucket = ezbookkeeping
 # For "minio" storage only, the root path to store files in minio
 minio_root_path = /

+# For "webdav" storage only, the webdav url
+webdav_url =
+
+# For "webdav" storage only, the webdav username
+webdav_username =
+
+# For "webdav" storage only, the webdav password
+webdav_password =
+
+# For "webdav" storage only, the webdav root path to store files
+webdav_root_path = /
+
+# For "webdav" storage only, requesting webdav url timeout (0 - 4294967295 milliseconds)
+# Set to 0 to disable timeout for requesting webdav url, default is 10000 (10 seconds)
+webdav_request_timeout = 10000
+
+# For "webdav" storage only, proxy for requesting webdav url, supports "system" (use system proxy), "none" (do not use proxy), or proxy URL which starts with "http://", "https://" or "socks5://", default is "system"
+webdav_proxy = system
+
+# For "webdav" storage only, set to true to skip tls verification when connect webdav
+webdav_skip_tls_verify = false
+
 [uuid]
 # Uuid generator type, supports "internal" currently
 generator_type = internal
@@ -146,10 +175,17 @@ checker_type = in_memory
 # For "in_memory" duplicate checker only, cleanup expired data interval seconds (1 - 4294967295), default is 60 (1 minutes)
 cleanup_interval = 60

-# The minimum interval seconds (0 - 4294967295) between duplicate submissions on the same page (exiting and re-entering the page is considered as a new session)
+# The minimum interval seconds (0 - 4294967295) between duplicate submissions on the same page (exiting and re-entering the edit page / edit dialog is considered as a new session)
 # Set to 0 to disable duplicate checker for new data submissions, default is 300 (5 minutes)
 duplicate_submissions_interval = 300

+[cron]
+# Set to true to clean up expired tokens periodically
+enable_remove_expired_tokens = true
+
+# Set to true to create scheduled transactions based on the user's templates
+enable_create_scheduled_transaction = true
+
 [security]
 # Used for signing, you must change it to keep your user data safe before you first run ezBookkeeping
 secret_key =
@@ -173,6 +209,12 @@ email_verify_token_expired_time = 3600
 # Password reset token expired seconds (60 - 4294967295), default is 3600 (60 minutes)
 password_reset_token_expired_time = 3600

+# Maximum count of password / token check failures (0 - 4294967295) per IP per minute (use the above duplicate checker), default is 5, set to 0 to disable
+max_failures_per_ip_per_minute = 5
+
+# Maximum count of password / token check failures (0 - 4294967295) per user per minute (use the above duplicate checker), default is 5, set to 0 to disable
+max_failures_per_user_per_minute = 5
+
 # Add X-Request-Id header to response to track user request or error, default is true
 request_id_header = true

@@ -192,23 +234,67 @@ enable_forget_password = true
 # Set to true to require email must be verified when use forget password
 forget_password_require_email_verify = false

+# Set to true to allow users to upload transaction pictures
+enable_transaction_picture = true
+
+# Maximum allowed transaction picture file size (1 - 4294967295 bytes)
+max_transaction_picture_size = 10485760
+
+# Set to true to allow users to create scheduled transaction
+enable_scheduled_transaction = true
+
 # User avatar provider, supports the following types:
 # "internal": Use the internal object storage to store user avatar (refer to "storage" settings), supports updating avatar by user self
 # "gravatar": https://gravatar.com
 # Leave blank if you want to disable user avatar
 avatar_provider = internal

+# For "internal" avatar provider only, maximum allowed user avatar file size (1 - 4294967295 bytes)
+max_user_avatar_size = 1048576
+
+# The default feature restrictions after user registration (feature types separated by commas), leave blank for no restrictions
+# Supports the following feature types:
+# 1: Update Password
+# 2: Update Email
+# 3: Update Profile Basic Info
+# 4: Update Avatar
+# 5: Logout Other Session
+# 6: Enable Two-Factor Authentication
+# 7: Disable Enable Two-Factor Authentication
+# 8: Forget Password
+# 9: Import Transactions
+# 10: Export Transactions
+# 11: Clear All Data
+# 12: Sync Application Settings
+# 13: MCP (Model Context Protocol) Access
+default_feature_restrictions =
+
 [data]
 # Set to true to allow users to export their data
 enable_export = true

+# Set to true to allow users to import their data
+enable_import = true
+
+# Maximum allowed import file size (1 - 4294967295 bytes)
+max_import_file_size = 10485760
+
+[tip]
+# Set to true to display custom tips in login page
+enable_tips_in_login_page = false
+
+# The custom tips displayed in login page, it supports multi-language configuration
+# Add an underscore and a language tag after the setting key to configure the notification content in that language, the same below
+# For example, login_page_tips_content_zh_hans means the notification content in Chinese (Simplified)
+login_page_tips_content =
+
 [notification]
 # Set to true to display custom notification in home page every time users register
 enable_notification_after_register = false

 # The notification content displayed each time users register, it supports multi-language configuration
 # Add an underscore and a language tag after the setting key to configure the notification content in that language, the same below
-# For example, after_login_notification_content_zh_hans means the notification content in Simplified Chinese
+# For example, after_login_notification_content_zh_hans means the notification content in Chinese (Simplified)
 after_register_notification_content =

 # Set to true to display custom notification in home page every time users login
@@ -266,7 +352,7 @@ amap_application_key =
 # "external_proxy": use an external proxy to request amap api (amap application secret should be set by external proxy)
 # "plain_text": append amap application secret to frontend request directly (insecurity for public network)
 # Please visit https://developer.amap.com/api/jsapi-v2/guide/abc/load for more information
-amap_security_verification_method = plain_text
+amap_security_verification_method = internal_proxy

 # For "amap" map provider only, Amap JavaScript API application secret, this setting must be provided when "amap_security_verification_method" is set to "internal_proxy" or "plain_text", please visit https://lbs.amap.com/api/javascript-api/guide/abc/prepare for more information
 amap_application_secret =
@@ -291,12 +377,24 @@ custom_map_tile_server_default_zoom_level = 14

 [exchange_rates]
 # Exchange rates data source, supports the following types:
-# "euro_central_bank"
-# "bank_of_canada"
-# "reserve_bank_of_australia",
-# "czech_national_bank"
-# "national_bank_of_poland"
-# "monetary_authority_of_singapore"
+# "reserve_bank_of_australia": https://www.rba.gov.au/statistics/frequency/exchange-rates.html
+# "bank_of_canada": https://www.bankofcanada.ca/rates/exchange/daily-exchange-rates/
+# "czech_national_bank": https://www.cnb.cz/en/financial-markets/foreign-exchange-market/central-bank-exchange-rate-fixing/central-bank-exchange-rate-fixing/
+# "danmarks_national_bank": https://www.nationalbanken.dk/en/what-we-do/stable-prices-monetary-policy-and-the-danish-economy/exchange-rates
+# "euro_central_bank": https://www.ecb.europa.eu/stats/policy_and_exchange_rates/euro_reference_exchange_rates/html/index.en.html
+# "national_bank_of_georgia": https://nbg.gov.ge/en/monetary-policy/currency
+# "central_bank_of_hungary": https://www.mnb.hu/en/arfolyamok
+# "bank_of_israel": https://www.boi.org.il/en/economic-roles/financial-markets/exchange-rates/
+# "central_bank_of_myanmar": https://forex.cbm.gov.mm/index.php/fxrate
+# "norges_bank": https://www.norges-bank.no/en/topics/Statistics/exchange_rates/
+# "national_bank_of_poland": https://nbp.pl/en/statistic-and-financial-reporting/rates/
+# "national_bank_of_romania": https://www.bnr.ro/Exchange-rates-1224.aspx
+# "bank_of_russia": https://www.cbr.ru/eng/currency_base/daily/
+# "swiss_national_bank": https://www.snb.ch/en/the-snb/mandates-goals/statistics/statistics-pub/current_interest_exchange_rates
+# "national_bank_of_ukraine": https://bank.gov.ua/ua/markets/exchangerates
+# "central_bank_of_uzbekistan": https://cbu.uz/en/arkhiv-kursov-valyut/
+# "international_monetary_fund": https://www.imf.org/external/np/fin/data/param_rms_mth.aspx
+# "user_custom": users set their own exchange rates data in the UI
 data_source = euro_central_bank

 # Requesting exchange rates data timeout (0 - 4294967295 milliseconds)
@@ -0,0 +1,31 @@
+import pluginVue from 'eslint-plugin-vue';
+import vueTsEslintConfig from '@vue/eslint-config-typescript';
+
+export default [
+    ...pluginVue.configs['flat/essential'],
+    ...vueTsEslintConfig(),
+    {
+        languageOptions: {
+            parserOptions: {
+                projectService: true,
+                tsconfigRootDir: import.meta.dirname,
+            }
+        },
+    },
+    {
+        ignores: [
+            'dist/**',
+            '**/*.{js,jsx,cjs,mjs}'
+        ]
+    },
+    {
+        files: [
+            '**/*.{vue,ts,tsx,mts,js,jsx,cjs,mjs}'
+        ],
+        rules: {
+            'vue/valid-v-slot': ['error', {
+                allowModifiers: true
+            }]
+        }
+    },
+];
@@ -1,5 +1,5 @@
 [Unit]
-Description=ezBookkeeping, a lightweight personal bookkeeping app hosted by yourself.
+Description=ezBookkeeping, a lightweight, self-hosted personal finance app with a sleek, user-friendly interface and powerful bookkeeping features.
 After=syslog.target
 After=network.target
 After=mariadb.service mysqld.service postgresql.service
@@ -1,12 +1,13 @@
 package main

 import (
+	"context"
 	"fmt"
 	"log"
 	"os"
 	"strings"

-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"

 	"github.com/mayswind/ezbookkeeping/cmd"
 	"github.com/mayswind/ezbookkeeping/pkg/settings"
@@ -27,15 +28,17 @@ var (
 func main() {
 	settings.Version = Version
 	settings.CommitHash = CommitHash
+	settings.BuildTime = BuildUnixTime

-	app := &cli.App{
+	cmd := &cli.Command{
 		Name:    "ezBookkeeping",
-		Usage:   "A lightweight personal bookkeeping app hosted by yourself.",
+		Usage:   "A lightweight, self-hosted personal finance app with a user-friendly interface and powerful bookkeeping features.",
 		Version: GetFullVersion(),
 		Commands: []*cli.Command{
 			cmd.WebServer,
 			cmd.Database,
 			cmd.UserData,
+			cmd.CronJobs,
 			cmd.SecurityUtils,
 			cmd.Utilities,
 		},
@@ -51,7 +54,7 @@ func main() {
 		},
 	}

-	err := app.Run(os.Args)
+	err := cmd.Run(context.Background(), os.Args)

 	if err != nil {
 		log.Fatalf("Failed to run ezBookkeeping with %s: %v", os.Args, err)
@@ -1,78 +1,98 @@
 module github.com/mayswind/ezbookkeeping

-go 1.21
+go 1.24

 require (
-	github.com/boombuler/barcode v1.0.2
-	github.com/gin-contrib/cache v1.3.0
-	github.com/gin-contrib/gzip v1.0.1
-	github.com/gin-gonic/gin v1.10.0
-	github.com/go-playground/validator/v10 v10.22.0
-	github.com/go-sql-driver/mysql v1.8.1
-	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/boombuler/barcode v1.1.0
+	github.com/extrame/xls v0.0.2-0.20200426124601-4a6cf263071b
+	github.com/gin-contrib/cache v1.4.1
+	github.com/gin-contrib/gzip v1.2.3
+	github.com/gin-gonic/gin v1.10.1
+	github.com/go-co-op/gocron/v2 v2.16.3
+	github.com/go-playground/validator/v10 v10.27.0
+	github.com/go-sql-driver/mysql v1.9.3
+	github.com/golang-jwt/jwt/v5 v5.3.0
+	github.com/invopop/jsonschema v0.13.0
 	github.com/lib/pq v1.10.9
-	github.com/mattn/go-sqlite3 v1.14.22
-	github.com/minio/minio-go/v7 v7.0.74
+	github.com/mattn/go-sqlite3 v1.14.30
+	github.com/minio/minio-go/v7 v7.0.95
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pquerna/otp v1.4.0
+	github.com/pquerna/otp v1.5.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.9.0
-	github.com/urfave/cli/v2 v2.27.1
+	github.com/stretchr/testify v1.10.0
+	github.com/urfave/cli/v3 v3.3.8
 	github.com/wk8/go-ordered-map/v2 v2.1.8
-	golang.org/x/crypto v0.25.0
+	github.com/xuri/excelize/v2 v2.9.0
+	golang.org/x/crypto v0.40.0
+	golang.org/x/net v0.42.0
+	golang.org/x/text v0.27.0
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/mail.v2 v2.3.1
 	xorm.io/builder v0.3.13
-	xorm.io/xorm v1.3.9
+	xorm.io/xorm v1.3.10
 )

 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
-	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 // indirect
+	github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/bytedance/sonic v1.11.6 // indirect
-	github.com/bytedance/sonic/loader v0.1.1 // indirect
+	github.com/bytedance/sonic v1.13.3 // indirect
+	github.com/bytedance/sonic/loader v0.2.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/extrame/goyymmdd v0.0.0-20210114090516-7cc815f00d1a // indirect
+	github.com/extrame/ole2 v0.0.0-20160812065207-d69429661ad7 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
+	github.com/gin-contrib/sse v1.1.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/gomodule/redigo v1.8.9 // indirect
+	github.com/gomodule/redigo v1.9.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/jonboulle/clockwork v0.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.11 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/memcachier/mc/v3 v3.0.3 // indirect
+	github.com/minio/crc64nvme v1.0.2 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/philhofer/fwd v1.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/richardlehane/mscfb v1.0.4 // indirect
+	github.com/richardlehane/msoleps v1.0.4 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
 	github.com/robfig/go-cache v0.0.0-20130306151617-9fc39e0dbf62 // indirect
-	github.com/rs/xid v1.5.0 // indirect
+	github.com/rs/xid v1.6.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/syndtr/goleveldb v1.0.0 // indirect
+	github.com/tealeg/xlsx v1.0.5 // indirect
+	github.com/tiendc/go-deepcopy v1.6.0 // indirect
+	github.com/tinylib/msgp v1.3.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.12 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
+	github.com/ugorji/go/codec v1.2.14 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	github.com/xuri/efp v0.0.1 // indirect
+	github.com/xuri/nfp v0.0.1 // indirect
+	golang.org/x/arch v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/sys v0.34.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
@@ -4,79 +4,95 @@ gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0p
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/boombuler/barcode v1.0.2 h1:79yrbttoZrLGkL/oOI8hBrUKucwOL0oOjUgEguGMcJ4=
-github.com/boombuler/barcode v1.0.2/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
+github.com/boombuler/barcode v1.1.0 h1:ChaYjBR63fr4LFyGn8E8nt7dBSt3MiU3zMOZqFvVkHo=
+github.com/boombuler/barcode v1.1.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I=
+github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
-github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
-github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
+github.com/bytedance/sonic v1.13.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0=
+github.com/bytedance/sonic v1.13.3/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
+github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
 github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
-github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
+github.com/cloudwego/base64x v0.1.5 h1:XPciSp1xaq2VCSt6lF0phncD4koWyULpl5bUxbfCyP4=
+github.com/cloudwego/base64x v0.1.5/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/extrame/goyymmdd v0.0.0-20210114090516-7cc815f00d1a h1:c5k29baTzznteWs+9dxrtqpNxgtQ3V5NbU8d6laLK9Q=
+github.com/extrame/goyymmdd v0.0.0-20210114090516-7cc815f00d1a/go.mod h1:xbpgo9r3xURoPa/l3sLKLGcnWlkz9UkfFsQ7lW0S6h8=
+github.com/extrame/ole2 v0.0.0-20160812065207-d69429661ad7 h1:n+nk0bNe2+gVbRI8WRbLFVwwcBQ0rr5p+gzkKb6ol8c=
+github.com/extrame/ole2 v0.0.0-20160812065207-d69429661ad7/go.mod h1:GPpMrAfHdb8IdQ1/R2uIRBsNfnPnwsYE9YYI5WyY1zw=
+github.com/extrame/xls v0.0.2-0.20200426124601-4a6cf263071b h1:jqW/h4gcXYEB6kVf6iuxjU9ONWA0ugUB94TP9UNmgdg=
+github.com/extrame/xls v0.0.2-0.20200426124601-4a6cf263071b/go.mod h1:iACcgahst7BboCpIMSpnFs4SKyU9ZjsvZBfNbUxZOJI=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-github.com/gin-contrib/cache v1.3.0 h1:wEEw38uvb4rTraQJVpd9ex4ZotXNlc0fSaSUsuPXS/w=
-github.com/gin-contrib/cache v1.3.0/go.mod h1:EA63LrWGI5vwSI95TS5fgBrtxZ1tM2NKx+NrEeyEDcU=
-github.com/gin-contrib/gzip v1.0.1 h1:HQ8ENHODeLY7a4g1Au/46Z92bdGFl74OhxcZble9WJE=
-github.com/gin-contrib/gzip v1.0.1/go.mod h1:njt428fdUNRvjuJf16tZMYZ2Yl+WQB53X5wmhDwXvC4=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
+github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
+github.com/gin-contrib/cache v1.4.1 h1:HcLwLfw7p+FasNp5VAnFbbBj9SzB4bDtswvon7wYSg4=
+github.com/gin-contrib/cache v1.4.1/go.mod h1:tykDV+FgItJHYEO0eCasuRYsZKPPyb4BYhAjuTlG6RM=
+github.com/gin-contrib/gzip v1.2.3 h1:dAhT722RuEG330ce2agAs75z7yB+NKvX/ZM1r8w0u2U=
+github.com/gin-contrib/gzip v1.2.3/go.mod h1:ad72i4Bzmaypk8M762gNXa2wkxxjbz0icRNnuLJ9a/c=
+github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
+github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
+github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
+github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/go-co-op/gocron/v2 v2.16.3 h1:kYqukZqBa8RC2+AFAHnunmKcs9GRTjwBo8WRF3I6cbI=
+github.com/go-co-op/gocron/v2 v2.16.3/go.mod h1:aTf7/+5Jo2E+cyAqq625UQ6DzpkV96b22VHIUAt6l3c=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
-github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
-github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
+github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
+github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
+github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
+github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
-github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
+github.com/gomodule/redigo v1.9.2 h1:HrutZBLhSIU8abiSfW8pj8mPhOyMYjZT/wcA4/L9L9s=
+github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ywhcgtw=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
+github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
+github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
+github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU=
+github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
@@ -85,85 +101,106 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.30 h1:bVreufq3EAIG1Quvws73du3/QgdeZ3myglJlrzSYYCY=
+github.com/mattn/go-sqlite3 v1.14.30/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/memcachier/mc/v3 v3.0.3 h1:qii+lDiPKi36O4Xg+HVKwHu6Oq+Gt17b+uEiA0Drwv4=
 github.com/memcachier/mc/v3 v3.0.3/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug=
+github.com/minio/crc64nvme v1.0.2 h1:6uO1UxGAD+kwqWWp7mBFsi5gAse66C4NXO8cmcVculg=
+github.com/minio/crc64nvme v1.0.2/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.74 h1:fTo/XlPBTSpo3BAMshlwKL5RspXRv9us5UeHEGYCFe0=
-github.com/minio/minio-go/v7 v7.0.74/go.mod h1:qydcVzV8Hqtj1VtEocfxbmVFa2siu6HGa+LDEPogjD8=
+github.com/minio/minio-go/v7 v7.0.95 h1:ywOUPg+PebTMTzn9VDsoFJy32ZuARN9zhB+K3IYEvYU=
+github.com/minio/minio-go/v7 v7.0.95/go.mod h1:wOOX3uxS334vImCNRVyIDdXX9OsXDm89ToynKgqUKlo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
+github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
+github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
+github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg=
-github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
+github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs=
+github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
+github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
+github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
+github.com/richardlehane/msoleps v1.0.1/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/richardlehane/msoleps v1.0.4 h1:WuESlvhX3gH2IHcd8UqyCuFY5yiq/GR/yqaSM/9/g00=
+github.com/richardlehane/msoleps v1.0.4/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/robfig/go-cache v0.0.0-20130306151617-9fc39e0dbf62 h1:pyecQtsPmlkCsMkYhT5iZ+sUXuwee+OvfuJjinEA3ko=
 github.com/robfig/go-cache v0.0.0-20130306151617-9fc39e0dbf62/go.mod h1:65XQgovT59RWatovFwnwocoUxiI/eENTnOY5GK3STuY=
-github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
+github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
+github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM=
+github.com/tiendc/go-deepcopy v1.6.0/go.mod h1:toXoeQoUqXOOS/X4sKuiAoSk6elIdqc0pN7MTgOOo2I=
+github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww=
+github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
-github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
-github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
-github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/ugorji/go/codec v1.2.14 h1:yOQvXCBc3Ij46LRkRoh4Yd5qK6LVOgi0bYOXfb7ifjw=
+github.com/ugorji/go/codec v1.2.14/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
+github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
 github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
 github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+github.com/xuri/efp v0.0.1 h1:fws5Rv3myXyYni8uwj2qKjVaRP30PdjeYe2Y6FDsCL8=
+github.com/xuri/efp v0.0.1/go.mod h1:ybY/Jr0T0GTCnYjKqmdwxyxn2BQf2RcQIIvex5QldPI=
+github.com/xuri/excelize/v2 v2.9.0 h1:1tgOaEq92IOEumR1/JfYS/eR0KHOCsRv/rYXXh6YJQE=
+github.com/xuri/excelize/v2 v2.9.0/go.mod h1:uqey4QBZ9gdMeWApPLdhm9x+9o2lq4iVmjiLfBS5hdE=
+github.com/xuri/nfp v0.0.1 h1:MDamSGatIvp8uOmDP8FnmjuQpu90NzdJxo7242ANR9Q=
+github.com/xuri/nfp v0.0.1/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
-golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc=
+golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
+golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
-google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -178,5 +215,5 @@ nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYm
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo=
 xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
-xorm.io/xorm v1.3.9 h1:TUovzS0ko+IQ1XnNLfs5dqK1cJl1H5uHpWbWqAQ04nU=
-xorm.io/xorm v1.3.9/go.mod h1:LsCCffeeYp63ssk0pKumP6l96WZcHix7ChpurcLNuMw=
+xorm.io/xorm v1.3.10 h1:yR83hTT4mKIPyA/lvWFTzS35xjLwkiYnwdw0Qupeh0o=
+xorm.io/xorm v1.3.10/go.mod h1:Lo7hmsFF0F0GbDE7ubX5ZKa+eCf0eCuiJAUG3oI5cxQ=
@@ -0,0 +1,21 @@
+import { type JestConfigWithTsJest, createDefaultEsmPreset } from 'ts-jest';
+
+const presetConfig = createDefaultEsmPreset({
+    tsconfig: '<rootDir>/tsconfig.jest.json'
+});
+
+const config: JestConfigWithTsJest = {
+    ...presetConfig,
+    clearMocks: true,
+    collectCoverage: false,
+    moduleNameMapper: {
+        "^@/(.*)$": "<rootDir>/src/$1"
+    },
+    testEnvironment: "node",
+    testMatch: [
+        "**/__tests__/**/*.[jt]s?(x)",
+        "!**/__tests__/*_gen.[jt]s?(x)"
+    ]
+};
+
+export default config;
@@ -1,6 +1,6 @@
 {
  "name": "ezbookkeeping",
-  "version": "0.5.0",
+  "version": "1.0.0",
  "private": true,
  "repository": {
    "type": "git",
@@ -15,53 +15,74 @@
    "serve": "cross-env NODE_ENV=development vite",
    "build": "cross-env NODE_ENV=production vite build",
    "serve:dist": "vite preview",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
+    "lint": "vue-tsc --noEmit && eslint . --fix",
+    "test": "cross-env TS_NODE_PROJECT=\"./tsconfig.jest.json\" jest"
  },
  "dependencies": {
    "@mdi/js": "^7.4.47",
-    "@vuepic/vue-datepicker": "^8.8.1",
-    "axios": "^1.7.2",
+    "@vuepic/vue-datepicker": "^11.0.2",
+    "axios": "^1.11.0",
    "cbor-js": "^0.1.0",
    "clipboard": "^2.0.11",
    "crypto-js": "^4.2.0",
    "dom7": "^4.0.6",
    "echarts": "^5.5.1",
-    "framework7": "^8.3.3",
+    "framework7": "^8.3.4",
    "framework7-icons": "^5.0.5",
-    "framework7-vue": "^8.3.3",
-    "js-cookie": "^3.0.5",
+    "framework7-vue": "^8.3.4",
    "leaflet": "^1.9.4",
    "line-awesome": "^1.3.0",
    "moment": "^2.30.1",
-    "moment-timezone": "^0.5.45",
-    "pinia": "^2.1.7",
+    "moment-timezone": "^0.6.0",
+    "pinia": "^3.0.3",
    "register-service-worker": "^1.7.2",
    "skeleton-elements": "^4.0.1",
    "swiper": "^10.2.0",
-    "ua-parser-js": "^1.0.38",
-    "vue": "^3.4.31",
-    "vue-echarts": "^6.7.3",
-    "vue-i18n": "^9.13.1",
-    "vue-router": "^4.4.0",
+    "ua-parser-js": "^1.0.39",
+    "vue": "^3.5.18",
+    "vue-echarts": "^7.0.3",
+    "vue-i18n": "^11.1.11",
+    "vue-router": "^4.5.1",
    "vue3-perfect-scrollbar": "^2.0.0",
    "vuedraggable": "^4.1.0",
-    "vuetify": "^3.6.11"
+    "vuetify": "^3.9.3"
  },
  "devDependencies": {
-    "@vitejs/plugin-vue": "^5.0.5",
+    "@jest/globals": "^29.7.0",
+    "@tsconfig/node22": "^22.0.2",
+    "@types/cbor-js": "^0.1.1",
+    "@types/crypto-js": "^4.2.2",
+    "@types/git-rev-sync": "^2.0.2",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.15.29",
+    "@types/ua-parser-js": "^0.7.39",
+    "@vitejs/plugin-vue": "^5.2.4",
+    "@vue/eslint-config-typescript": "^14.5.0",
+    "@vue/tsconfig": "^0.7.0",
    "cross-env": "^7.0.3",
-    "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.27.0",
+    "eslint": "^9.28.0",
+    "eslint-plugin-vue": "^10.1.0",
    "git-rev-sync": "^3.0.2",
-    "postcss-preset-env": "^9.5.16",
-    "sass": "^1.77.6",
-    "vite": "^5.3.3",
-    "vite-plugin-pwa": "^0.20.0",
-    "vite-plugin-vuetify": "^2.0.3"
+    "jest": "^29.7.0",
+    "postcss-preset-env": "^10.2.0",
+    "sass": "^1.89.1",
+    "ts-jest": "^29.3.4",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.8.3",
+    "vite": "^6.3.5",
+    "vite-plugin-checker": "^0.9.3",
+    "vite-plugin-pwa": "^1.0.0",
+    "vite-plugin-vuetify": "^2.1.1",
+    "vue-tsc": "^2.2.10"
  },
  "browserslist": [
-    "> 1%",
-    "last 2 versions",
+    "last 5 Chrome versions",
+    "last 5 Firefox versions",
+    "last 5 Safari versions",
+    "last 5 Edge versions",
+    "last 5 ChromeAndroid versions",
+    "last 5 iOS versions",
+    "not IE <= 11",
    "not dead"
  ]
 }
@@ -16,23 +16,34 @@ import (

 // AccountsApi represents account api
 type AccountsApi struct {
+	ApiUsingConfig
+	ApiUsingDuplicateChecker
 	accounts *services.AccountService
 }

 // Initialize an account api singleton instance
 var (
 	Accounts = &AccountsApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		ApiUsingDuplicateChecker: ApiUsingDuplicateChecker{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			container: duplicatechecker.Container,
+		},
 		accounts: services.Accounts,
 	}
 )

 // AccountListHandler returns accounts list of current user
-func (a *AccountsApi) AccountListHandler(c *core.Context) (any, *errs.Error) {
+func (a *AccountsApi) AccountListHandler(c *core.WebContext) (any, *errs.Error) {
 	var accountListReq models.AccountListRequest
 	err := c.ShouldBindQuery(&accountListReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountListHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountListHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -40,7 +51,7 @@ func (a *AccountsApi) AccountListHandler(c *core.Context) (any, *errs.Error) {
 	accounts, err := a.accounts.GetAllAccountsByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountListHandler] failed to get all accounts for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[accounts.AccountListHandler] failed to get all accounts for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -87,12 +98,12 @@ func (a *AccountsApi) AccountListHandler(c *core.Context) (any, *errs.Error) {
 }

 // AccountGetHandler returns one specific account of current user
-func (a *AccountsApi) AccountGetHandler(c *core.Context) (any, *errs.Error) {
+func (a *AccountsApi) AccountGetHandler(c *core.WebContext) (any, *errs.Error) {
 	var accountGetReq models.AccountGetRequest
 	err := c.ShouldBindQuery(&accountGetReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountGetHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountGetHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -100,7 +111,7 @@ func (a *AccountsApi) AccountGetHandler(c *core.Context) (any, *errs.Error) {
 	accountAndSubAccounts, err := a.accounts.GetAccountAndSubAccountsByAccountId(c, uid, accountGetReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountGetHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountGetReq.Id, uid, err.Error())
+		log.Errorf(c, "[accounts.AccountGetHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountGetReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -130,50 +141,60 @@ func (a *AccountsApi) AccountGetHandler(c *core.Context) (any, *errs.Error) {
 }

 // AccountCreateHandler saves a new account by request parameters for current user
-func (a *AccountsApi) AccountCreateHandler(c *core.Context) (any, *errs.Error) {
+func (a *AccountsApi) AccountCreateHandler(c *core.WebContext) (any, *errs.Error) {
 	var accountCreateReq models.AccountCreateRequest
 	err := c.ShouldBindJSON(&accountCreateReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountCreateHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	utcOffset, err := c.GetClientTimezoneOffset()

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] cannot get client timezone offset, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountCreateHandler] cannot get client timezone offset, because %s", err.Error())
 		return nil, errs.ErrClientTimezoneOffsetInvalid
 	}

-	if accountCreateReq.Category < models.ACCOUNT_CATEGORY_CASH || accountCreateReq.Category > models.ACCOUNT_CATEGORY_INVESTMENT {
-		log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] account category invalid, category is %d", accountCreateReq.Category)
+	if accountCreateReq.Category < models.ACCOUNT_CATEGORY_CASH || accountCreateReq.Category > models.ACCOUNT_CATEGORY_CERTIFICATE_OF_DEPOSIT {
+		log.Warnf(c, "[accounts.AccountCreateHandler] account category invalid, category is %d", accountCreateReq.Category)
 		return nil, errs.ErrAccountCategoryInvalid
 	}

+	if accountCreateReq.Category != models.ACCOUNT_CATEGORY_CREDIT_CARD && accountCreateReq.CreditCardStatementDate != 0 {
+		log.Warnf(c, "[accounts.AccountCreateHandler] cannot set statement date with category \"%d\"", accountCreateReq.Category)
+		return nil, errs.ErrCannotSetStatementDateForNonCreditCard
+	}
+
 	if accountCreateReq.Type == models.ACCOUNT_TYPE_SINGLE_ACCOUNT {
 		if len(accountCreateReq.SubAccounts) > 0 {
-			log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] account cannot have any sub-accounts")
+			log.Warnf(c, "[accounts.AccountCreateHandler] account cannot have any sub-accounts")
 			return nil, errs.ErrAccountCannotHaveSubAccounts
 		}

 		if accountCreateReq.Currency == validators.ParentAccountCurrencyPlaceholder {
-			log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] account cannot set currency placeholder")
+			log.Warnf(c, "[accounts.AccountCreateHandler] account cannot set currency placeholder")
 			return nil, errs.ErrAccountCurrencyInvalid
 		}
+
+		if accountCreateReq.Balance != 0 && accountCreateReq.BalanceTime <= 0 {
+			log.Warnf(c, "[accounts.AccountCreateHandler] account balance time is not set")
+			return nil, errs.ErrAccountBalanceTimeNotSet
+		}
 	} else if accountCreateReq.Type == models.ACCOUNT_TYPE_MULTI_SUB_ACCOUNTS {
 		if len(accountCreateReq.SubAccounts) < 1 {
-			log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] account does not have any sub-accounts")
+			log.Warnf(c, "[accounts.AccountCreateHandler] account does not have any sub-accounts")
 			return nil, errs.ErrAccountHaveNoSubAccount
 		}

 		if accountCreateReq.Currency != validators.ParentAccountCurrencyPlaceholder {
-			log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] parent account cannot set currency")
+			log.Warnf(c, "[accounts.AccountCreateHandler] parent account cannot set currency")
 			return nil, errs.ErrParentAccountCannotSetCurrency
 		}

 		if accountCreateReq.Balance != 0 {
-			log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] parent account cannot set balance")
+			log.Warnf(c, "[accounts.AccountCreateHandler] parent account cannot set balance")
 			return nil, errs.ErrParentAccountCannotSetBalance
 		}

@@ -181,22 +202,32 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (any, *errs.Error) {
 			subAccount := accountCreateReq.SubAccounts[i]

 			if subAccount.Category != accountCreateReq.Category {
-				log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] category of sub-account not equals to parent")
+				log.Warnf(c, "[accounts.AccountCreateHandler] category of sub-account#%d not equals to parent", i)
 				return nil, errs.ErrSubAccountCategoryNotEqualsToParent
 			}

 			if subAccount.Type != models.ACCOUNT_TYPE_SINGLE_ACCOUNT {
-				log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] sub-account type invalid")
+				log.Warnf(c, "[accounts.AccountCreateHandler] sub-account#%d type invalid", i)
 				return nil, errs.ErrSubAccountTypeInvalid
 			}

 			if subAccount.Currency == validators.ParentAccountCurrencyPlaceholder {
-				log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] sub-account cannot set currency placeholder")
+				log.Warnf(c, "[accounts.AccountCreateHandler] sub-account#%d cannot set currency placeholder", i)
 				return nil, errs.ErrAccountCurrencyInvalid
 			}
+
+			if subAccount.Balance != 0 && subAccount.BalanceTime <= 0 {
+				log.Warnf(c, "[accounts.AccountCreateHandler] sub-account#%d balance time is not set", i)
+				return nil, errs.ErrAccountBalanceTimeNotSet
+			}
+
+			if subAccount.CreditCardStatementDate != 0 {
+				log.Warnf(c, "[accounts.AccountCreateHandler] sub-account#%d cannot set statement date", i)
+				return nil, errs.ErrCannotSetStatementDateForSubAccount
+			}
 		}
 	} else {
-		log.WarnfWithRequestId(c, "[accounts.AccountCreateHandler] account type invalid, type is %d", accountCreateReq.Type)
+		log.Warnf(c, "[accounts.AccountCreateHandler] account type invalid, type is %d", accountCreateReq.Type)
 		return nil, errs.ErrAccountTypeInvalid
 	}

@@ -204,25 +235,25 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (any, *errs.Error) {
 	maxOrderId, err := a.accounts.GetMaxDisplayOrder(c, uid, accountCreateReq.Category)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[accounts.AccountCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	mainAccount := a.createNewAccountModel(uid, &accountCreateReq, maxOrderId+1)
-	childrenAccounts := a.createSubAccountModels(uid, &accountCreateReq)
+	mainAccount := a.createNewAccountModel(uid, &accountCreateReq, false, maxOrderId+1)
+	childrenAccounts, childrenAccountBalanceTimes := a.createSubAccountModels(uid, &accountCreateReq)

-	if settings.Container.Current.EnableDuplicateSubmissionsCheck && accountCreateReq.ClientSessionId != "" {
-		found, remark := duplicatechecker.Container.Get(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_ACCOUNT, uid, accountCreateReq.ClientSessionId)
+	if a.CurrentConfig().EnableDuplicateSubmissionsCheck && accountCreateReq.ClientSessionId != "" {
+		found, remark := a.GetSubmissionRemark(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_ACCOUNT, uid, accountCreateReq.ClientSessionId)

 		if found {
-			log.InfofWithRequestId(c, "[accounts.AccountCreateHandler] another account \"id:%s\" has been created for user \"uid:%d\"", remark, uid)
+			log.Infof(c, "[accounts.AccountCreateHandler] another account \"id:%s\" has been created for user \"uid:%d\"", remark, uid)
 			accountId, err := utils.StringToInt64(remark)

 			if err == nil {
 				accountAndSubAccounts, err := a.accounts.GetAccountAndSubAccountsByAccountId(c, uid, accountId)

 				if err != nil {
-					log.ErrorfWithRequestId(c, "[accounts.AccountCreateHandler] failed to get existed account \"id:%d\" for user \"uid:%d\", because %s", accountId, uid, err.Error())
+					log.Errorf(c, "[accounts.AccountCreateHandler] failed to get existed account \"id:%d\" for user \"uid:%d\", because %s", accountId, uid, err.Error())
 					return nil, errs.Or(err, errs.ErrOperationFailed)
 				}

@@ -247,16 +278,16 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (any, *errs.Error) {
 		}
 	}

-	err = a.accounts.CreateAccounts(c, mainAccount, childrenAccounts, utcOffset)
+	err = a.accounts.CreateAccounts(c, mainAccount, accountCreateReq.BalanceTime, childrenAccounts, childrenAccountBalanceTimes, utcOffset)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountCreateHandler] failed to create account \"id:%d\" for user \"uid:%d\", because %s", mainAccount.AccountId, uid, err.Error())
+		log.Errorf(c, "[accounts.AccountCreateHandler] failed to create account \"id:%d\" for user \"uid:%d\", because %s", mainAccount.AccountId, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[accounts.AccountCreateHandler] user \"uid:%d\" has created a new account \"id:%d\" successfully", uid, mainAccount.AccountId)
+	log.Infof(c, "[accounts.AccountCreateHandler] user \"uid:%d\" has created a new account \"id:%d\" successfully", uid, mainAccount.AccountId)

-	duplicatechecker.Container.Set(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_ACCOUNT, uid, accountCreateReq.ClientSessionId, utils.Int64ToString(mainAccount.AccountId))
+	a.SetSubmissionRemarkIfEnable(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_ACCOUNT, uid, accountCreateReq.ClientSessionId, utils.Int64ToString(mainAccount.AccountId))
 	accountInfoResp := mainAccount.ToAccountInfoResponse()

 	if len(childrenAccounts) > 0 {
@@ -271,75 +302,237 @@ func (a *AccountsApi) AccountCreateHandler(c *core.Context) (any, *errs.Error) {
 }

 // AccountModifyHandler saves an existed account by request parameters for current user
-func (a *AccountsApi) AccountModifyHandler(c *core.Context) (any, *errs.Error) {
+func (a *AccountsApi) AccountModifyHandler(c *core.WebContext) (any, *errs.Error) {
 	var accountModifyReq models.AccountModifyRequest
 	err := c.ShouldBindJSON(&accountModifyReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountModifyHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountModifyHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

-	if accountModifyReq.Category < models.ACCOUNT_CATEGORY_CASH || accountModifyReq.Category > models.ACCOUNT_CATEGORY_INVESTMENT {
-		log.WarnfWithRequestId(c, "[accounts.AccountModifyHandler] account category invalid, category is %d", accountModifyReq.Category)
+	if accountModifyReq.Id <= 0 {
+		return nil, errs.ErrAccountIdInvalid
+	}
+
+	utcOffset, err := c.GetClientTimezoneOffset()
+
+	if err != nil {
+		log.Warnf(c, "[accounts.AccountModifyHandler] cannot get client timezone offset, because %s", err.Error())
+		return nil, errs.ErrClientTimezoneOffsetInvalid
+	}
+
+	if accountModifyReq.Category < models.ACCOUNT_CATEGORY_CASH || accountModifyReq.Category > models.ACCOUNT_CATEGORY_CERTIFICATE_OF_DEPOSIT {
+		log.Warnf(c, "[accounts.AccountModifyHandler] account category invalid, category is %d", accountModifyReq.Category)
 		return nil, errs.ErrAccountCategoryInvalid
 	}

+	if accountModifyReq.Category != models.ACCOUNT_CATEGORY_CREDIT_CARD && accountModifyReq.CreditCardStatementDate != 0 {
+		log.Warnf(c, "[accounts.AccountModifyHandler] cannot set statement date with category \"%d\"", accountModifyReq.Category)
+		return nil, errs.ErrCannotSetStatementDateForNonCreditCard
+	}
+
 	uid := c.GetCurrentUid()
 	accountAndSubAccounts, err := a.accounts.GetAccountAndSubAccountsByAccountId(c, uid, accountModifyReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountModifyHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountModifyReq.Id, uid, err.Error())
+		log.Errorf(c, "[accounts.AccountModifyHandler] failed to get account \"id:%d\" for user \"uid:%d\", because %s", accountModifyReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	accountMap := a.accounts.GetAccountMapByList(accountAndSubAccounts)
+	mainAccount, exists := accountMap[accountModifyReq.Id]

-	if _, exists := accountMap[accountModifyReq.Id]; !exists {
+	if !exists {
 		return nil, errs.ErrAccountNotFound
 	}

-	if len(accountModifyReq.SubAccounts)+1 != len(accountAndSubAccounts) {
-		return nil, errs.ErrCannotAddOrDeleteSubAccountsWhenModify
+	if accountModifyReq.Currency != nil && mainAccount.Currency != *accountModifyReq.Currency {
+		return nil, errs.ErrNotSupportedChangeCurrency
+	}
+
+	if accountModifyReq.Balance != nil {
+		return nil, errs.ErrNotSupportedChangeBalance
+	}
+
+	if accountModifyReq.BalanceTime != nil {
+		return nil, errs.ErrNotSupportedChangeBalanceTime
+	}
+
+	if mainAccount.Type == models.ACCOUNT_TYPE_SINGLE_ACCOUNT {
+		if len(accountModifyReq.SubAccounts) > 0 {
+			log.Warnf(c, "[accounts.AccountModifyHandler] account cannot have any sub-accounts")
+			return nil, errs.ErrAccountCannotHaveSubAccounts
+		}
+	} else if mainAccount.Type == models.ACCOUNT_TYPE_MULTI_SUB_ACCOUNTS {
+		if len(accountModifyReq.SubAccounts) < 1 {
+			log.Warnf(c, "[accounts.AccountModifyHandler] account does not have any sub-accounts")
+			return nil, errs.ErrAccountHaveNoSubAccount
+		}
+
+		for i := 0; i < len(accountModifyReq.SubAccounts); i++ {
+			subAccountReq := accountModifyReq.SubAccounts[i]
+
+			if subAccountReq.Category != accountModifyReq.Category {
+				log.Warnf(c, "[accounts.AccountModifyHandler] category of sub-account#%d not equals to parent", i)
+				return nil, errs.ErrSubAccountCategoryNotEqualsToParent
+			}
+
+			if subAccountReq.Id == 0 { // create new sub-account
+				if subAccountReq.Currency == nil {
+					log.Warnf(c, "[accounts.AccountModifyHandler] sub-account#%d not set currency", i)
+					return nil, errs.ErrAccountCurrencyInvalid
+				} else if subAccountReq.Currency != nil && *subAccountReq.Currency == validators.ParentAccountCurrencyPlaceholder {
+					log.Warnf(c, "[accounts.AccountModifyHandler] sub-account#%d cannot set currency placeholder", i)
+					return nil, errs.ErrAccountCurrencyInvalid
+				}
+
+				if subAccountReq.Balance == nil {
+					defaultBalance := int64(0)
+					subAccountReq.Balance = &defaultBalance
+				}
+
+				if *subAccountReq.Balance == 0 {
+					defaultBalanceTime := int64(0)
+					subAccountReq.BalanceTime = &defaultBalanceTime
+				}
+
+				if *subAccountReq.Balance != 0 && (subAccountReq.BalanceTime == nil || *subAccountReq.BalanceTime <= 0) {
+					log.Warnf(c, "[accounts.AccountModifyHandler] sub-account#%d balance time is not set", i)
+					return nil, errs.ErrAccountBalanceTimeNotSet
+				}
+			} else { // modify existed sub-account
+				subAccount, exists := accountMap[subAccountReq.Id]
+
+				if !exists {
+					return nil, errs.ErrAccountNotFound
+				}
+
+				if subAccountReq.Currency != nil && subAccount.Currency != *subAccountReq.Currency {
+					return nil, errs.ErrNotSupportedChangeCurrency
+				}
+
+				if subAccountReq.Balance != nil {
+					return nil, errs.ErrNotSupportedChangeBalance
+				}
+
+				if subAccountReq.BalanceTime != nil {
+					return nil, errs.ErrNotSupportedChangeBalanceTime
+				}
+			}
+
+			if subAccountReq.CreditCardStatementDate != 0 {
+				log.Warnf(c, "[accounts.AccountModifyHandler] sub-account#%d cannot set statement date", i)
+				return nil, errs.ErrCannotSetStatementDateForSubAccount
+			}
+		}
 	}

 	anythingUpdate := false
 	var toUpdateAccounts []*models.Account
+	var toAddAccounts []*models.Account
+	var toAddAccountBalanceTimes []int64
+	var toDeleteAccountIds []int64

-	toUpdateAccount := a.getToUpdateAccount(uid, &accountModifyReq, accountMap[accountModifyReq.Id])
+	toUpdateAccount := a.getToUpdateAccount(uid, &accountModifyReq, mainAccount, false)

 	if toUpdateAccount != nil {
 		anythingUpdate = true
 		toUpdateAccounts = append(toUpdateAccounts, toUpdateAccount)
 	}

+	toDeleteAccountIds = a.getToDeleteSubAccountIds(&accountModifyReq, mainAccount, accountAndSubAccounts)
+
+	if len(toDeleteAccountIds) > 0 {
+		anythingUpdate = true
+	}
+
+	maxOrderId := int32(0)
+
+	for i := 0; i < len(accountAndSubAccounts); i++ {
+		account := accountAndSubAccounts[i]
+
+		if account.AccountId != mainAccount.AccountId && account.DisplayOrder > maxOrderId {
+			maxOrderId = account.DisplayOrder
+		}
+	}
+
 	for i := 0; i < len(accountModifyReq.SubAccounts); i++ {
 		subAccountReq := accountModifyReq.SubAccounts[i]

 		if _, exists := accountMap[subAccountReq.Id]; !exists {
-			return nil, errs.ErrAccountNotFound
-		}
+			anythingUpdate = true
+			maxOrderId = maxOrderId + 1
+			newSubAccount := a.createNewSubAccountModelForModify(uid, mainAccount.Type, subAccountReq, maxOrderId)
+			toAddAccounts = append(toAddAccounts, newSubAccount)

-		toUpdateSubAccount := a.getToUpdateAccount(uid, subAccountReq, accountMap[subAccountReq.Id])
+			if subAccountReq.BalanceTime != nil {
+				toAddAccountBalanceTimes = append(toAddAccountBalanceTimes, *subAccountReq.BalanceTime)
+			} else {
+				toAddAccountBalanceTimes = append(toAddAccountBalanceTimes, 0)
+			}
+		} else {
+			toUpdateSubAccount := a.getToUpdateAccount(uid, subAccountReq, accountMap[subAccountReq.Id], true)

 			if toUpdateSubAccount != nil {
 				anythingUpdate = true
 				toUpdateAccounts = append(toUpdateAccounts, toUpdateSubAccount)
 			}
 		}
+	}

 	if !anythingUpdate {
 		return nil, errs.ErrNothingWillBeUpdated
 	}

-	err = a.accounts.ModifyAccounts(c, uid, toUpdateAccounts)
+	if len(toAddAccounts) > 0 && a.CurrentConfig().EnableDuplicateSubmissionsCheck && accountModifyReq.ClientSessionId != "" {
+		found, remark := a.GetSubmissionRemark(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_SUBACCOUNT, uid, accountModifyReq.ClientSessionId)
+
+		if found {
+			log.Infof(c, "[accounts.AccountModifyHandler] another account \"id:%s\" modification has been created for user \"uid:%d\"", remark, uid)
+			accountId, err := utils.StringToInt64(remark)
+
+			if err == nil {
+				accountAndSubAccounts, err := a.accounts.GetAccountAndSubAccountsByAccountId(c, uid, accountId)

 				if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountModifyHandler] failed to update account \"id:%d\" for user \"uid:%d\", because %s", accountModifyReq.Id, uid, err.Error())
+					log.Errorf(c, "[accounts.AccountModifyHandler] failed to get existed account \"id:%d\" for user \"uid:%d\", because %s", accountId, uid, err.Error())
 					return nil, errs.Or(err, errs.ErrOperationFailed)
 				}

-	log.InfofWithRequestId(c, "[accounts.AccountModifyHandler] user \"uid:%d\" has updated account \"id:%d\" successfully", uid, accountModifyReq.Id)
+				accountMap := a.accounts.GetAccountMapByList(accountAndSubAccounts)
+				mainAccount, exists := accountMap[accountId]
+
+				if !exists {
+					return nil, errs.ErrOperationFailed
+				}
+
+				accountInfoResp := mainAccount.ToAccountInfoResponse()
+
+				for i := 0; i < len(accountAndSubAccounts); i++ {
+					if accountAndSubAccounts[i].ParentAccountId == mainAccount.AccountId {
+						subAccountResp := accountAndSubAccounts[i].ToAccountInfoResponse()
+						accountInfoResp.SubAccounts = append(accountInfoResp.SubAccounts, subAccountResp)
+					}
+				}
+
+				return accountInfoResp, nil
+			}
+		}
+	}
+
+	err = a.accounts.ModifyAccounts(c, mainAccount, toUpdateAccounts, toAddAccounts, toAddAccountBalanceTimes, toDeleteAccountIds, utcOffset)
+
+	if err != nil {
+		log.Errorf(c, "[accounts.AccountModifyHandler] failed to update account \"id:%d\" for user \"uid:%d\", because %s", accountModifyReq.Id, uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.Infof(c, "[accounts.AccountModifyHandler] user \"uid:%d\" has updated account \"id:%d\" successfully", uid, accountModifyReq.Id)
+
+	if len(toAddAccounts) > 0 {
+		a.SetSubmissionRemarkIfEnable(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_SUBACCOUNT, uid, accountModifyReq.ClientSessionId, utils.Int64ToString(mainAccount.AccountId))
+	}

 	accountRespMap := make(map[int64]*models.AccountInfoResponse)

@@ -357,11 +550,23 @@ func (a *AccountsApi) AccountModifyHandler(c *core.Context) (any, *errs.Error) {
 		accountRespMap[accountResp.Id] = accountResp
 	}

+	for i := 0; i < len(toAddAccounts); i++ {
+		account := toAddAccounts[i]
+		accountResp := account.ToAccountInfoResponse()
+		accountRespMap[accountResp.Id] = accountResp
+	}
+
+	deletedAccountIds := make(map[int64]bool)
+
+	for i := 0; i < len(toDeleteAccountIds); i++ {
+		deletedAccountIds[toDeleteAccountIds[i]] = true
+	}
+
 	for i := 0; i < len(accountAndSubAccounts); i++ {
 		oldAccount := accountAndSubAccounts[i]
 		_, exists := accountRespMap[oldAccount.AccountId]

-		if !exists {
+		if !exists && !deletedAccountIds[oldAccount.AccountId] {
 			oldAccountResp := oldAccount.ToAccountInfoResponse()
 			accountRespMap[oldAccountResp.Id] = oldAccountResp
 		}
@@ -370,8 +575,19 @@ func (a *AccountsApi) AccountModifyHandler(c *core.Context) (any, *errs.Error) {
 	accountResp := accountRespMap[accountModifyReq.Id]

 	for i := 0; i < len(accountAndSubAccounts); i++ {
-		if accountAndSubAccounts[i].ParentAccountId == accountResp.Id {
-			subAccountResp := accountRespMap[accountAndSubAccounts[i].AccountId]
+		account := accountAndSubAccounts[i]
+
+		if account.ParentAccountId == accountResp.Id && !deletedAccountIds[account.AccountId] {
+			subAccountResp := accountRespMap[account.AccountId]
+			accountResp.SubAccounts = append(accountResp.SubAccounts, subAccountResp)
+		}
+	}
+
+	for i := 0; i < len(toAddAccounts); i++ {
+		account := toAddAccounts[i]
+
+		if account.ParentAccountId == accountResp.Id {
+			subAccountResp := accountRespMap[account.AccountId]
 			accountResp.SubAccounts = append(accountResp.SubAccounts, subAccountResp)
 		}
 	}
@@ -382,12 +598,12 @@ func (a *AccountsApi) AccountModifyHandler(c *core.Context) (any, *errs.Error) {
 }

 // AccountHideHandler hides an existed account by request parameters for current user
-func (a *AccountsApi) AccountHideHandler(c *core.Context) (any, *errs.Error) {
+func (a *AccountsApi) AccountHideHandler(c *core.WebContext) (any, *errs.Error) {
 	var accountHideReq models.AccountHideRequest
 	err := c.ShouldBindJSON(&accountHideReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountHideHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountHideHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -395,21 +611,21 @@ func (a *AccountsApi) AccountHideHandler(c *core.Context) (any, *errs.Error) {
 	err = a.accounts.HideAccount(c, uid, []int64{accountHideReq.Id}, accountHideReq.Hidden)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountHideHandler] failed to hide account \"id:%d\" for user \"uid:%d\", because %s", accountHideReq.Id, uid, err.Error())
+		log.Errorf(c, "[accounts.AccountHideHandler] failed to hide account \"id:%d\" for user \"uid:%d\", because %s", accountHideReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[accounts.AccountHideHandler] user \"uid:%d\" has hidden account \"id:%d\"", uid, accountHideReq.Id)
+	log.Infof(c, "[accounts.AccountHideHandler] user \"uid:%d\" has hidden account \"id:%d\"", uid, accountHideReq.Id)
 	return true, nil
 }

 // AccountMoveHandler moves display order of existed accounts by request parameters for current user
-func (a *AccountsApi) AccountMoveHandler(c *core.Context) (any, *errs.Error) {
+func (a *AccountsApi) AccountMoveHandler(c *core.WebContext) (any, *errs.Error) {
 	var accountMoveReq models.AccountMoveRequest
 	err := c.ShouldBindJSON(&accountMoveReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountMoveHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountMoveHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -430,21 +646,21 @@ func (a *AccountsApi) AccountMoveHandler(c *core.Context) (any, *errs.Error) {
 	err = a.accounts.ModifyAccountDisplayOrders(c, uid, accounts)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountMoveHandler] failed to move accounts for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[accounts.AccountMoveHandler] failed to move accounts for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[accounts.AccountMoveHandler] user \"uid:%d\" has moved accounts", uid)
+	log.Infof(c, "[accounts.AccountMoveHandler] user \"uid:%d\" has moved accounts", uid)
 	return true, nil
 }

 // AccountDeleteHandler deletes an existed account by request parameters for current user
-func (a *AccountsApi) AccountDeleteHandler(c *core.Context) (any, *errs.Error) {
+func (a *AccountsApi) AccountDeleteHandler(c *core.WebContext) (any, *errs.Error) {
 	var accountDeleteReq models.AccountDeleteRequest
 	err := c.ShouldBindJSON(&accountDeleteReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[accounts.AccountDeleteHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[accounts.AccountDeleteHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -452,15 +668,43 @@ func (a *AccountsApi) AccountDeleteHandler(c *core.Context) (any, *errs.Error) {
 	err = a.accounts.DeleteAccount(c, uid, accountDeleteReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[accounts.AccountDeleteHandler] failed to delete account \"id:%d\" for user \"uid:%d\", because %s", accountDeleteReq.Id, uid, err.Error())
+		log.Errorf(c, "[accounts.AccountDeleteHandler] failed to delete account \"id:%d\" for user \"uid:%d\", because %s", accountDeleteReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[accounts.AccountDeleteHandler] user \"uid:%d\" has deleted account \"id:%d\"", uid, accountDeleteReq.Id)
+	log.Infof(c, "[accounts.AccountDeleteHandler] user \"uid:%d\" has deleted account \"id:%d\"", uid, accountDeleteReq.Id)
 	return true, nil
 }

-func (a *AccountsApi) createNewAccountModel(uid int64, accountCreateReq *models.AccountCreateRequest, order int32) *models.Account {
+// SubAccountDeleteHandler deletes an existed sub-account by request parameters for current user
+func (a *AccountsApi) SubAccountDeleteHandler(c *core.WebContext) (any, *errs.Error) {
+	var accountDeleteReq models.AccountDeleteRequest
+	err := c.ShouldBindJSON(&accountDeleteReq)
+
+	if err != nil {
+		log.Warnf(c, "[accounts.SubAccountDeleteHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	err = a.accounts.DeleteSubAccount(c, uid, accountDeleteReq.Id)
+
+	if err != nil {
+		log.Errorf(c, "[accounts.SubAccountDeleteHandler] failed to delete sub-account \"id:%d\" for user \"uid:%d\", because %s", accountDeleteReq.Id, uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.Infof(c, "[accounts.SubAccountDeleteHandler] user \"uid:%d\" has deleted sub-account \"id:%d\"", uid, accountDeleteReq.Id)
+	return true, nil
+}
+
+func (a *AccountsApi) createNewAccountModel(uid int64, accountCreateReq *models.AccountCreateRequest, isSubAccount bool, order int32) *models.Account {
+	accountExtend := &models.AccountExtend{}
+
+	if !isSubAccount && accountCreateReq.Category == models.ACCOUNT_CATEGORY_CREDIT_CARD {
+		accountExtend.CreditCardStatementDate = &accountCreateReq.CreditCardStatementDate
+	}
+
 	return &models.Account{
 		Uid:          uid,
 		Name:         accountCreateReq.Name,
@@ -472,24 +716,51 @@ func (a *AccountsApi) createNewAccountModel(uid int64, accountCreateReq *models.
 		Currency:     accountCreateReq.Currency,
 		Balance:      accountCreateReq.Balance,
 		Comment:      accountCreateReq.Comment,
+		Extend:       accountExtend,
 	}
 }

-func (a *AccountsApi) createSubAccountModels(uid int64, accountCreateReq *models.AccountCreateRequest) []*models.Account {
+func (a *AccountsApi) createNewSubAccountModelForModify(uid int64, accountType models.AccountType, accountModifyReq *models.AccountModifyRequest, order int32) *models.Account {
+	accountExtend := &models.AccountExtend{}
+
+	return &models.Account{
+		Uid:          uid,
+		Name:         accountModifyReq.Name,
+		DisplayOrder: order,
+		Category:     accountModifyReq.Category,
+		Type:         accountType,
+		Icon:         accountModifyReq.Icon,
+		Color:        accountModifyReq.Color,
+		Currency:     *accountModifyReq.Currency,
+		Balance:      *accountModifyReq.Balance,
+		Comment:      accountModifyReq.Comment,
+		Extend:       accountExtend,
+	}
+}
+
+func (a *AccountsApi) createSubAccountModels(uid int64, accountCreateReq *models.AccountCreateRequest) ([]*models.Account, []int64) {
 	if len(accountCreateReq.SubAccounts) <= 0 {
-		return nil
+		return nil, nil
 	}

 	childrenAccounts := make([]*models.Account, len(accountCreateReq.SubAccounts))
+	childrenAccountBalanceTimes := make([]int64, len(accountCreateReq.SubAccounts))

 	for i := int32(0); i < int32(len(accountCreateReq.SubAccounts)); i++ {
-		childrenAccounts[i] = a.createNewAccountModel(uid, accountCreateReq.SubAccounts[i], i+1)
+		childrenAccounts[i] = a.createNewAccountModel(uid, accountCreateReq.SubAccounts[i], true, i+1)
+		childrenAccountBalanceTimes[i] = accountCreateReq.SubAccounts[i].BalanceTime
 	}

-	return childrenAccounts
+	return childrenAccounts, childrenAccountBalanceTimes
 }

-func (a *AccountsApi) getToUpdateAccount(uid int64, accountModifyReq *models.AccountModifyRequest, oldAccount *models.Account) *models.Account {
+func (a *AccountsApi) getToUpdateAccount(uid int64, accountModifyReq *models.AccountModifyRequest, oldAccount *models.Account, isSubAccount bool) *models.Account {
+	newAccountExtend := &models.AccountExtend{}
+
+	if !isSubAccount && accountModifyReq.Category == models.ACCOUNT_CATEGORY_CREDIT_CARD {
+		newAccountExtend.CreditCardStatementDate = &accountModifyReq.CreditCardStatementDate
+	}
+
 	newAccount := &models.Account{
 		AccountId: oldAccount.AccountId,
 		Uid:       uid,
@@ -498,6 +769,7 @@ func (a *AccountsApi) getToUpdateAccount(uid int64, accountModifyReq *models.Acc
 		Icon:      accountModifyReq.Icon,
 		Color:     accountModifyReq.Color,
 		Comment:   accountModifyReq.Comment,
+		Extend:    newAccountExtend,
 		Hidden:    accountModifyReq.Hidden,
 	}

@@ -510,5 +782,40 @@ func (a *AccountsApi) getToUpdateAccount(uid int64, accountModifyReq *models.Acc
 		return newAccount
 	}

+	if (newAccount.Extend != nil && oldAccount.Extend == nil) ||
+		(newAccount.Extend == nil && oldAccount.Extend != nil) {
+		return newAccount
+	}
+
+	oldAccountExtend := oldAccount.Extend
+
+	if newAccountExtend.CreditCardStatementDate != oldAccountExtend.CreditCardStatementDate {
+		return newAccount
+	}
+
 	return nil
 }
+
+func (a *AccountsApi) getToDeleteSubAccountIds(accountModifyReq *models.AccountModifyRequest, mainAccount *models.Account, accountAndSubAccounts []*models.Account) []int64 {
+	newSubAccountIds := make(map[int64]bool, len(accountModifyReq.SubAccounts))
+
+	for i := 0; i < len(accountModifyReq.SubAccounts); i++ {
+		newSubAccountIds[accountModifyReq.SubAccounts[i].Id] = true
+	}
+
+	toDeleteAccountIds := make([]int64, 0)
+
+	for i := 0; i < len(accountAndSubAccounts); i++ {
+		subAccount := accountAndSubAccounts[i]
+
+		if subAccount.AccountId == mainAccount.AccountId {
+			continue
+		}
+
+		if _, exists := newSubAccountIds[subAccount.AccountId]; !exists {
+			toDeleteAccountIds = append(toDeleteAccountIds, subAccount.AccountId)
+		}
+	}
+
+	return toDeleteAccountIds
+}
@@ -18,15 +18,20 @@ const amapRestApiUrl = "https://restapi.amap.com/"

 // AmapApiProxy represents amap api proxy
 type AmapApiProxy struct {
+	ApiUsingConfig
 }

 // Initialize a amap api proxy singleton instance
 var (
-	AmapApis = &AmapApiProxy{}
+	AmapApis = &AmapApiProxy{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+	}
 )

 // AmapApiProxyHandler returns amap api response
-func (p *AmapApiProxy) AmapApiProxyHandler(c *core.Context) (*httputil.ReverseProxy, *errs.Error) {
+func (p *AmapApiProxy) AmapApiProxyHandler(c *core.WebContext) (*httputil.ReverseProxy, *errs.Error) {
 	var targetUrl string

 	if strings.HasPrefix(c.Request.RequestURI, "/_AMapService/v4/map/styles") {
@@ -38,7 +43,7 @@ func (p *AmapApiProxy) AmapApiProxyHandler(c *core.Context) (*httputil.ReversePr
 	}

 	director := func(req *http.Request) {
-		targetRawUrl := fmt.Sprintf("%s?%s&jscode=%s", targetUrl, req.URL.RawQuery, settings.Container.Current.AmapApplicationSecret)
+		targetRawUrl := fmt.Sprintf("%s?%s&jscode=%s", targetUrl, req.URL.RawQuery, p.CurrentConfig().AmapApplicationSecret)
 		targetUrl, _ := url.Parse(targetRawUrl)

 		oldCookies := req.Cookies()
@@ -3,7 +3,9 @@ package api
 import (
 	"github.com/pquerna/otp/totp"

+	"github.com/mayswind/ezbookkeeping/pkg/avatars"
 	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/duplicatechecker"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/log"
 	"github.com/mayswind/ezbookkeeping/pkg/models"
@@ -13,7 +15,11 @@ import (

 // AuthorizationsApi represents authorization api
 type AuthorizationsApi struct {
+	ApiUsingConfig
+	ApiUsingDuplicateChecker
+	ApiWithUserInfo
 	users                   *services.UserService
+	userAppCloudSettings    *services.UserApplicationCloudSettingsService
 	tokens                  *services.TokenService
 	twoFactorAuthorizations *services.TwoFactorAuthorizationService
 }
@@ -21,43 +27,77 @@ type AuthorizationsApi struct {
 // Initialize a authorization api singleton instance
 var (
 	Authorizations = &AuthorizationsApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		ApiUsingDuplicateChecker: ApiUsingDuplicateChecker{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			container: duplicatechecker.Container,
+		},
+		ApiWithUserInfo: ApiWithUserInfo{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			ApiUsingAvatarProvider: ApiUsingAvatarProvider{
+				container: avatars.Container,
+			},
+		},
 		users:                   services.Users,
+		userAppCloudSettings:    services.UserApplicationCloudSettings,
 		tokens:                  services.Tokens,
 		twoFactorAuthorizations: services.TwoFactorAuthorizations,
 	}
 )

 // AuthorizeHandler verifies and authorizes current login request
-func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (any, *errs.Error) {
+func (a *AuthorizationsApi) AuthorizeHandler(c *core.WebContext) (any, *errs.Error) {
 	var credential models.UserLoginRequest
 	err := c.ShouldBindJSON(&credential)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.AuthorizeHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[authorizations.AuthorizeHandler] parse request failed, because %s", err.Error())
 		return nil, errs.ErrLoginNameOrPasswordInvalid
 	}

-	user, err := a.users.GetUserByUsernameOrEmailAndPassword(c, credential.LoginName, credential.Password)
+	err = a.CheckFailureCount(c, 0)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.AuthorizeHandler] login failed for user \"%s\", because %s", credential.LoginName, err.Error())
+		log.Warnf(c, "[authorizations.AuthorizeHandler] cannot login for user \"%s\", because %s", credential.LoginName, err.Error())
+		return nil, errs.Or(err, errs.ErrFailureCountLimitReached)
+	}
+
+	user, uid, err := a.users.GetUserByUsernameOrEmailAndPassword(c, credential.LoginName, credential.Password)
+
+	if errs.IsCustomError(err) {
+		failureCheckErr := a.CheckAndIncreaseFailureCount(c, uid)
+
+		if failureCheckErr != nil {
+			log.Warnf(c, "[authorizations.AuthorizeHandler] cannot login for user \"%s\", because %s", credential.LoginName, failureCheckErr.Error())
+			return nil, errs.Or(failureCheckErr, errs.ErrFailureCountLimitReached)
+		}
+	}
+
+	if err != nil {
+		log.Warnf(c, "[authorizations.AuthorizeHandler] login failed for user \"%s\", because %s", credential.LoginName, err.Error())
 		return nil, errs.ErrLoginNameOrPasswordWrong
 	}

 	if user.Disabled {
-		log.WarnfWithRequestId(c, "[authorizations.AuthorizeHandler] login failed for user \"%s\", because user is disabled", credential.LoginName)
+		log.Warnf(c, "[authorizations.AuthorizeHandler] login failed for user \"%s\", because user is disabled", credential.LoginName)
 		return nil, errs.ErrUserIsDisabled
 	}

-	if settings.Container.Current.EnableUserForceVerifyEmail && !user.EmailVerified {
+	if a.CurrentConfig().EnableUserForceVerifyEmail && !user.EmailVerified {
 		hasValidEmailVerifyToken, err := a.tokens.ExistsValidTokenByType(c, user.Uid, core.USER_TOKEN_TYPE_EMAIL_VERIFY)

 		if err != nil {
-			log.WarnfWithRequestId(c, "[authorizations.AuthorizeHandler] failed check whether user \"uid:%d\" has valid verify email token, because %s", user.Uid, err.Error())
+			log.Warnf(c, "[authorizations.AuthorizeHandler] failed check whether user \"uid:%d\" has valid verify email token, because %s", user.Uid, err.Error())
 			hasValidEmailVerifyToken = false
 		}

-		log.WarnfWithRequestId(c, "[authorizations.AuthorizeHandler] login failed for user \"%s\", because user has not verified email", credential.LoginName)
+		log.Warnf(c, "[authorizations.AuthorizeHandler] login failed for user \"%s\", because user has not verified email", credential.LoginName)

 		return nil, errs.NewErrorWithContext(errs.ErrEmailIsNotVerified, map[string]any{
 			"email":                    user.Email,
@@ -68,7 +108,7 @@ func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (any, *errs.Error)
 	err = a.users.UpdateUserLastLoginTime(c, user.Uid)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.AuthorizeHandler] failed to update last login time for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Warnf(c, "[authorizations.AuthorizeHandler] failed to update last login time for user \"uid:%d\", because %s", user.Uid, err.Error())
 	}

 	twoFactorEnable := a.tokens.CurrentConfig().EnableTwoFactor
@@ -77,7 +117,7 @@ func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (any, *errs.Error)
 		twoFactorEnable, err = a.twoFactorAuthorizations.ExistsTwoFactorSetting(c, user.Uid)

 		if err != nil {
-			log.ErrorfWithRequestId(c, "[authorizations.AuthorizeHandler] failed to check two-factor setting for user \"uid:%d\", because %s", user.Uid, err.Error())
+			log.Errorf(c, "[authorizations.AuthorizeHandler] failed to check two-factor setting for user \"uid:%d\", because %s", user.Uid, err.Error())
 			return nil, errs.Or(err, errs.ErrSystemError)
 		}
 	}
@@ -92,7 +132,7 @@ func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (any, *errs.Error)
 	}

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[authorizations.AuthorizeHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[authorizations.AuthorizeHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrTokenGenerating
 	}

@@ -102,49 +142,73 @@ func (a *AuthorizationsApi) AuthorizeHandler(c *core.Context) (any, *errs.Error)

 	c.SetTokenClaims(claims)

-	log.InfofWithRequestId(c, "[authorizations.AuthorizeHandler] user \"uid:%d\" has logined, token type is %d, token will be expired at %d", user.Uid, claims.Type, claims.ExpiresAt)
+	userApplicationCloudSettings, err := a.userAppCloudSettings.GetUserApplicationCloudSettingsByUid(c, user.Uid)
+	var applicationCloudSettingSlice *models.ApplicationCloudSettingSlice = nil

-	authResp := a.getAuthResponse(c, token, twoFactorEnable, user)
+	if err != nil {
+		log.Warnf(c, "[authorizations.AuthorizeHandler] failed to get latest user application cloud settings for user \"uid:%d\", because %s", user.Uid, err.Error())
+	} else if userApplicationCloudSettings != nil && len(userApplicationCloudSettings.Settings) > 0 {
+		applicationCloudSettingSlice = &userApplicationCloudSettings.Settings
+	}
+
+	log.Infof(c, "[authorizations.AuthorizeHandler] user \"uid:%d\" has logined, token type is %d, token will be expired at %d", user.Uid, claims.Type, claims.ExpiresAt)
+
+	authResp := a.getAuthResponse(c, token, twoFactorEnable, user, applicationCloudSettingSlice)
 	return authResp, nil
 }

 // TwoFactorAuthorizeHandler verifies and authorizes current 2fa login by passcode
-func (a *AuthorizationsApi) TwoFactorAuthorizeHandler(c *core.Context) (any, *errs.Error) {
+func (a *AuthorizationsApi) TwoFactorAuthorizeHandler(c *core.WebContext) (any, *errs.Error) {
 	var credential models.TwoFactorLoginRequest
 	err := c.ShouldBindJSON(&credential)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] parse request failed, because %s", err.Error())
 		return nil, errs.ErrPasscodeInvalid
 	}

 	uid := c.GetCurrentUid()
+	err = a.CheckFailureCount(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] cannot auth for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrFailureCountLimitReached)
+	}
+
 	twoFactorSetting, err := a.twoFactorAuthorizations.GetUserTwoFactorSettingByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] failed to get two-factor setting for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[authorizations.TwoFactorAuthorizeHandler] failed to get two-factor setting for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrSystemError)
 	}

 	if !totp.Validate(credential.Passcode, twoFactorSetting.Secret) {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] passcode is invalid for user \"uid:%d\"", uid)
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] passcode is invalid for user \"uid:%d\"", uid)
+
+		err = a.CheckAndIncreaseFailureCount(c, uid)
+
+		if err != nil {
+			log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] cannot auth for user \"uid:%d\", because %s", uid, err.Error())
+			return nil, errs.Or(err, errs.ErrFailureCountLimitReached)
+		}
+
 		return nil, errs.ErrPasscodeInvalid
 	}

 	user, err := a.users.GetUserById(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] failed to get user \"uid:%d\" info, because %s", user.Uid, err.Error())
+		log.Errorf(c, "[authorizations.TwoFactorAuthorizeHandler] failed to get user \"uid:%d\" info, because %s", user.Uid, err.Error())
 		return nil, errs.ErrUserNotFound
 	}

 	if user.Disabled {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] user \"uid:%d\" is disabled", user.Uid)
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] user \"uid:%d\" is disabled", user.Uid)
 		return nil, errs.ErrUserIsDisabled
 	}

-	if settings.Container.Current.EnableUserForceVerifyEmail && !user.EmailVerified {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] user \"uid:%d\" has not verified email", user.Uid)
+	if a.CurrentConfig().EnableUserForceVerifyEmail && !user.EmailVerified {
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] user \"uid:%d\" has not verified email", user.Uid)
 		return nil, errs.ErrEmailIsNotVerified
 	}

@@ -152,40 +216,56 @@ func (a *AuthorizationsApi) TwoFactorAuthorizeHandler(c *core.Context) (any, *er
 	err = a.tokens.DeleteTokenByClaims(c, oldTokenClaims)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] failed to revoke temporary token \"utid:%s\" for user \"uid:%d\", because %s", oldTokenClaims.UserTokenId, user.Uid, err.Error())
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] failed to revoke temporary token \"utid:%s\" for user \"uid:%d\", because %s", oldTokenClaims.UserTokenId, user.Uid, err.Error())
 	}

 	token, claims, err := a.tokens.CreateToken(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[authorizations.TwoFactorAuthorizeHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrTokenGenerating
 	}

 	c.SetTextualToken(token)
 	c.SetTokenClaims(claims)

-	log.InfofWithRequestId(c, "[authorizations.TwoFactorAuthorizeHandler] user \"uid:%d\" has authorized two-factor via passcode, token will be expired at %d", user.Uid, claims.ExpiresAt)
+	userApplicationCloudSettings, err := a.userAppCloudSettings.GetUserApplicationCloudSettingsByUid(c, user.Uid)
+	var applicationCloudSettingSlice *models.ApplicationCloudSettingSlice = nil

-	authResp := a.getAuthResponse(c, token, false, user)
+	if err != nil {
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeHandler] failed to get latest user application cloud settings for user \"uid:%d\", because %s", user.Uid, err.Error())
+	} else if userApplicationCloudSettings != nil && len(userApplicationCloudSettings.Settings) > 0 {
+		applicationCloudSettingSlice = &userApplicationCloudSettings.Settings
+	}
+
+	log.Infof(c, "[authorizations.TwoFactorAuthorizeHandler] user \"uid:%d\" has authorized two-factor via passcode, token will be expired at %d", user.Uid, claims.ExpiresAt)
+
+	authResp := a.getAuthResponse(c, token, false, user, applicationCloudSettingSlice)
 	return authResp, nil
 }

 // TwoFactorAuthorizeByRecoveryCodeHandler verifies and authorizes current 2fa login by recovery code
-func (a *AuthorizationsApi) TwoFactorAuthorizeByRecoveryCodeHandler(c *core.Context) (any, *errs.Error) {
+func (a *AuthorizationsApi) TwoFactorAuthorizeByRecoveryCodeHandler(c *core.WebContext) (any, *errs.Error) {
 	var credential models.TwoFactorRecoveryCodeLoginRequest
 	err := c.ShouldBindJSON(&credential)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] parse request failed, because %s", err.Error())
 		return nil, errs.ErrTwoFactorRecoveryCodeInvalid
 	}

 	uid := c.GetCurrentUid()
+	err = a.CheckFailureCount(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] cannot auth for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrFailureCountLimitReached)
+	}
+
 	enableTwoFactor, err := a.twoFactorAuthorizations.ExistsTwoFactorSetting(c, uid)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to get two-factor setting for user \"uid:%d\", because %s", uid, err.Error())
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to get two-factor setting for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrSystemError)
 	}

@@ -196,24 +276,33 @@ func (a *AuthorizationsApi) TwoFactorAuthorizeByRecoveryCodeHandler(c *core.Cont
 	user, err := a.users.GetUserById(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to get user \"uid:%d\" info, because %s", user.Uid, err.Error())
+		log.Errorf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to get user \"uid:%d\" info, because %s", user.Uid, err.Error())
 		return nil, errs.ErrUserNotFound
 	}

 	if user.Disabled {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] user \"uid:%d\" is disabled", user.Uid)
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] user \"uid:%d\" is disabled", user.Uid)
 		return nil, errs.ErrUserIsDisabled
 	}

-	if settings.Container.Current.EnableUserForceVerifyEmail && !user.EmailVerified {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] user \"uid:%d\" has not verified email", user.Uid)
+	if a.CurrentConfig().EnableUserForceVerifyEmail && !user.EmailVerified {
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] user \"uid:%d\" has not verified email", user.Uid)
 		return nil, errs.ErrEmailIsNotVerified
 	}

 	err = a.twoFactorAuthorizations.GetAndUseUserTwoFactorRecoveryCode(c, uid, credential.RecoveryCode, user.Salt)

+	if errs.IsCustomError(err) {
+		failureCheckErr := a.CheckAndIncreaseFailureCount(c, uid)
+
+		if failureCheckErr != nil {
+			log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] cannot auth for user \"uid:%d\", because %s", uid, failureCheckErr.Error())
+			return nil, errs.Or(failureCheckErr, errs.ErrFailureCountLimitReached)
+		}
+	}
+
 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to get two-factor recovery code for user \"uid:%d\", because %s", uid, err.Error())
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to get two-factor recovery code for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrTwoFactorRecoveryCodeNotExist)
 	}

@@ -221,30 +310,40 @@ func (a *AuthorizationsApi) TwoFactorAuthorizeByRecoveryCodeHandler(c *core.Cont
 	err = a.tokens.DeleteTokenByClaims(c, oldTokenClaims)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to revoke temporary token \"utid:%s\" for user \"uid:%d\", because %s", oldTokenClaims.UserTokenId, user.Uid, err.Error())
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to revoke temporary token \"utid:%s\" for user \"uid:%d\", because %s", oldTokenClaims.UserTokenId, user.Uid, err.Error())
 	}

 	token, claims, err := a.tokens.CreateToken(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrTokenGenerating
 	}

 	c.SetTextualToken(token)
 	c.SetTokenClaims(claims)

-	log.InfofWithRequestId(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] user \"uid:%d\" has authorized two-factor via recovery code \"%s\", token will be expired at %d", user.Uid, credential.RecoveryCode, claims.ExpiresAt)
+	userApplicationCloudSettings, err := a.userAppCloudSettings.GetUserApplicationCloudSettingsByUid(c, user.Uid)
+	var applicationCloudSettingSlice *models.ApplicationCloudSettingSlice = nil

-	authResp := a.getAuthResponse(c, token, false, user)
+	if err != nil {
+		log.Warnf(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] failed to get latest user application cloud settings for user \"uid:%d\", because %s", user.Uid, err.Error())
+	} else if userApplicationCloudSettings != nil && len(userApplicationCloudSettings.Settings) > 0 {
+		applicationCloudSettingSlice = &userApplicationCloudSettings.Settings
+	}
+
+	log.Infof(c, "[authorizations.TwoFactorAuthorizeByRecoveryCodeHandler] user \"uid:%d\" has authorized two-factor via recovery code \"%s\", token will be expired at %d", user.Uid, credential.RecoveryCode, claims.ExpiresAt)
+
+	authResp := a.getAuthResponse(c, token, false, user, applicationCloudSettingSlice)
 	return authResp, nil
 }

-func (a *AuthorizationsApi) getAuthResponse(c *core.Context, token string, need2FA bool, user *models.User) *models.AuthResponse {
+func (a *AuthorizationsApi) getAuthResponse(c *core.WebContext, token string, need2FA bool, user *models.User, applicationCloudSettings *models.ApplicationCloudSettingSlice) *models.AuthResponse {
 	return &models.AuthResponse{
 		Token:                    token,
 		Need2FA:                  need2FA,
-		User:                user.ToUserBasicInfo(),
-		NotificationContent: settings.Container.GetAfterLoginNotificationContent(user.Language, c.GetClientLocale()),
+		User:                     a.GetUserBasicInfo(user),
+		ApplicationCloudSettings: applicationCloudSettings,
+		NotificationContent:      a.GetAfterLoginNotificationContent(user.Language, c.GetClientLocale()),
 	}
 }
@@ -0,0 +1,210 @@
+package api
+
+import (
+	"fmt"
+	"sort"
+
+	"github.com/mayswind/ezbookkeeping/pkg/avatars"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/duplicatechecker"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+const internalTransactionPictureUrlFormat = "%spictures/%d.%s"
+
+// ApiUsingConfig represents an api that need to use config
+type ApiUsingConfig struct {
+	container *settings.ConfigContainer
+}
+
+// CurrentConfig returns the current config
+func (a *ApiUsingConfig) CurrentConfig() *settings.Config {
+	return a.container.GetCurrentConfig()
+}
+
+// GetTransactionPictureInfoResponse returns the view-object of transaction picture basic info according to the transaction picture model
+func (a *ApiUsingConfig) GetTransactionPictureInfoResponse(pictureInfo *models.TransactionPictureInfo) *models.TransactionPictureInfoBasicResponse {
+	originalUrl := fmt.Sprintf(internalTransactionPictureUrlFormat, a.CurrentConfig().RootUrl, pictureInfo.PictureId, pictureInfo.PictureExtension)
+	return pictureInfo.ToTransactionPictureInfoBasicResponse(originalUrl)
+}
+
+// GetTransactionPictureInfoResponseList returns the view-object list of transaction picture basic info according to the transaction picture model
+func (a *ApiUsingConfig) GetTransactionPictureInfoResponseList(pictureInfos []*models.TransactionPictureInfo) models.TransactionPictureInfoBasicResponseSlice {
+	pictureInfoResps := make(models.TransactionPictureInfoBasicResponseSlice, len(pictureInfos))
+
+	for i := 0; i < len(pictureInfos); i++ {
+		pictureInfoResps[i] = a.GetTransactionPictureInfoResponse(pictureInfos[i])
+	}
+
+	sort.Sort(pictureInfoResps)
+
+	return pictureInfoResps
+}
+
+// GetAfterRegisterNotificationContent returns the notification content displayed each time users register
+func (a *ApiUsingConfig) GetAfterRegisterNotificationContent(userLanguage string, clientLanguage string) string {
+	language := userLanguage
+
+	if language == "" {
+		language = clientLanguage
+	}
+
+	if !a.CurrentConfig().AfterRegisterNotification.Enabled {
+		return ""
+	}
+
+	if multiLanguageContent, exists := a.CurrentConfig().AfterRegisterNotification.MultiLanguageContent[language]; exists {
+		return multiLanguageContent
+	}
+
+	return a.CurrentConfig().AfterRegisterNotification.DefaultContent
+}
+
+// GetAfterLoginNotificationContent returns the notification content displayed each time users log in
+func (a *ApiUsingConfig) GetAfterLoginNotificationContent(userLanguage string, clientLanguage string) string {
+	language := userLanguage
+
+	if language == "" {
+		language = clientLanguage
+	}
+
+	if !a.CurrentConfig().AfterLoginNotification.Enabled {
+		return ""
+	}
+
+	if multiLanguageContent, exists := a.CurrentConfig().AfterLoginNotification.MultiLanguageContent[language]; exists {
+		return multiLanguageContent
+	}
+
+	return a.CurrentConfig().AfterLoginNotification.DefaultContent
+}
+
+// GetAfterOpenNotificationContent returns the notification content displayed each time users open the app
+func (a *ApiUsingConfig) GetAfterOpenNotificationContent(userLanguage string, clientLanguage string) string {
+	language := userLanguage
+
+	if language == "" {
+		language = clientLanguage
+	}
+
+	if !a.CurrentConfig().AfterOpenNotification.Enabled {
+		return ""
+	}
+
+	if multiLanguageContent, exists := a.CurrentConfig().AfterOpenNotification.MultiLanguageContent[language]; exists {
+		return multiLanguageContent
+	}
+
+	return a.CurrentConfig().AfterOpenNotification.DefaultContent
+}
+
+// ApiUsingDuplicateChecker represents an api that need to use duplicate checker
+type ApiUsingDuplicateChecker struct {
+	ApiUsingConfig
+	container *duplicatechecker.DuplicateCheckerContainer
+}
+
+// GetSubmissionRemark returns whether the same submission has been processed and related remark by the current duplicate checker
+func (a *ApiUsingDuplicateChecker) GetSubmissionRemark(checkerType duplicatechecker.DuplicateCheckerType, uid int64, identification string) (bool, string) {
+	return a.container.GetSubmissionRemark(checkerType, uid, identification)
+}
+
+// SetSubmissionRemarkIfEnable saves the identification and remark by the current duplicate checker if the duplicate submission check is enabled
+func (a *ApiUsingDuplicateChecker) SetSubmissionRemarkIfEnable(checkerType duplicatechecker.DuplicateCheckerType, uid int64, identification string, remark string) {
+	if a.CurrentConfig().EnableDuplicateSubmissionsCheck {
+		a.container.SetSubmissionRemark(checkerType, uid, identification, remark)
+	}
+}
+
+// RemoveSubmissionRemarkIfEnable removes the identification and remark by the current duplicate checker if the duplicate submission check is enabled
+func (a *ApiUsingDuplicateChecker) RemoveSubmissionRemarkIfEnable(checkerType duplicatechecker.DuplicateCheckerType, uid int64, identification string) {
+	if a.CurrentConfig().EnableDuplicateSubmissionsCheck {
+		a.container.RemoveSubmissionRemark(checkerType, uid, identification)
+	}
+}
+
+// CheckFailureCount returns whether the failure count of the specified IP and user has reached the limit and increases the failure count
+func (a *ApiUsingDuplicateChecker) CheckFailureCount(c *core.WebContext, uid int64) error {
+	if a.CurrentConfig().MaxFailuresPerIpPerMinute > 0 {
+		clientIp := c.ClientIP()
+		ipFailureCount := a.container.GetFailureCount(clientIp)
+
+		if ipFailureCount >= a.CurrentConfig().MaxFailuresPerIpPerMinute {
+			log.Warnf(c, "[base.CheckFailureCount] operation failure via IP \"%s\", current failure count: %d reached the limit", clientIp, ipFailureCount)
+			return errs.ErrFailureCountLimitReached
+		}
+	}
+
+	if a.CurrentConfig().MaxFailuresPerUserPerMinute > 0 && uid > 0 {
+		uidFailureCount := a.container.GetFailureCount(utils.Int64ToString(uid))
+
+		if uidFailureCount >= a.CurrentConfig().MaxFailuresPerUserPerMinute {
+			log.Warnf(c, "[base.CheckFailureCount] operation failure via uid \"%d\", current failure count: %d reached the limit", uid, uidFailureCount)
+			return errs.ErrFailureCountLimitReached
+		}
+	}
+
+	return nil
+}
+
+// CheckAndIncreaseFailureCount returns whether the failure count of the specified IP and user has reached the limit and increases the failure count
+func (a *ApiUsingDuplicateChecker) CheckAndIncreaseFailureCount(c *core.WebContext, uid int64) error {
+	clientIp := c.ClientIP()
+	ipFailureCount := uint32(0)
+	uidFailureCount := uint32(0)
+
+	if a.CurrentConfig().MaxFailuresPerIpPerMinute > 0 {
+		ipFailureCount = a.container.GetFailureCount(clientIp)
+	}
+
+	if a.CurrentConfig().MaxFailuresPerUserPerMinute > 0 && uid > 0 {
+		uidFailureCount = a.container.GetFailureCount(utils.Int64ToString(uid))
+	}
+
+	if a.CurrentConfig().MaxFailuresPerIpPerMinute > 0 && ipFailureCount < a.CurrentConfig().MaxFailuresPerIpPerMinute {
+		log.Warnf(c, "[base.CheckAndIncreaseFailureCount] operation failure via IP \"%s\", previous failure count: %d", clientIp, ipFailureCount)
+		a.container.IncreaseFailureCount(clientIp)
+	}
+
+	if a.CurrentConfig().MaxFailuresPerUserPerMinute > 0 && uid > 0 && uidFailureCount < a.CurrentConfig().MaxFailuresPerUserPerMinute {
+		log.Warnf(c, "[base.CheckAndIncreaseFailureCount] operation failure via uid \"%d\", previous failure count: %d", uid, uidFailureCount)
+		a.container.IncreaseFailureCount(utils.Int64ToString(uid))
+	}
+
+	if a.CurrentConfig().MaxFailuresPerIpPerMinute > 0 && ipFailureCount >= a.CurrentConfig().MaxFailuresPerIpPerMinute {
+		log.Warnf(c, "[base.CheckAndIncreaseFailureCount] operation failure via IP \"%s\", current failure count: %d reached the limit", clientIp, ipFailureCount)
+		return errs.ErrFailureCountLimitReached
+	}
+
+	if a.CurrentConfig().MaxFailuresPerUserPerMinute > 0 && uid > 0 && uidFailureCount >= a.CurrentConfig().MaxFailuresPerUserPerMinute {
+		log.Warnf(c, "[base.CheckAndIncreaseFailureCount] operation failure via uid \"%d\", current failure count: %d reached the limit", uid, uidFailureCount)
+		return errs.ErrFailureCountLimitReached
+	}
+
+	return nil
+}
+
+// ApiUsingAvatarProvider represents an api that need to use avatar provider
+type ApiUsingAvatarProvider struct {
+	container *avatars.AvatarProviderContainer
+}
+
+// GetAvatarUrl returns the avatar url by the current user avatar provider
+func (a *ApiUsingAvatarProvider) GetAvatarUrl(user *models.User) string {
+	return a.container.GetAvatarUrl(user)
+}
+
+// ApiWithUserInfo represents an api that can returns user info
+type ApiWithUserInfo struct {
+	ApiUsingConfig
+	ApiUsingAvatarProvider
+}
+
+// GetUserBasicInfo returns the view-object of user basic info according to the user model
+func (a *ApiWithUserInfo) GetUserBasicInfo(user *models.User) *models.UserBasicInfo {
+	return user.ToUserBasicInfo(a.CurrentConfig().AvatarProvider, a.GetAvatarUrl(user))
+}
@@ -19,77 +19,95 @@ const pageCountForDataExport = 1000

 // DataManagementsApi represents data management api
 type DataManagementsApi struct {
-	ezBookKeepingCsvExporter *converters.EzBookKeepingCSVFileExporter
-	ezBookKeepingTsvExporter *converters.EzBookKeepingTSVFileExporter
+	ApiUsingConfig
 	tokens                  *services.TokenService
 	users                   *services.UserService
 	accounts                *services.AccountService
 	transactions            *services.TransactionService
 	categories              *services.TransactionCategoryService
 	tags                    *services.TransactionTagService
+	pictures                *services.TransactionPictureService
 	templates               *services.TransactionTemplateService
+	userCustomExchangeRates *services.UserCustomExchangeRatesService
 }

 // Initialize a data management api singleton instance
 var (
 	DataManagements = &DataManagementsApi{
-		ezBookKeepingCsvExporter: &converters.EzBookKeepingCSVFileExporter{},
-		ezBookKeepingTsvExporter: &converters.EzBookKeepingTSVFileExporter{},
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
 		tokens:                  services.Tokens,
 		users:                   services.Users,
 		accounts:                services.Accounts,
 		transactions:            services.Transactions,
 		categories:              services.TransactionCategories,
 		tags:                    services.TransactionTags,
+		pictures:                services.TransactionPictures,
 		templates:               services.TransactionTemplates,
+		userCustomExchangeRates: services.UserCustomExchangeRates,
 	}
 )

 // ExportDataToEzbookkeepingCSVHandler returns exported data in csv format
-func (a *DataManagementsApi) ExportDataToEzbookkeepingCSVHandler(c *core.Context) ([]byte, string, *errs.Error) {
+func (a *DataManagementsApi) ExportDataToEzbookkeepingCSVHandler(c *core.WebContext) ([]byte, string, *errs.Error) {
 	return a.getExportedFileContent(c, "csv")
 }

 // ExportDataToEzbookkeepingTSVHandler returns exported data in csv format
-func (a *DataManagementsApi) ExportDataToEzbookkeepingTSVHandler(c *core.Context) ([]byte, string, *errs.Error) {
+func (a *DataManagementsApi) ExportDataToEzbookkeepingTSVHandler(c *core.WebContext) ([]byte, string, *errs.Error) {
 	return a.getExportedFileContent(c, "tsv")
 }

 // DataStatisticsHandler returns user data statistics
-func (a *DataManagementsApi) DataStatisticsHandler(c *core.Context) (any, *errs.Error) {
+func (a *DataManagementsApi) DataStatisticsHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	totalAccountCount, err := a.accounts.GetTotalAccountCountByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.DataStatisticsHandler] failed to get total account count for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total account count for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.ErrOperationFailed
 	}

 	totalTransactionCategoryCount, err := a.categories.GetTotalCategoryCountByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.DataStatisticsHandler] failed to get total transaction category count for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total transaction category count for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.ErrOperationFailed
 	}

 	totalTransactionTagCount, err := a.tags.GetTotalTagCountByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.DataStatisticsHandler] failed to get total transaction tag count for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total transaction tag count for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.ErrOperationFailed
 	}

 	totalTransactionCount, err := a.transactions.GetTotalTransactionCountByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.DataStatisticsHandler] failed to get total transaction count for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total transaction count for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.ErrOperationFailed
+	}
+
+	totalTransactionPictureCount, err := a.pictures.GetTotalTransactionPicturesCountByUid(c, uid)
+
+	if err != nil {
+		log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total transaction picture count for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.ErrOperationFailed
 	}

 	totalTransactionTemplateCount, err := a.templates.GetTotalNormalTemplateCountByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.DataStatisticsHandler] failed to get total transaction template count for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total transaction template count for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.ErrOperationFailed
+	}
+
+	totalScheduledTransactionCount, err := a.templates.GetTotalScheduledTemplateCountByUid(c, uid)
+
+	if err != nil {
+		log.Errorf(c, "[data_managements.DataStatisticsHandler] failed to get total scheduled transaction count for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.ErrOperationFailed
 	}

@@ -98,19 +116,21 @@ func (a *DataManagementsApi) DataStatisticsHandler(c *core.Context) (any, *errs.
 		TotalTransactionCategoryCount:  totalTransactionCategoryCount,
 		TotalTransactionTagCount:       totalTransactionTagCount,
 		TotalTransactionCount:          totalTransactionCount,
+		TotalTransactionPictureCount:   totalTransactionPictureCount,
 		TotalTransactionTemplateCount:  totalTransactionTemplateCount,
+		TotalScheduledTransactionCount: totalScheduledTransactionCount,
 	}

 	return dataStatisticsResp, nil
 }

-// ClearDataHandler deletes all user data
-func (a *DataManagementsApi) ClearDataHandler(c *core.Context) (any, *errs.Error) {
+// ClearAllDataHandler deletes all user data
+func (a *DataManagementsApi) ClearAllDataHandler(c *core.WebContext) (any, *errs.Error) {
 	var clearDataReq models.ClearDataRequest
 	err := c.ShouldBindJSON(&clearDataReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[data_managements.ClearDataHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[data_managements.ClearAllDataHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -119,7 +139,7 @@ func (a *DataManagementsApi) ClearDataHandler(c *core.Context) (any, *errs.Error

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.WarnfWithRequestId(c, "[data_managements.ClearDataHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
+			log.Warnf(c, "[data_managements.ClearAllDataHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
 		}

 		return nil, errs.ErrUserNotFound
@@ -129,48 +149,107 @@ func (a *DataManagementsApi) ClearDataHandler(c *core.Context) (any, *errs.Error
 		return nil, errs.ErrUserPasswordWrong
 	}

-	err = a.transactions.DeleteAllTransactions(c, uid)
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_CLEAR_ALL_DATA) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	err = a.templates.DeleteAllTemplates(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ClearDataHandler] failed to delete all transactions, because %s", err.Error())
+		log.Errorf(c, "[data_managements.ClearAllDataHandler] failed to delete all transaction templates, because %s", err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	err = a.transactions.DeleteAllTransactions(c, uid, true)
+
+	if err != nil {
+		log.Errorf(c, "[data_managements.ClearAllDataHandler] failed to delete all transactions, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	err = a.categories.DeleteAllCategories(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ClearDataHandler] failed to delete all transaction categories, because %s", err.Error())
+		log.Errorf(c, "[data_managements.ClearAllDataHandler] failed to delete all transaction categories, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	err = a.tags.DeleteAllTags(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ClearDataHandler] failed to delete all transaction tags, because %s", err.Error())
+		log.Errorf(c, "[data_managements.ClearAllDataHandler] failed to delete all transaction tags, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	err = a.templates.DeleteAllTemplates(c, uid)
+	err = a.userCustomExchangeRates.DeleteAllCustomExchangeRates(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ClearDataHandler] failed to delete all transaction templates, because %s", err.Error())
+		log.Errorf(c, "[data_managements.ClearAllDataHandler] failed to delete all user custom exchange rates, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[data_managements.ClearDataHandler] user \"uid:%d\" has cleared all data", uid)
+	log.Infof(c, "[data_managements.ClearAllDataHandler] user \"uid:%d\" has cleared all data", uid)
 	return true, nil
 }

-func (a *DataManagementsApi) getExportedFileContent(c *core.Context, fileType string) ([]byte, string, *errs.Error) {
-	if !settings.Container.Current.EnableDataExport {
+// ClearAllTransactionsHandler deletes all transactions
+func (a *DataManagementsApi) ClearAllTransactionsHandler(c *core.WebContext) (any, *errs.Error) {
+	var clearDataReq models.ClearDataRequest
+	err := c.ShouldBindJSON(&clearDataReq)
+
+	if err != nil {
+		log.Warnf(c, "[data_managements.ClearAllTransactionsHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		if !errs.IsCustomError(err) {
+			log.Warnf(c, "[data_managements.ClearAllTransactionsHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
+		}
+
+		return nil, errs.ErrUserNotFound
+	}
+
+	if !a.users.IsPasswordEqualsUserPassword(clearDataReq.Password, user) {
+		return nil, errs.ErrUserPasswordWrong
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_CLEAR_ALL_DATA) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	err = a.transactions.DeleteAllTransactions(c, uid, false)
+
+	if err != nil {
+		log.Errorf(c, "[data_managements.ClearAllTransactionsHandler] failed to delete all transactions, because %s", err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.Infof(c, "[data_managements.ClearAllTransactionsHandler] user \"uid:%d\" has cleared all transactions", uid)
+	return true, nil
+}
+
+func (a *DataManagementsApi) getExportedFileContent(c *core.WebContext, fileType string) ([]byte, string, *errs.Error) {
+	if !a.CurrentConfig().EnableDataExport {
 		return nil, "", errs.ErrDataExportNotAllowed
 	}

+	var exportTransactionDataReq models.ExportTransactionDataRequest
+	err := c.ShouldBindQuery(&exportTransactionDataReq)
+
+	if err != nil {
+		log.Warnf(c, "[data_managements.ExportDataHandler] parse request failed, because %s", err.Error())
+		return nil, "", errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
 	timezone := time.Local
 	utcOffset, err := c.GetClientTimezoneOffset()

 	if err != nil {
-		log.WarnfWithRequestId(c, "[data_managements.ExportDataHandler] cannot get client timezone offset, because %s", err.Error())
+		log.Warnf(c, "[data_managements.ExportDataHandler] cannot get client timezone offset, because %s", err.Error())
 	} else {
 		timezone = time.FixedZone("Client Timezone", int(utcOffset)*60)
 	}
@@ -180,37 +259,41 @@ func (a *DataManagementsApi) getExportedFileContent(c *core.Context, fileType st

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.WarnfWithRequestId(c, "[data_managements.ExportDataHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
+			log.Warnf(c, "[data_managements.ExportDataHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
 		}

 		return nil, "", errs.ErrUserNotFound
 	}

+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_EXPORT_TRANSACTION) {
+		return nil, "", errs.ErrNotPermittedToPerformThisAction
+	}
+
 	accounts, err := a.accounts.GetAllAccountsByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ExportDataHandler] failed to get all accounts for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.ExportDataHandler] failed to get all accounts for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, "", errs.ErrOperationFailed
 	}

 	categories, err := a.categories.GetAllCategoriesByUid(c, uid, 0, -1)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ExportDataHandler] failed to get categories for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.ExportDataHandler] failed to get categories for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, "", errs.ErrOperationFailed
 	}

 	tags, err := a.tags.GetAllTagsByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ExportDataHandler] failed to get tags for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.ExportDataHandler] failed to get tags for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, "", errs.ErrOperationFailed
 	}

 	tagIndexes, err := a.tags.GetAllTagIdsMapOfAllTransactions(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ExportDataHandler] failed to get tag index for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.ExportDataHandler] failed to get tag index for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, "", errs.ErrOperationFailed
 	}

@@ -218,25 +301,60 @@ func (a *DataManagementsApi) getExportedFileContent(c *core.Context, fileType st
 	categoryMap := a.categories.GetCategoryMapByList(categories)
 	tagMap := a.tags.GetTagMapByList(tags)

-	allTransactions, err := a.transactions.GetAllTransactions(c, uid, pageCountForDataExport, true)
+	allAccountIds, err := a.accounts.GetAccountOrSubAccountIds(c, exportTransactionDataReq.AccountIds, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ExportDataHandler] failed to all transactions user \"uid:%d\", because %s", uid, err.Error())
+		log.Warnf(c, "[data_managements.ExportDataHandler] get account error, because %s", err.Error())
+		return nil, "", errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	allCategoryIds, err := a.categories.GetCategoryOrSubCategoryIds(c, exportTransactionDataReq.CategoryIds, uid)
+
+	if err != nil {
+		log.Warnf(c, "[data_managements.ExportDataHandler] get transaction category error, because %s", err.Error())
+		return nil, "", errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	var allTagIds []int64
+	noTags := exportTransactionDataReq.TagIds == "none"
+
+	if !noTags {
+		allTagIds, err = a.tags.GetTagIds(exportTransactionDataReq.TagIds)
+
+		if err != nil {
+			log.Warnf(c, "[data_managements.ExportDataHandler] get transaction tag ids error, because %s", err.Error())
+			return nil, "", errs.Or(err, errs.ErrOperationFailed)
+		}
+	}
+
+	maxTransactionTime := utils.GetMaxTransactionTimeFromUnixTime(time.Now().Unix())
+	minTransactionTime := int64(0)
+
+	if exportTransactionDataReq.MaxTime > 0 {
+		maxTransactionTime = utils.GetMaxTransactionTimeFromUnixTime(exportTransactionDataReq.MaxTime)
+	}
+
+	if exportTransactionDataReq.MinTime > 0 {
+		minTransactionTime = utils.GetMinTransactionTimeFromUnixTime(exportTransactionDataReq.MinTime)
+	}
+
+	allTransactions, err := a.transactions.GetAllSpecifiedTransactions(c, uid, maxTransactionTime, minTransactionTime, exportTransactionDataReq.Type, allCategoryIds, allAccountIds, allTagIds, noTags, exportTransactionDataReq.TagFilterType, exportTransactionDataReq.AmountFilter, exportTransactionDataReq.Keyword, pageCountForDataExport, true)
+
+	if err != nil {
+		log.Errorf(c, "[data_managements.ExportDataHandler] failed to all transactions user \"uid:%d\", because %s", uid, err.Error())
 		return nil, "", errs.ErrOperationFailed
 	}

-	var dataExporter converters.DataConverter
+	dataExporter := converters.GetTransactionDataExporter(fileType)

-	if fileType == "tsv" {
-		dataExporter = a.ezBookKeepingTsvExporter
-	} else {
-		dataExporter = a.ezBookKeepingCsvExporter
+	if dataExporter == nil {
+		return nil, "", errs.ErrNotImplemented
 	}

-	result, err := dataExporter.ToExportedContent(uid, allTransactions, accountMap, categoryMap, tagMap, tagIndexes)
+	result, err := dataExporter.ToExportedContent(c, uid, allTransactions, accountMap, categoryMap, tagMap, tagIndexes)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[data_managements.ExportDataHandler] failed to get csv format exported data for \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[data_managements.ExportDataHandler] failed to get csv format exported data for \"uid:%d\", because %s", uid, err.Error())
 		return nil, "", errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -14,11 +14,11 @@ var (
 )

 // ApiNotFound returns api not found error
-func (a *DefaultApi) ApiNotFound(c *core.Context) (any, *errs.Error) {
+func (a *DefaultApi) ApiNotFound(c *core.WebContext) (any, *errs.Error) {
 	return nil, errs.ErrApiNotFound
 }

 // MethodNotAllowed returns method not allowed error
-func (a *DefaultApi) MethodNotAllowed(c *core.Context) (any, *errs.Error) {
+func (a *DefaultApi) MethodNotAllowed(c *core.WebContext) (any, *errs.Error) {
 	return nil, errs.ErrMethodNotAllowed
 }
@@ -1,116 +1,106 @@
 package api

 import (
-	"crypto/tls"
-	"fmt"
-	"io"
-	"net/http"
-	"sort"
-	"time"
-
 	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/exchangerates"
 	"github.com/mayswind/ezbookkeeping/pkg/log"
 	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/services"
 	"github.com/mayswind/ezbookkeeping/pkg/settings"
-	"github.com/mayswind/ezbookkeeping/pkg/utils"
 )

 // ExchangeRatesApi represents exchange rate api
-type ExchangeRatesApi struct{}
+type ExchangeRatesApi struct {
+	ApiUsingConfig
+	users                   *services.UserService
+	userCustomExchangeRates *services.UserCustomExchangeRatesService
+}

 // Initialize a exchange rate api singleton instance
 var (
-	ExchangeRates = &ExchangeRatesApi{}
+	ExchangeRates = &ExchangeRatesApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		users:                   services.Users,
+		userCustomExchangeRates: services.UserCustomExchangeRates,
+	}
 )

 // LatestExchangeRateHandler returns latest exchange rate data
-func (a *ExchangeRatesApi) LatestExchangeRateHandler(c *core.Context) (any, *errs.Error) {
-	dataSource := exchangerates.Container.Current
+func (a *ExchangeRatesApi) LatestExchangeRateHandler(c *core.WebContext) (any, *errs.Error) {
+	exchangeRateResponse, err := exchangerates.Container.GetLatestExchangeRates(c, c.GetCurrentUid(), a.CurrentConfig())

-	if dataSource == nil {
-		return nil, errs.ErrInvalidExchangeRatesDataSource
+	if err != nil {
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	return exchangeRateResponse, nil
+}
+
+// UserCustomExchangeRateUpdateHandler updates user custom exchange rates data by request parameters for current user
+func (a *ExchangeRatesApi) UserCustomExchangeRateUpdateHandler(c *core.WebContext) (any, *errs.Error) {
+	var customExchangeRateUpdateReq models.UserCustomExchangeRateUpdateRequest
+	err := c.ShouldBindJSON(&customExchangeRateUpdateReq)
+
+	if err != nil {
+		log.Warnf(c, "[exchange_rates.UserCustomExchangeRateUpdateHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	uid := c.GetCurrentUid()
-
-	transport := http.DefaultTransport.(*http.Transport).Clone()
-	utils.SetProxyUrl(transport, settings.Container.Current.ExchangeRatesProxy)
-
-	if settings.Container.Current.ExchangeRatesSkipTLSVerify {
-		transport.TLSClientConfig = &tls.Config{
-			InsecureSkipVerify: true,
-		}
-	}
-
-	client := &http.Client{
-		Transport: transport,
-		Timeout:   time.Duration(settings.Container.Current.ExchangeRatesRequestTimeout) * time.Millisecond,
-	}
-
-	urls := dataSource.GetRequestUrls()
-	exchangeRateResps := make([]*models.LatestExchangeRateResponse, 0, len(urls))
-
-	for i := 0; i < len(urls); i++ {
-		req, _ := http.NewRequest("GET", urls[i], nil)
-		req.Header.Set("User-Agent", fmt.Sprintf("ezBookkeeping/%s ", settings.Version))
-
-		resp, err := client.Do(req)
+	user, err := a.users.GetUserById(c, uid)

 	if err != nil {
-			log.ErrorfWithRequestId(c, "[exchange_rates.LatestExchangeRateHandler] failed to request latest exchange rate data for user \"uid:%d\", because %s", uid, err.Error())
-			return nil, errs.ErrFailedToRequestRemoteApi
+		log.Errorf(c, "[exchange_rates.UserCustomExchangeRateUpdateHandler] failed to get user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-		if resp.StatusCode != 200 {
-			log.ErrorfWithRequestId(c, "[exchange_rates.LatestExchangeRateHandler] failed to get latest exchange rate data response for user \"uid:%d\", because response code is not 200", uid)
-			return nil, errs.ErrFailedToRequestRemoteApi
+	if customExchangeRateUpdateReq.Currency == user.DefaultCurrency {
+		return nil, errs.ErrCannotUpdateExchangeRateForDefaultCurrency
 	}

-		defer resp.Body.Close()
-		body, err := io.ReadAll(resp.Body)
-		exchangeRateResp, err := dataSource.Parse(c, body)
+	newCustomExchangeRate, defaultCurrencyExchangeRate, err := a.userCustomExchangeRates.UpdateCustomExchangeRate(c, uid, customExchangeRateUpdateReq.Currency, customExchangeRateUpdateReq.Rate, user.DefaultCurrency)

 	if err != nil {
-			log.ErrorfWithRequestId(c, "[exchange_rates.LatestExchangeRateHandler] failed to parse response for user \"uid:%d\", because %s", uid, err.Error())
-			return nil, errs.Or(err, errs.ErrFailedToRequestRemoteApi)
+		log.Errorf(c, "[exchange_rates.UserCustomExchangeRateUpdateHandler] failed to update user custom exchange rate \"currency:%s\" for user \"uid:%d\", because %s", customExchangeRateUpdateReq.Currency, uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-		exchangeRateResps = append(exchangeRateResps, exchangeRateResp)
-	}
-
-	lastExchangeRateResponse := exchangeRateResps[len(exchangeRateResps)-1]
-	allExchangeRatesMap := make(map[string]string)
-
-	for i := 0; i < len(exchangeRateResps); i++ {
-		exchangeRateResp := exchangeRateResps[i]
-
-		for j := 0; j < len(exchangeRateResp.ExchangeRates); j++ {
-			exchangeRate := exchangeRateResp.ExchangeRates[j]
-			allExchangeRatesMap[exchangeRate.Currency] = exchangeRate.Rate
-		}
-	}
-
-	allExchangeRatesMap[lastExchangeRateResponse.BaseCurrency] = "1"
-	allExchangeRates := make(models.LatestExchangeRateSlice, 0, len(allExchangeRatesMap))
-
-	for currency, rate := range allExchangeRatesMap {
-		allExchangeRates = append(allExchangeRates, &models.LatestExchangeRate{
-			Currency: currency,
-			Rate:     rate,
-		})
-	}
-
-	sort.Sort(allExchangeRates)
-
-	finalExchangeRateResponse := &models.LatestExchangeRateResponse{
-		DataSource:    lastExchangeRateResponse.DataSource,
-		ReferenceUrl:  lastExchangeRateResponse.ReferenceUrl,
-		UpdateTime:    lastExchangeRateResponse.UpdateTime,
-		BaseCurrency:  lastExchangeRateResponse.BaseCurrency,
-		ExchangeRates: allExchangeRates,
-	}
-
-	return finalExchangeRateResponse, nil
+	log.Infof(c, "[exchange_rates.UserCustomExchangeRateUpdateHandler] user \"uid:%d\" has updated user custom exchange rate \"currency:%s\" successfully", uid, customExchangeRateUpdateReq.Currency)
+	return newCustomExchangeRate.ToUserCustomExchangeRateUpdateResponse(defaultCurrencyExchangeRate.Rate), nil
+}
+
+// UserCustomExchangeRateDeleteHandler deletes an existed user custom exchange rates data by request parameters for current user
+func (a *ExchangeRatesApi) UserCustomExchangeRateDeleteHandler(c *core.WebContext) (any, *errs.Error) {
+	var customExchangeRateDeleteReq models.UserCustomExchangeRateDeleteRequest
+	err := c.ShouldBindJSON(&customExchangeRateDeleteReq)
+
+	if err != nil {
+		log.Warnf(c, "[exchange_rates.UserCustomExchangeRateDeleteHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		log.Errorf(c, "[exchange_rates.UserCustomExchangeRateDeleteHandler] failed to get user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	if customExchangeRateDeleteReq.Currency == user.DefaultCurrency {
+		return nil, errs.ErrCannotDeleteExchangeRateForDefaultCurrency
+	}
+
+	err = a.userCustomExchangeRates.DeleteCustomExchangeRate(c, uid, customExchangeRateDeleteReq.Currency)
+
+	if err != nil {
+		log.Errorf(c, "[exchange_rates.UserCustomExchangeRateDeleteHandler] failed to delete user custom exchange rate \"currency:%s\" for user \"uid:%d\", because %s", customExchangeRateDeleteReq.Currency, uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.Infof(c, "[exchange_rates.UserCustomExchangeRateDeleteHandler] user \"uid:%d\" has deleted user custom exchange rate \"currency:%s\"", uid, customExchangeRateDeleteReq.Currency)
+	return true, nil
 }
@@ -13,6 +13,7 @@ import (

 // ForgetPasswordsApi represents user forget password api
 type ForgetPasswordsApi struct {
+	ApiUsingConfig
 	users           *services.UserService
 	tokens          *services.TokenService
 	forgetPasswords *services.ForgetPasswordService
@@ -21,6 +22,9 @@ type ForgetPasswordsApi struct {
 // Initialize a user api singleton instance
 var (
 	ForgetPasswords = &ForgetPasswordsApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
 		users:           services.Users,
 		tokens:          services.Tokens,
 		forgetPasswords: services.ForgetPasswords,
@@ -28,12 +32,12 @@ var (
 )

 // UserForgetPasswordRequestHandler generates password reset link and send user an email with this link
-func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.Context) (any, *errs.Error) {
+func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.WebContext) (any, *errs.Error) {
 	var request models.ForgetPasswordRequest
 	err := c.ShouldBindJSON(&request)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserForgetPasswordRequestHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[forget_passwords.UserForgetPasswordRequestHandler] parse request failed, because %s", err.Error())
 		return nil, errs.ErrEmailIsEmptyOrInvalid
 	}

@@ -41,30 +45,34 @@ func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.Context) (

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[forget_passwords.UserForgetPasswordRequestHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[forget_passwords.UserForgetPasswordRequestHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

 	if user.Disabled {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserForgetPasswordRequestHandler] user \"uid:%d\" is disabled", user.Uid)
+		log.Warnf(c, "[forget_passwords.UserForgetPasswordRequestHandler] user \"uid:%d\" is disabled", user.Uid)
 		return nil, errs.ErrUserIsDisabled
 	}

-	if settings.Container.Current.ForgetPasswordRequireVerifyEmail && !user.EmailVerified {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserForgetPasswordRequestHandler] user \"uid:%d\" has not verified email", user.Uid)
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_FORGET_PASSWORD) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	if a.CurrentConfig().ForgetPasswordRequireVerifyEmail && !user.EmailVerified {
+		log.Warnf(c, "[forget_passwords.UserForgetPasswordRequestHandler] user \"uid:%d\" has not verified email", user.Uid)
 		return nil, errs.ErrEmailIsNotVerified
 	}

-	if !settings.Container.Current.EnableSMTP {
+	if !a.CurrentConfig().EnableSMTP {
 		return nil, errs.ErrSMTPServerNotEnabled
 	}

 	token, _, err := a.tokens.CreatePasswordResetToken(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[forget_passwords.UserForgetPasswordRequestHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[forget_passwords.UserForgetPasswordRequestHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrTokenGenerating
 	}

@@ -72,7 +80,7 @@ func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.Context) (
 		err = a.forgetPasswords.SendPasswordResetEmail(c, user, token, c.GetClientLocale())

 		if err != nil {
-			log.WarnfWithRequestId(c, "[forget_passwords.UserForgetPasswordRequestHandler] cannot send email to \"%s\", because %s", user.Email, err.Error())
+			log.Warnf(c, "[forget_passwords.UserForgetPasswordRequestHandler] cannot send email to \"%s\", because %s", user.Email, err.Error())
 		}
 	}()

@@ -80,12 +88,12 @@ func (a *ForgetPasswordsApi) UserForgetPasswordRequestHandler(c *core.Context) (
 }

 // UserResetPasswordHandler resets user password by request parameters
-func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.Context) (any, *errs.Error) {
+func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.WebContext) (any, *errs.Error) {
 	var request models.PasswordResetRequest
 	err := c.ShouldBindJSON(&request)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[forget_passwords.UserResetPasswordHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -94,24 +102,28 @@ func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.Context) (any, *er

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[forget_passwords.UserResetPasswordHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

 	if user.Disabled {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] user \"uid:%d\" is disabled", user.Uid)
+		log.Warnf(c, "[forget_passwords.UserResetPasswordHandler] user \"uid:%d\" is disabled", user.Uid)
 		return nil, errs.ErrUserIsDisabled
 	}

-	if settings.Container.Current.ForgetPasswordRequireVerifyEmail && !user.EmailVerified {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] user \"uid:%d\" has not verified email", user.Uid)
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_FORGET_PASSWORD) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	if a.CurrentConfig().ForgetPasswordRequireVerifyEmail && !user.EmailVerified {
+		log.Warnf(c, "[forget_passwords.UserResetPasswordHandler] user \"uid:%d\" has not verified email", user.Uid)
 		return nil, errs.ErrEmailIsNotVerified
 	}

 	if user.Email != request.Email {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] request email not equals the user email")
+		log.Warnf(c, "[forget_passwords.UserResetPasswordHandler] request email not equals the user email")
 		return nil, errs.ErrEmptyIsInvalid
 	}

@@ -120,7 +132,7 @@ func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.Context) (any, *er
 		err = a.tokens.DeleteTokenByClaims(c, oldTokenClaims)

 		if err != nil {
-			log.WarnfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] failed to revoke password reset token \"utid:%s\" for user \"uid:%d\", because %s", oldTokenClaims.UserTokenId, user.Uid, err.Error())
+			log.Warnf(c, "[forget_passwords.UserResetPasswordHandler] failed to revoke password reset token \"utid:%s\" for user \"uid:%d\", because %s", oldTokenClaims.UserTokenId, user.Uid, err.Error())
 		}

 		return nil, errs.ErrNewPasswordEqualsOldInvalid
@@ -135,7 +147,7 @@ func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.Context) (any, *er
 	_, _, err = a.users.UpdateUser(c, userNew, false)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] failed to update user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[forget_passwords.UserResetPasswordHandler] failed to update user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -143,9 +155,9 @@ func (a *ForgetPasswordsApi) UserResetPasswordHandler(c *core.Context) (any, *er
 	err = a.tokens.DeleteTokensBeforeTime(c, uid, now)

 	if err == nil {
-		log.InfofWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] revoke old tokens before unix time \"%d\" for user \"uid:%d\"", now, user.Uid)
+		log.Infof(c, "[forget_passwords.UserResetPasswordHandler] revoke old tokens before unix time \"%d\" for user \"uid:%d\"", now, user.Uid)
 	} else {
-		log.WarnfWithRequestId(c, "[forget_passwords.UserResetPasswordHandler] failed to revoke old tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Warnf(c, "[forget_passwords.UserResetPasswordHandler] failed to revoke old tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
 	}

 	return true, nil
@@ -15,7 +15,7 @@ var (
 )

 // HealthStatusHandler returns the health status of current service
-func (a *HealthsApi) HealthStatusHandler(c *core.Context) (any, *errs.Error) {
+func (a *HealthsApi) HealthStatusHandler(c *core.WebContext) (any, *errs.Error) {
 	result := make(map[string]string)

 	result["version"] = settings.Version
@@ -24,16 +24,21 @@ const tianDiTuMapAnnotationUrlFormat = "https://t0.tianditu.gov.cn/cva_w/wmts?SE

 // MapImageProxy represents map image proxy
 type MapImageProxy struct {
+	ApiUsingConfig
 }

 // Initialize a map image proxy singleton instance
 var (
-	MapImages = &MapImageProxy{}
+	MapImages = &MapImageProxy{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+	}
 )

 // MapTileImageProxyHandler returns map tile image
-func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.ReverseProxy, *errs.Error) {
-	return p.mapImageProxyHandler(c, func(c *core.Context, mapProvider string) (string, *errs.Error) {
+func (p *MapImageProxy) MapTileImageProxyHandler(c *core.WebContext) (*httputil.ReverseProxy, *errs.Error) {
+	return p.mapImageProxyHandler(c, func(c *core.WebContext, mapProvider string) (string, *errs.Error) {
 		if mapProvider == settings.OpenStreetMapProvider {
 			return openStreetMapTileImageUrlFormat, nil
 		} else if mapProvider == settings.OpenStreetMapHumanitarianStyleProvider {
@@ -47,7 +52,7 @@ func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.Rev
 		} else if mapProvider == settings.CartoDBMapProvider {
 			return cartoDBMapTileImageUrlFormat, nil
 		} else if mapProvider == settings.TomTomMapProvider {
-			targetUrl := tomtomMapTileImageUrlFormat + "?key=" + settings.Container.Current.TomTomMapAPIKey
+			targetUrl := tomtomMapTileImageUrlFormat + "?key=" + p.CurrentConfig().TomTomMapAPIKey
 			language := c.Query("language")

 			if language != "" {
@@ -56,9 +61,9 @@ func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.Rev

 			return targetUrl, nil
 		} else if mapProvider == settings.TianDiTuProvider {
-			return tianDiTuMapTileImageUrlFormat + "&tk=" + settings.Container.Current.TianDiTuAPIKey, nil
+			return tianDiTuMapTileImageUrlFormat + "&tk=" + p.CurrentConfig().TianDiTuAPIKey, nil
 		} else if mapProvider == settings.CustomProvider {
-			return settings.Container.Current.CustomMapTileServerTileLayerUrl, nil
+			return p.CurrentConfig().CustomMapTileServerTileLayerUrl, nil
 		}

 		return "", errs.ErrParameterInvalid
@@ -66,23 +71,23 @@ func (p *MapImageProxy) MapTileImageProxyHandler(c *core.Context) (*httputil.Rev
 }

 // MapAnnotationImageProxyHandler returns map annotation image
-func (p *MapImageProxy) MapAnnotationImageProxyHandler(c *core.Context) (*httputil.ReverseProxy, *errs.Error) {
-	return p.mapImageProxyHandler(c, func(c *core.Context, mapProvider string) (string, *errs.Error) {
+func (p *MapImageProxy) MapAnnotationImageProxyHandler(c *core.WebContext) (*httputil.ReverseProxy, *errs.Error) {
+	return p.mapImageProxyHandler(c, func(c *core.WebContext, mapProvider string) (string, *errs.Error) {
 		if mapProvider == settings.TianDiTuProvider {
-			return tianDiTuMapAnnotationUrlFormat + "&tk=" + settings.Container.Current.TianDiTuAPIKey, nil
+			return tianDiTuMapAnnotationUrlFormat + "&tk=" + p.CurrentConfig().TianDiTuAPIKey, nil
 		} else if mapProvider == settings.CustomProvider {
-			return settings.Container.Current.CustomMapTileServerAnnotationLayerUrl, nil
+			return p.CurrentConfig().CustomMapTileServerAnnotationLayerUrl, nil
 		}

 		return "", errs.ErrParameterInvalid
 	})
 }

-func (p *MapImageProxy) mapImageProxyHandler(c *core.Context, fn func(c *core.Context, mapProvider string) (string, *errs.Error)) (*httputil.ReverseProxy, *errs.Error) {
+func (p *MapImageProxy) mapImageProxyHandler(c *core.WebContext, fn func(c *core.WebContext, mapProvider string) (string, *errs.Error)) (*httputil.ReverseProxy, *errs.Error) {
 	mapProvider := strings.Replace(c.Query("provider"), "-", "_", -1)
 	targetUrl := ""

-	if mapProvider != settings.Container.Current.MapProvider {
+	if mapProvider != p.CurrentConfig().MapProvider {
 		return nil, errs.ErrMapProviderNotCurrent
 	}

@@ -105,7 +110,7 @@ func (p *MapImageProxy) mapImageProxyHandler(c *core.Context, fn func(c *core.Co
 	}

 	transport := http.DefaultTransport.(*http.Transport).Clone()
-	utils.SetProxyUrl(transport, settings.Container.Current.MapProxy)
+	utils.SetProxyUrl(transport, p.CurrentConfig().MapProxy)

 	director := func(req *http.Request) {
 		imageRawUrl := targetUrl
@@ -0,0 +1,267 @@
+package api
+
+import (
+	"encoding/json"
+
+	"github.com/gin-gonic/gin"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/mcp"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/services"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+const mcpServerName = "ezBookkeeping-mcp"
+
+// ModelContextProtocolAPI represents model context protocol api
+type ModelContextProtocolAPI struct {
+	ApiUsingConfig
+	transactions          *services.TransactionService
+	transactionCategories *services.TransactionCategoryService
+	transactionTags       *services.TransactionTagService
+	accounts              *services.AccountService
+	users                 *services.UserService
+	tokens                *services.TokenService
+}
+
+// Initialize a model context protocol api singleton instance
+var (
+	ModelContextProtocols = &ModelContextProtocolAPI{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		transactions:          services.Transactions,
+		transactionCategories: services.TransactionCategories,
+		transactionTags:       services.TransactionTags,
+		accounts:              services.Accounts,
+		users:                 services.Users,
+		tokens:                services.Tokens,
+	}
+)
+
+// InitializeHandler returns the initialize response for model context protocol
+func (a *ModelContextProtocolAPI) InitializeHandler(c *core.WebContext, jsonRPCRequest *core.JSONRPCRequest) (any, *errs.Error) {
+	var initRequest mcp.MCPInitializeRequest
+
+	if jsonRPCRequest.Params != nil {
+		if err := json.Unmarshal(jsonRPCRequest.Params, &initRequest); err != nil {
+			return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+		}
+	} else {
+		return nil, errs.ErrIncompleteOrIncorrectSubmission
+	}
+
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[model_context_protocols.InitializeHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_MCP_ACCESS) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	tokenClaims := c.GetTokenClaims()
+	userTokenId, err := utils.StringToInt64(tokenClaims.UserTokenId)
+
+	if err != nil {
+		log.Warnf(c, "[model_context_protocols.InitializeHandler] parse user token id failed, because %s", err.Error())
+	} else {
+		tokenRecord := &models.TokenRecord{
+			Uid:             tokenClaims.Uid,
+			UserTokenId:     userTokenId,
+			CreatedUnixTime: tokenClaims.IssuedAt,
+		}
+
+		tokenId := a.tokens.GenerateTokenId(tokenRecord)
+
+		err = a.tokens.UpdateTokenLastSeen(c, tokenRecord)
+
+		if err != nil {
+			log.Warnf(c, "[model_context_protocols.InitializeHandler] failed to update last seen of token \"id:%s\" for user \"uid:%d\", because %s", tokenId, uid, err.Error())
+		}
+	}
+
+	protocolVersion := mcp.MCPProtocolVersion(initRequest.ProtocolVersion)
+	_, exists := mcp.SupportedMCPVersion[protocolVersion]
+
+	if !exists {
+		protocolVersion = mcp.LatestSupportedMCPVersion
+	}
+
+	initResp := mcp.MCPInitializeResponse{
+		ProtocolVersion: string(protocolVersion),
+		Capabilities: &mcp.MCPCapabilities{
+			Tools: &mcp.MCPToolCapabilities{
+				ListChanged: false,
+			},
+		},
+		ServerInfo: &mcp.MCPImplementation{
+			Name:    mcpServerName,
+			Title:   a.CurrentConfig().AppName,
+			Version: settings.Version,
+		},
+	}
+
+	return initResp, nil
+}
+
+// ListResourcesHandler returns the list of resources for model context protocol
+func (a *ModelContextProtocolAPI) ListResourcesHandler(c *core.WebContext, jsonRPCRequest *core.JSONRPCRequest) (any, *errs.Error) {
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[model_context_protocols.ListResourcesHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_MCP_ACCESS) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	listResourcesResp := mcp.MCPListResourcesResponse{
+		Resources: make([]*mcp.MCPResource, 0),
+	}
+
+	return listResourcesResp, nil
+}
+
+// ReadResourceHandler returns the resource details for a specific resource in model context protocol
+func (a *ModelContextProtocolAPI) ReadResourceHandler(c *core.WebContext, jsonRPCRequest *core.JSONRPCRequest) (any, *errs.Error) {
+	var readResourceReq mcp.MCPReadResourceRequest
+
+	if jsonRPCRequest.Params != nil {
+		if err := json.Unmarshal(jsonRPCRequest.Params, &readResourceReq); err != nil {
+			return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+		}
+	} else {
+		return nil, errs.ErrIncompleteOrIncorrectSubmission
+	}
+
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[model_context_protocols.ReadResourceHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_MCP_ACCESS) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	return nil, errs.ErrApiNotFound
+}
+
+// ListToolsHandler returns the list of tools for model context protocol
+func (a *ModelContextProtocolAPI) ListToolsHandler(c *core.WebContext, jsonRPCRequest *core.JSONRPCRequest) (any, *errs.Error) {
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[model_context_protocols.ListToolsHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_MCP_ACCESS) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	mcpVersion := a.getMCPVersion(c)
+	toolsInfo := mcp.Container.GetMCPTools()
+	finalToolsInfos := make([]*mcp.MCPTool, len(toolsInfo))
+
+	for i := 0; i < len(toolsInfo); i++ {
+		finalToolsInfos[i] = &mcp.MCPTool{
+			Name:        toolsInfo[i].Name,
+			InputSchema: toolsInfo[i].InputSchema,
+			Title:       toolsInfo[i].Title,
+			Description: toolsInfo[i].Description,
+		}
+
+		if mcpVersion >= string(mcp.ToolResultStructuredContentMinVersion) {
+			finalToolsInfos[i].OutputSchema = toolsInfo[i].OutputSchema
+		}
+	}
+
+	listToolsResp := mcp.MCPListToolsResponse{
+		Tools: finalToolsInfos,
+	}
+
+	return listToolsResp, nil
+}
+
+// CallToolHandler returns the result of calling a specific tool for model context protocol
+func (a *ModelContextProtocolAPI) CallToolHandler(c *core.WebContext, jsonRPCRequest *core.JSONRPCRequest) (any, *errs.Error) {
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[model_context_protocols.CallToolHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_MCP_ACCESS) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	var callToolReq mcp.MCPCallToolRequest
+
+	if jsonRPCRequest.Params != nil {
+		if err := json.Unmarshal(jsonRPCRequest.Params, &callToolReq); err != nil {
+			return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+		}
+	} else {
+		return nil, errs.ErrIncompleteOrIncorrectSubmission
+	}
+
+	result, err := mcp.Container.HandleTool(c, &callToolReq, user, a.CurrentConfig(), a)
+
+	if err != nil {
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	return result, nil
+}
+
+// PingHandler return the ping response for model context protocol
+func (a *ModelContextProtocolAPI) PingHandler(c *core.WebContext, jsonRPCRequest *core.JSONRPCRequest) (any, *errs.Error) {
+	return gin.H{}, nil
+}
+
+// GetTransactionService implements the MCPAvailableServices interface
+func (a *ModelContextProtocolAPI) GetTransactionService() *services.TransactionService {
+	return a.transactions
+}
+
+// GetTransactionCategoryService implements the MCPAvailableServices interface
+func (a *ModelContextProtocolAPI) GetTransactionCategoryService() *services.TransactionCategoryService {
+	return a.transactionCategories
+}
+
+// GetTransactionTagService implements the MCPAvailableServices interface
+func (a *ModelContextProtocolAPI) GetTransactionTagService() *services.TransactionTagService {
+	return a.transactionTags
+}
+
+// GetAccountService implements the MCPAvailableServices interface
+func (a *ModelContextProtocolAPI) GetAccountService() *services.AccountService {
+	return a.accounts
+}
+
+// GetUserService implements the MCPAvailableServices interface
+func (a *ModelContextProtocolAPI) GetUserService() *services.UserService {
+	return a.users
+}
+
+// getMCPVersion returns the MCP protocol version from the request header
+func (a *ModelContextProtocolAPI) getMCPVersion(c *core.WebContext) string {
+	return c.GetHeader(mcp.MCPProtocolVersionHeaderName)
+}
@@ -19,16 +19,21 @@ const (

 // QrCodesApi represents qrcode generator api
 type QrCodesApi struct {
+	ApiUsingConfig
 }

 // Initialize a qrcode generator api singleton instance
 var (
-	QrCodes = &QrCodesApi{}
+	QrCodes = &QrCodesApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+	}
 )

 // MobileUrlQrCodeHandler returns a mobile url qr code image
-func (a *QrCodesApi) MobileUrlQrCodeHandler(c *core.Context) ([]byte, string, *errs.Error) {
-	fullUrl := settings.Container.Current.RootUrl + "mobile"
+func (a *QrCodesApi) MobileUrlQrCodeHandler(c *core.WebContext) ([]byte, string, *errs.Error) {
+	fullUrl := a.CurrentConfig().RootUrl + "mobile"
 	data, err := a.generateUrlQrCode(c, fullUrl)

 	if err != nil {
@@ -38,7 +43,7 @@ func (a *QrCodesApi) MobileUrlQrCodeHandler(c *core.Context) ([]byte, string, *e
 	return data, "image/png", nil
 }

-func (a *QrCodesApi) generateUrlQrCode(c *core.Context, url string) ([]byte, *errs.Error) {
+func (a *QrCodesApi) generateUrlQrCode(c *core.WebContext, url string) ([]byte, *errs.Error) {
 	qrCodeImg, _ := qr.Encode(url, qr.M, qr.Auto)
 	qrCodeImg, _ = barcode.Scale(qrCodeImg, qrCodeDefaultWidth, qrCodeDefaultHeight)
 	imgData := &bytes.Buffer{}
@@ -0,0 +1,212 @@
+package api
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+const ezbookkeepingServerSettingsGlobalVariableName = "EZBOOKKEEPING_SERVER_SETTINGS"
+const ezbookkeepingServerSettingsGlobalVariableFullName = "window." + ezbookkeepingServerSettingsGlobalVariableName
+const ezbookkeepingServerSettingsJavascriptFileHeader = ezbookkeepingServerSettingsGlobalVariableFullName +
+	"=" + ezbookkeepingServerSettingsGlobalVariableFullName + "||{};\n"
+
+// ServerSettingsApi represents server settings api
+type ServerSettingsApi struct {
+	ApiUsingConfig
+}
+
+// Initialize a server settings api singleton instance
+var (
+	ServerSettings = &ServerSettingsApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+	}
+)
+
+// ServerSettingsJavascriptHandler returns the javascript contains server settings
+func (a *ServerSettingsApi) ServerSettingsJavascriptHandler(c *core.WebContext) ([]byte, string, *errs.Error) {
+	config := a.CurrentConfig()
+	builder := &strings.Builder{}
+	builder.WriteString(ezbookkeepingServerSettingsJavascriptFileHeader)
+
+	a.appendBooleanSetting(builder, "r", config.EnableUserRegister)
+	a.appendBooleanSetting(builder, "f", config.EnableUserForgetPassword)
+	a.appendBooleanSetting(builder, "v", config.EnableUserVerifyEmail)
+	a.appendBooleanSetting(builder, "p", config.EnableTransactionPictures)
+	a.appendBooleanSetting(builder, "s", config.EnableScheduledTransaction)
+	a.appendBooleanSetting(builder, "e", config.EnableDataExport)
+	a.appendBooleanSetting(builder, "i", config.EnableDataImport)
+
+	if config.EnableMCPServer {
+		a.appendBooleanSetting(builder, "mcp", config.EnableMCPServer)
+	}
+
+	if config.LoginPageTips.Enabled {
+		a.appendMultiLanguageTipSetting(builder, "lpt", config.LoginPageTips)
+	}
+
+	a.appendStringSetting(builder, "m", config.MapProvider)
+
+	if config.EnableMapDataFetchProxy &&
+		(config.MapProvider == settings.OpenStreetMapProvider ||
+			config.MapProvider == settings.OpenStreetMapHumanitarianStyleProvider ||
+			config.MapProvider == settings.OpenTopoMapProvider ||
+			config.MapProvider == settings.OPNVKarteMapProvider ||
+			config.MapProvider == settings.CyclOSMMapProvider ||
+			config.MapProvider == settings.CartoDBMapProvider ||
+			config.MapProvider == settings.TomTomMapProvider ||
+			config.MapProvider == settings.TianDiTuProvider ||
+			config.MapProvider == settings.CustomProvider) {
+		a.appendBooleanSetting(builder, "mp", config.EnableMapDataFetchProxy)
+	}
+
+	if config.MapProvider == settings.CustomProvider {
+		a.appendStringSetting(builder, "cmzl", fmt.Sprintf("%d-%d-%d", config.CustomMapTileServerMinZoomLevel, config.CustomMapTileServerMaxZoomLevel, config.CustomMapTileServerDefaultZoomLevel))
+
+		if !config.EnableMapDataFetchProxy {
+			a.appendStringSetting(builder, "cmsu", config.CustomMapTileServerTileLayerUrl)
+
+			if config.CustomMapTileServerAnnotationLayerUrl != "" {
+				a.appendStringSetting(builder, "cmau", config.CustomMapTileServerAnnotationLayerUrl)
+			}
+		} else {
+			if config.CustomMapTileServerAnnotationLayerUrl != "" {
+				a.appendBooleanSetting(builder, "cmap", config.EnableMapDataFetchProxy)
+			}
+		}
+	}
+
+	if config.MapProvider == settings.TomTomMapProvider && config.TomTomMapAPIKey != "" && !config.EnableMapDataFetchProxy {
+		a.appendStringSetting(builder, "tmak", config.TomTomMapAPIKey)
+	}
+
+	if config.MapProvider == settings.TianDiTuProvider && config.TianDiTuAPIKey != "" && !config.EnableMapDataFetchProxy {
+		a.appendStringSetting(builder, "tdak", config.TianDiTuAPIKey)
+	}
+
+	if config.MapProvider == settings.GoogleMapProvider && config.GoogleMapAPIKey != "" {
+		a.appendStringSetting(builder, "gmak", config.GoogleMapAPIKey)
+	}
+
+	if config.MapProvider == settings.BaiduMapProvider && config.BaiduMapAK != "" {
+		a.appendStringSetting(builder, "bmak", config.BaiduMapAK)
+	}
+
+	if config.MapProvider == settings.AmapProvider && config.AmapApplicationKey != "" {
+		a.appendStringSetting(builder, "amak", config.AmapApplicationKey)
+	}
+
+	if config.MapProvider == settings.AmapProvider && config.AmapSecurityVerificationMethod != "" {
+		a.appendStringSetting(builder, "amsv", config.AmapSecurityVerificationMethod)
+
+		if config.AmapSecurityVerificationMethod == settings.AmapSecurityVerificationExternalProxyMethod {
+			a.appendStringSetting(builder, "amep", config.AmapApiExternalProxyUrl)
+		}
+
+		if config.AmapSecurityVerificationMethod == settings.AmapSecurityVerificationPlainTextMethod {
+			a.appendStringSetting(builder, "amas", config.AmapApplicationSecret)
+		}
+	}
+
+	if config.ExchangeRatesRequestTimeoutExceedDefaultValue {
+		a.appendIntegerSetting(builder, "errt", int(config.ExchangeRatesRequestTimeout))
+	}
+
+	return []byte(builder.String()), "", nil
+}
+
+func (a *ServerSettingsApi) appendStringSetting(builder *strings.Builder, key string, value string) {
+	builder.WriteString(ezbookkeepingServerSettingsGlobalVariableFullName)
+	builder.WriteString("[")
+	a.appendEncodedString(builder, key)
+	builder.WriteString("]=")
+
+	a.appendEncodedString(builder, value)
+
+	builder.WriteString(";\n")
+}
+
+func (a *ServerSettingsApi) appendMultiLanguageTipSetting(builder *strings.Builder, key string, value settings.TipConfig) {
+	builder.WriteString(ezbookkeepingServerSettingsGlobalVariableFullName)
+	builder.WriteString("[")
+	a.appendEncodedString(builder, key)
+	builder.WriteString("]={\n")
+
+	builder.WriteString("'default'")
+	builder.WriteRune(':')
+	a.appendEncodedString(builder, value.DefaultContent)
+
+	for languageTag, content := range value.MultiLanguageContent {
+		builder.WriteString(",\n")
+		a.appendEncodedString(builder, languageTag)
+		builder.WriteRune(':')
+		a.appendEncodedString(builder, content)
+	}
+
+	builder.WriteString("\n};\n")
+}
+
+func (a *ServerSettingsApi) appendBooleanSetting(builder *strings.Builder, key string, value bool) {
+	builder.WriteString(ezbookkeepingServerSettingsGlobalVariableFullName)
+	builder.WriteString("[")
+	a.appendEncodedString(builder, key)
+	builder.WriteString("]=")
+
+	if value {
+		builder.WriteRune('1')
+	} else {
+		builder.WriteRune('0')
+	}
+
+	builder.WriteString(";\n")
+}
+
+func (a *ServerSettingsApi) appendIntegerSetting(builder *strings.Builder, key string, value int) {
+	builder.WriteString(ezbookkeepingServerSettingsGlobalVariableFullName)
+	builder.WriteString("[")
+	a.appendEncodedString(builder, key)
+	builder.WriteString("]=")
+	builder.WriteString(utils.IntToString(value))
+	builder.WriteString(";\n")
+}
+
+func (a *ServerSettingsApi) appendEncodedString(builder *strings.Builder, content string) {
+	builder.WriteRune('\'')
+	runes := []rune(content)
+
+	for i := 0; i < len(runes); i++ {
+		switch runes[i] {
+		case '\\':
+			builder.WriteRune('\\')
+			builder.WriteRune('\\')
+		case '\'':
+			builder.WriteRune('\\')
+			builder.WriteRune('\'')
+		case '\n':
+			builder.WriteRune('\\')
+			builder.WriteRune('n')
+		case '\r':
+			builder.WriteRune('\\')
+			builder.WriteRune('r')
+		case '\t':
+			builder.WriteRune('\\')
+			builder.WriteRune('t')
+		case '\f':
+			builder.WriteRune('\\')
+			builder.WriteRune('f')
+		case '\b':
+			builder.WriteRune('\\')
+			builder.WriteRune('b')
+		default:
+			builder.WriteRune(runes[i])
+		}
+	}
+
+	builder.WriteRune('\'')
+}
@@ -0,0 +1,29 @@
+package api
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+)
+
+// SystemsApi represents system api
+type SystemsApi struct{}
+
+// Initialize a system api singleton instance
+var (
+	Systems = &SystemsApi{}
+)
+
+// VersionHandler returns the server version and commit hash
+func (a *SystemsApi) VersionHandler(c *core.WebContext) (any, *errs.Error) {
+	result := make(map[string]string)
+
+	result["version"] = settings.Version
+	result["commitHash"] = settings.CommitHash
+
+	if settings.BuildTime != "" {
+		result["buildTime"] = settings.BuildTime
+	}
+
+	return result, nil
+}
@@ -4,6 +4,7 @@ import (
 	"sort"
 	"time"

+	"github.com/mayswind/ezbookkeeping/pkg/avatars"
 	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/log"
@@ -15,25 +16,40 @@ import (

 // TokensApi represents token api
 type TokensApi struct {
+	ApiUsingConfig
+	ApiWithUserInfo
 	tokens               *services.TokenService
 	users                *services.UserService
+	userAppCloudSettings *services.UserApplicationCloudSettingsService
 }

 // Initialize a token api singleton instance
 var (
 	Tokens = &TokensApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		ApiWithUserInfo: ApiWithUserInfo{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			ApiUsingAvatarProvider: ApiUsingAvatarProvider{
+				container: avatars.Container,
+			},
+		},
 		tokens:               services.Tokens,
 		users:                services.Users,
+		userAppCloudSettings: services.UserApplicationCloudSettings,
 	}
 )

 // TokenListHandler returns available token list of current user
-func (a *TokensApi) TokenListHandler(c *core.Context) (any, *errs.Error) {
+func (a *TokensApi) TokenListHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
-	tokens, err := a.tokens.GetAllUnexpiredNormalTokensByUid(c, uid)
+	tokens, err := a.tokens.GetAllUnexpiredNormalAndMCPTokensByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[tokens.TokenListHandler] failed to get all tokens for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[tokens.TokenListHandler] failed to get all tokens for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -53,6 +69,10 @@ func (a *TokensApi) TokenListHandler(c *core.Context) (any, *errs.Error) {
 			tokenResp.IsCurrent = true
 		}

+		if token.TokenType == core.USER_TOKEN_TYPE_MCP && token.UserAgent != services.TokenUserAgentCreatedViaCli {
+			tokenResp.UserAgent = services.TokenUserAgentForMCP
+		}
+
 		tokenResps[i] = tokenResp
 	}

@@ -61,9 +81,62 @@ func (a *TokensApi) TokenListHandler(c *core.Context) (any, *errs.Error) {
 	return tokenResps, nil
 }

+// TokenGenerateMCPHandler generates a new MCP token for current user
+func (a *TokensApi) TokenGenerateMCPHandler(c *core.WebContext) (any, *errs.Error) {
+	if !a.CurrentConfig().EnableMCPServer {
+		return nil, errs.ErrMCPServerNotEnabled
+	}
+
+	var generateMCPTokenReq models.TokenGenerateMCPRequest
+	err := c.ShouldBindJSON(&generateMCPTokenReq)
+
+	if err != nil {
+		log.Warnf(c, "[tokens.TokenGenerateMCPHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		log.Warnf(c, "[tokens.TokenGenerateMCPHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_MCP_ACCESS) {
+		return false, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	if !a.users.IsPasswordEqualsUserPassword(generateMCPTokenReq.Password, user) {
+		return nil, errs.ErrUserPasswordWrong
+	}
+
+	token, claims, err := a.tokens.CreateMCPToken(c, user)
+
+	if err != nil {
+		log.Errorf(c, "[tokens.TokenGenerateMCPHandler] failed to create mcp token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		return nil, errs.Or(err, errs.ErrTokenGenerating)
+	}
+
+	log.Infof(c, "[tokens.TokenGenerateMCPHandler] user \"uid:%d\" has generated mcp token, new token will be expired at %d", user.Uid, claims.ExpiresAt)
+
+	generateMCPTokenResp := &models.TokenGenerateMCPResponse{
+		Token:  token,
+		MCPUrl: a.CurrentConfig().RootUrl + "mcp",
+	}
+
+	return generateMCPTokenResp, nil
+}
+
 // TokenRevokeCurrentHandler revokes current token of current user
-func (a *TokensApi) TokenRevokeCurrentHandler(c *core.Context) (any, *errs.Error) {
-	_, claims, err := a.tokens.ParseTokenByHeader(c)
+func (a *TokensApi) TokenRevokeCurrentHandler(c *core.WebContext) (any, *errs.Error) {
+	tokenString := c.GetTokenStringFromHeader()
+
+	if tokenString == "" {
+		return false, errs.ErrTokenIsEmpty
+	}
+
+	_, claims, err := a.tokens.ParseToken(c, tokenString)

 	if err != nil {
 		return nil, errs.Or(err, errs.NewIncompleteOrIncorrectSubmissionError(err))
@@ -72,7 +145,7 @@ func (a *TokensApi) TokenRevokeCurrentHandler(c *core.Context) (any, *errs.Error
 	userTokenId, err := utils.StringToInt64(claims.UserTokenId)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[tokens.TokenRevokeCurrentHandler] parse user token id failed, because %s", err.Error())
+		log.Warnf(c, "[tokens.TokenRevokeCurrentHandler] parse user token id failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -86,21 +159,21 @@ func (a *TokensApi) TokenRevokeCurrentHandler(c *core.Context) (any, *errs.Error
 	err = a.tokens.DeleteToken(c, tokenRecord)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[token.TokenRevokeCurrentHandler] failed to revoke token \"id:%s\" for user \"uid:%d\", because %s", tokenId, claims.Uid, err.Error())
+		log.Errorf(c, "[tokens.TokenRevokeCurrentHandler] failed to revoke token \"id:%s\" for user \"uid:%d\", because %s", tokenId, claims.Uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[token.TokenRevokeCurrentHandler] user \"uid:%d\" has revoked token \"id:%s\"", claims.Uid, tokenId)
+	log.Infof(c, "[tokens.TokenRevokeCurrentHandler] user \"uid:%d\" has revoked token \"id:%s\"", claims.Uid, tokenId)
 	return true, nil
 }

 // TokenRevokeHandler revokes specific token of current user
-func (a *TokensApi) TokenRevokeHandler(c *core.Context) (any, *errs.Error) {
+func (a *TokensApi) TokenRevokeHandler(c *core.WebContext) (any, *errs.Error) {
 	var tokenRevokeReq models.TokenRevokeRequest
 	err := c.ShouldBindJSON(&tokenRevokeReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[tokens.TokenRevokeHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[tokens.TokenRevokeHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -108,7 +181,7 @@ func (a *TokensApi) TokenRevokeHandler(c *core.Context) (any, *errs.Error) {

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[token.TokenRevokeHandler] failed to parse token \"id:%s\", because %s", tokenRevokeReq.TokenId, err.Error())
+			log.Errorf(c, "[tokens.TokenRevokeHandler] failed to parse token \"id:%s\", because %s", tokenRevokeReq.TokenId, err.Error())
 		}

 		return nil, errs.Or(err, errs.ErrInvalidTokenId)
@@ -117,28 +190,44 @@ func (a *TokensApi) TokenRevokeHandler(c *core.Context) (any, *errs.Error) {
 	uid := c.GetCurrentUid()

 	if tokenRecord.Uid != uid {
-		log.WarnfWithRequestId(c, "[token.TokenRevokeHandler] token \"id:%s\" is not owned by user \"uid:%d\"", tokenRevokeReq.TokenId, uid)
+		log.Warnf(c, "[tokens.TokenRevokeHandler] token \"id:%s\" is not owned by user \"uid:%d\"", tokenRevokeReq.TokenId, uid)
 		return nil, errs.ErrInvalidTokenId
 	}

+	if utils.Int64ToString(tokenRecord.UserTokenId) != c.GetTokenClaims().UserTokenId || tokenRecord.CreatedUnixTime != c.GetTokenClaims().IssuedAt {
+		user, err := a.users.GetUserById(c, uid)
+
+		if err != nil {
+			if !errs.IsCustomError(err) {
+				log.Errorf(c, "[tokens.TokenRevokeHandler] failed to get user, because %s", err.Error())
+			}
+
+			return nil, errs.ErrUserNotFound
+		}
+
+		if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_REVOKE_OTHER_SESSION) {
+			return nil, errs.ErrNotPermittedToPerformThisAction
+		}
+	}
+
 	err = a.tokens.DeleteToken(c, tokenRecord)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[token.TokenRevokeHandler] failed to revoke token \"id:%s\" for user \"uid:%d\", because %s", tokenRevokeReq.TokenId, uid, err.Error())
+		log.Errorf(c, "[tokens.TokenRevokeHandler] failed to revoke token \"id:%s\" for user \"uid:%d\", because %s", tokenRevokeReq.TokenId, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[token.TokenRevokeHandler] user \"uid:%d\" has revoked token \"id:%s\"", uid, tokenRevokeReq.TokenId)
+	log.Infof(c, "[tokens.TokenRevokeHandler] user \"uid:%d\" has revoked token \"id:%s\"", uid, tokenRevokeReq.TokenId)
 	return true, nil
 }

 // TokenRevokeAllHandler revokes all tokens of current user except current token
-func (a *TokensApi) TokenRevokeAllHandler(c *core.Context) (any, *errs.Error) {
+func (a *TokensApi) TokenRevokeAllHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	tokens, err := a.tokens.GetAllTokensByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[tokens.TokenRevokeAllHandler] failed to get all tokens for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[tokens.TokenRevokeAllHandler] failed to get all tokens for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -156,37 +245,55 @@ func (a *TokensApi) TokenRevokeAllHandler(c *core.Context) (any, *errs.Error) {

 	tokens = append(tokens[:currentTokenIndex], tokens[currentTokenIndex+1:]...)

+	if len(tokens) < 1 {
+		return nil, errs.ErrTokenRecordNotFound
+	}
+
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		if !errs.IsCustomError(err) {
+			log.Errorf(c, "[tokens.TokenRevokeAllHandler] failed to get user, because %s", err.Error())
+		}
+
+		return nil, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_REVOKE_OTHER_SESSION) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
 	err = a.tokens.DeleteTokens(c, uid, tokens)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[token.TokenRevokeAllHandler] failed to revoke all tokens for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[tokens.TokenRevokeAllHandler] failed to revoke all tokens for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[token.TokenRevokeAllHandler] user \"uid:%d\" has revoked all tokens", uid)
+	log.Infof(c, "[tokens.TokenRevokeAllHandler] user \"uid:%d\" has revoked all tokens", uid)
 	return true, nil
 }

 // TokenRefreshHandler refresh current token of current user
-func (a *TokensApi) TokenRefreshHandler(c *core.Context) (any, *errs.Error) {
+func (a *TokensApi) TokenRefreshHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	user, err := a.users.GetUserById(c, uid)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[token.TokenRefreshHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
+		log.Warnf(c, "[tokens.TokenRefreshHandler] failed to get user \"uid:%d\" info, because %s", uid, err.Error())
 		return nil, errs.ErrUserNotFound
 	}

 	now := time.Now().Unix()
 	oldTokenClaims := c.GetTokenClaims()

-	if now-oldTokenClaims.IssuedAt < int64(settings.Container.Current.TokenMinRefreshInterval) {
-		log.InfofWithRequestId(c, "[token.TokenRefreshHandler] token of user \"uid:%d\" does not need to be refreshed", uid)
+	if now-oldTokenClaims.IssuedAt < int64(a.CurrentConfig().TokenMinRefreshInterval) {
+		log.Infof(c, "[tokens.TokenRefreshHandler] token of user \"uid:%d\" does not need to be refreshed", uid)

 		userTokenId, err := utils.StringToInt64(oldTokenClaims.UserTokenId)

 		if err != nil {
-			log.WarnfWithRequestId(c, "[tokens.TokenRefreshHandler] parse user token id failed, because %s", err.Error())
+			log.Warnf(c, "[tokens.TokenRefreshHandler] parse user token id failed, because %s", err.Error())
 		} else {
 			tokenRecord := &models.TokenRecord{
 				Uid:             oldTokenClaims.Uid,
@@ -199,13 +306,23 @@ func (a *TokensApi) TokenRefreshHandler(c *core.Context) (any, *errs.Error) {
 			err = a.tokens.UpdateTokenLastSeen(c, tokenRecord)

 			if err != nil {
-				log.WarnfWithRequestId(c, "[token.TokenRefreshHandler] failed to update last seen of token \"id:%s\" for user \"uid:%d\", because %s", tokenId, uid, err.Error())
+				log.Warnf(c, "[tokens.TokenRefreshHandler] failed to update last seen of token \"id:%s\" for user \"uid:%d\", because %s", tokenId, uid, err.Error())
 			}
 		}

+		userApplicationCloudSettings, err := a.userAppCloudSettings.GetUserApplicationCloudSettingsByUid(c, user.Uid)
+		var applicationCloudSettingSlice *models.ApplicationCloudSettingSlice = nil
+
+		if err != nil {
+			log.Warnf(c, "[tokens.TokenRefreshHandler] failed to get latest user application cloud settings for user \"uid:%d\", because %s", user.Uid, err.Error())
+		} else if userApplicationCloudSettings != nil && len(userApplicationCloudSettings.Settings) > 0 {
+			applicationCloudSettingSlice = &userApplicationCloudSettings.Settings
+		}
+
 		refreshResp := &models.TokenRefreshResponse{
-			User:                user.ToUserBasicInfo(),
-			NotificationContent: settings.Container.GetAfterOpenNotificationContent(user.Language, c.GetClientLocale()),
+			User:                     a.GetUserBasicInfo(user),
+			ApplicationCloudSettings: applicationCloudSettingSlice,
+			NotificationContent:      a.GetAfterOpenNotificationContent(user.Language, c.GetClientLocale()),
 		}

 		return refreshResp, nil
@@ -214,7 +331,7 @@ func (a *TokensApi) TokenRefreshHandler(c *core.Context) (any, *errs.Error) {
 	token, claims, err := a.tokens.CreateToken(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[token.TokenRefreshHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[tokens.TokenRefreshHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.Or(err, errs.ErrTokenGenerating)
 	}

@@ -228,13 +345,23 @@ func (a *TokensApi) TokenRefreshHandler(c *core.Context) (any, *errs.Error) {
 	c.SetTextualToken(token)
 	c.SetTokenClaims(claims)

-	log.InfofWithRequestId(c, "[token.TokenRefreshHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)
+	userApplicationCloudSettings, err := a.userAppCloudSettings.GetUserApplicationCloudSettingsByUid(c, user.Uid)
+	var applicationCloudSettingSlice *models.ApplicationCloudSettingSlice = nil
+
+	if err != nil {
+		log.Warnf(c, "[tokens.TokenRefreshHandler] failed to get latest user application cloud settings for user \"uid:%d\", because %s", user.Uid, err.Error())
+	} else if userApplicationCloudSettings != nil && len(userApplicationCloudSettings.Settings) > 0 {
+		applicationCloudSettingSlice = &userApplicationCloudSettings.Settings
+	}
+
+	log.Infof(c, "[tokens.TokenRefreshHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)

 	refreshResp := &models.TokenRefreshResponse{
 		NewToken:                 token,
 		OldTokenId:               a.tokens.GenerateTokenId(oldTokenRecord),
-		User:                user.ToUserBasicInfo(),
-		NotificationContent: settings.Container.GetAfterOpenNotificationContent(user.Language, c.GetClientLocale()),
+		User:                     a.GetUserBasicInfo(user),
+		ApplicationCloudSettings: applicationCloudSettingSlice,
+		NotificationContent:      a.GetAfterOpenNotificationContent(user.Language, c.GetClientLocale()),
 	}

 	return refreshResp, nil
@@ -17,23 +17,34 @@ import (

 // TransactionCategoriesApi represents transaction category api
 type TransactionCategoriesApi struct {
+	ApiUsingConfig
+	ApiUsingDuplicateChecker
 	categories *services.TransactionCategoryService
 }

 // Initialize a transaction category api singleton instance
 var (
 	TransactionCategories = &TransactionCategoriesApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		ApiUsingDuplicateChecker: ApiUsingDuplicateChecker{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			container: duplicatechecker.Container,
+		},
 		categories: services.TransactionCategories,
 	}
 )

 // CategoryListHandler returns transaction category list of current user
-func (a *TransactionCategoriesApi) CategoryListHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryListHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryListReq models.TransactionCategoryListRequest
 	err := c.ShouldBindQuery(&categoryListReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryListHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryListHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -41,7 +52,7 @@ func (a *TransactionCategoriesApi) CategoryListHandler(c *core.Context) (any, *e
 	categories, err := a.categories.GetAllCategoriesByUid(c, uid, categoryListReq.Type, categoryListReq.ParentId)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryListHandler] failed to get categories for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryListHandler] failed to get categories for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -49,12 +60,12 @@ func (a *TransactionCategoriesApi) CategoryListHandler(c *core.Context) (any, *e
 }

 // CategoryGetHandler returns one specific transaction category of current user
-func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryGetReq models.TransactionCategoryGetRequest
 	err := c.ShouldBindQuery(&categoryGetReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryGetHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryGetHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -62,7 +73,7 @@ func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.Context) (any, *er
 	category, err := a.categories.GetCategoryByCategoryId(c, uid, categoryGetReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryGetHandler] failed to get category \"id:%d\" for user \"uid:%d\", because %s", categoryGetReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryGetHandler] failed to get category \"id:%d\" for user \"uid:%d\", because %s", categoryGetReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -72,17 +83,17 @@ func (a *TransactionCategoriesApi) CategoryGetHandler(c *core.Context) (any, *er
 }

 // CategoryCreateHandler saves a new transaction category by request parameters for current user
-func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryCreateReq models.TransactionCategoryCreateRequest
 	err := c.ShouldBindJSON(&categoryCreateReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryCreateHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	if categoryCreateReq.Type < models.CATEGORY_TYPE_INCOME || categoryCreateReq.Type > models.CATEGORY_TYPE_TRANSFER {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] category type invalid, type is %d", categoryCreateReq.Type)
+		log.Warnf(c, "[transaction_categories.CategoryCreateHandler] category type invalid, type is %d", categoryCreateReq.Type)
 		return nil, errs.ErrTransactionCategoryTypeInvalid
 	}

@@ -92,17 +103,17 @@ func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (any,
 		parentCategory, err := a.categories.GetCategoryByCategoryId(c, uid, categoryCreateReq.ParentId)

 		if err != nil {
-			log.ErrorfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] failed to get parent category \"id:%d\" for user \"uid:%d\", because %s", categoryCreateReq.ParentId, uid, err.Error())
+			log.Errorf(c, "[transaction_categories.CategoryCreateHandler] failed to get parent category \"id:%d\" for user \"uid:%d\", because %s", categoryCreateReq.ParentId, uid, err.Error())
 			return nil, errs.Or(err, errs.ErrOperationFailed)
 		}

 		if parentCategory == nil {
-			log.WarnfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] parent category \"id:%d\" does not exist for user \"uid:%d\"", categoryCreateReq.ParentId, uid)
+			log.Warnf(c, "[transaction_categories.CategoryCreateHandler] parent category \"id:%d\" does not exist for user \"uid:%d\"", categoryCreateReq.ParentId, uid)
 			return nil, errs.ErrParentTransactionCategoryNotFound
 		}

 		if parentCategory.ParentCategoryId > 0 {
-			log.WarnfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] parent category \"id:%d\" has another parent category \"id:%d\" for user \"uid:%d\"", parentCategory.CategoryId, parentCategory.ParentCategoryId, uid)
+			log.Warnf(c, "[transaction_categories.CategoryCreateHandler] parent category \"id:%d\" has another parent category \"id:%d\" for user \"uid:%d\"", parentCategory.CategoryId, parentCategory.ParentCategoryId, uid)
 			return nil, errs.ErrCannotAddToSecondaryTransactionCategory
 		}
 	}
@@ -116,24 +127,24 @@ func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (any,
 	}

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	category := a.createNewCategoryModel(uid, &categoryCreateReq, maxOrderId+1)

-	if settings.Container.Current.EnableDuplicateSubmissionsCheck && categoryCreateReq.ClientSessionId != "" {
-		found, remark := duplicatechecker.Container.Get(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_CATEGORY, uid, categoryCreateReq.ClientSessionId)
+	if a.CurrentConfig().EnableDuplicateSubmissionsCheck && categoryCreateReq.ClientSessionId != "" {
+		found, remark := a.GetSubmissionRemark(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_CATEGORY, uid, categoryCreateReq.ClientSessionId)

 		if found {
-			log.InfofWithRequestId(c, "[transaction_categories.CategoryCreateHandler] another category \"id:%s\" has been created for user \"uid:%d\"", remark, uid)
+			log.Infof(c, "[transaction_categories.CategoryCreateHandler] another category \"id:%s\" has been created for user \"uid:%d\"", remark, uid)
 			categoryId, err := utils.StringToInt64(remark)

 			if err == nil {
 				category, err = a.categories.GetCategoryByCategoryId(c, uid, categoryId)

 				if err != nil {
-					log.ErrorfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] failed to get existed category \"id:%d\" for user \"uid:%d\", because %s", categoryId, uid, err.Error())
+					log.Errorf(c, "[transaction_categories.CategoryCreateHandler] failed to get existed category \"id:%d\" for user \"uid:%d\", because %s", categoryId, uid, err.Error())
 					return nil, errs.Or(err, errs.ErrOperationFailed)
 				}

@@ -147,25 +158,25 @@ func (a *TransactionCategoriesApi) CategoryCreateHandler(c *core.Context) (any,
 	err = a.categories.CreateCategory(c, category)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryCreateHandler] failed to create category \"id:%d\" for user \"uid:%d\", because %s", category.CategoryId, uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryCreateHandler] failed to create category \"id:%d\" for user \"uid:%d\", because %s", category.CategoryId, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_categories.CategoryCreateHandler] user \"uid:%d\" has created a new category \"id:%d\" successfully", uid, category.CategoryId)
+	log.Infof(c, "[transaction_categories.CategoryCreateHandler] user \"uid:%d\" has created a new category \"id:%d\" successfully", uid, category.CategoryId)

-	duplicatechecker.Container.Set(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_CATEGORY, uid, categoryCreateReq.ClientSessionId, utils.Int64ToString(category.CategoryId))
+	a.SetSubmissionRemarkIfEnable(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_CATEGORY, uid, categoryCreateReq.ClientSessionId, utils.Int64ToString(category.CategoryId))
 	categoryResp := category.ToTransactionCategoryInfoResponse()

 	return categoryResp, nil
 }

 // CategoryCreateBatchHandler saves some new transaction category by request parameters for current user
-func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryCreateBatchReq models.TransactionCategoryCreateBatchRequest
 	err := c.ShouldBindBodyWith(&categoryCreateBatchReq, binding.JSON)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryCreateBatchHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryCreateBatchHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -181,12 +192,12 @@ func (a *TransactionCategoriesApi) CategoryCreateBatchHandler(c *core.Context) (
 }

 // CategoryModifyHandler saves an existed transaction category by request parameters for current user
-func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryModifyReq models.TransactionCategoryModifyRequest
 	err := c.ShouldBindJSON(&categoryModifyReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryModifyHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryModifyHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -194,7 +205,7 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any,
 	category, err := a.categories.GetCategoryByCategoryId(c, uid, categoryModifyReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryModifyHandler] failed to get category \"id:%d\" for user \"uid:%d\", because %s", categoryModifyReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryModifyHandler] failed to get category \"id:%d\" for user \"uid:%d\", because %s", categoryModifyReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -218,11 +229,11 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any,
 		return nil, errs.ErrNothingWillBeUpdated
 	}

-	if category.ParentCategoryId == 0 && newCategory.ParentCategoryId != 0 {
+	if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId && newCategory.ParentCategoryId != models.LevelOneTransactionCategoryParentId {
 		return nil, errs.Or(err, errs.ErrNotAllowChangePrimaryTransactionCategoryToSecondary)
 	}

-	if category.ParentCategoryId != 0 && newCategory.ParentCategoryId == 0 {
+	if category.ParentCategoryId != models.LevelOneTransactionCategoryParentId && newCategory.ParentCategoryId == models.LevelOneTransactionCategoryParentId {
 		return nil, errs.Or(err, errs.ErrNotAllowChangeSecondaryTransactionCategoryToPrimary)
 	}

@@ -230,14 +241,14 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any,
 		fromPrimaryCategory, err := a.categories.GetCategoryByCategoryId(c, uid, category.ParentCategoryId)

 		if err != nil {
-			log.ErrorfWithRequestId(c, "[transaction_categories.CategoryModifyHandler] failed to get old primary category \"id:%d\" of category \"id:%d\" for user \"uid:%d\", because %s", category.ParentCategoryId, categoryModifyReq.Id, uid, err.Error())
+			log.Errorf(c, "[transaction_categories.CategoryModifyHandler] failed to get old primary category \"id:%d\" of category \"id:%d\" for user \"uid:%d\", because %s", category.ParentCategoryId, categoryModifyReq.Id, uid, err.Error())
 			return nil, errs.Or(err, errs.ErrOperationFailed)
 		}

 		toPrimaryCategory, err := a.categories.GetCategoryByCategoryId(c, uid, newCategory.ParentCategoryId)

 		if err != nil {
-			log.ErrorfWithRequestId(c, "[transaction_categories.CategoryModifyHandler] failed to get new primary category \"id:%d\" of category \"id:%d\" for user \"uid:%d\", because %s", newCategory.ParentCategoryId, categoryModifyReq.Id, uid, err.Error())
+			log.Errorf(c, "[transaction_categories.CategoryModifyHandler] failed to get new primary category \"id:%d\" of category \"id:%d\" for user \"uid:%d\", because %s", newCategory.ParentCategoryId, categoryModifyReq.Id, uid, err.Error())
 			return nil, errs.Or(err, errs.ErrOperationFailed)
 		}

@@ -245,7 +256,7 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any,
 			return nil, errs.Or(err, errs.ErrNotAllowChangePrimaryTransactionType)
 		}

-		if toPrimaryCategory.ParentCategoryId != 0 {
+		if toPrimaryCategory.ParentCategoryId != models.LevelOneTransactionCategoryParentId {
 			return nil, errs.Or(err, errs.ErrNotAllowUseSecondaryTransactionAsPrimaryCategory)
 		}
 	}
@@ -253,11 +264,11 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any,
 	err = a.categories.ModifyCategory(c, newCategory)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryModifyHandler] failed to update category \"id:%d\" for user \"uid:%d\", because %s", categoryModifyReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryModifyHandler] failed to update category \"id:%d\" for user \"uid:%d\", because %s", categoryModifyReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_categories.CategoryModifyHandler] user \"uid:%d\" has updated category \"id:%d\" successfully", uid, categoryModifyReq.Id)
+	log.Infof(c, "[transaction_categories.CategoryModifyHandler] user \"uid:%d\" has updated category \"id:%d\" successfully", uid, categoryModifyReq.Id)

 	newCategory.Type = category.Type
 	newCategory.DisplayOrder = category.DisplayOrder
@@ -267,12 +278,12 @@ func (a *TransactionCategoriesApi) CategoryModifyHandler(c *core.Context) (any,
 }

 // CategoryHideHandler hides an existed transaction category by request parameters for current user
-func (a *TransactionCategoriesApi) CategoryHideHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryHideHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryHideReq models.TransactionCategoryHideRequest
 	err := c.ShouldBindJSON(&categoryHideReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryHideHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryHideHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -280,21 +291,21 @@ func (a *TransactionCategoriesApi) CategoryHideHandler(c *core.Context) (any, *e
 	err = a.categories.HideCategory(c, uid, []int64{categoryHideReq.Id}, categoryHideReq.Hidden)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryHideHandler] failed to hide category \"id:%d\" for user \"uid:%d\", because %s", categoryHideReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryHideHandler] failed to hide category \"id:%d\" for user \"uid:%d\", because %s", categoryHideReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_categories.CategoryHideHandler] user \"uid:%d\" has hidden category \"id:%d\"", uid, categoryHideReq.Id)
+	log.Infof(c, "[transaction_categories.CategoryHideHandler] user \"uid:%d\" has hidden category \"id:%d\"", uid, categoryHideReq.Id)
 	return true, nil
 }

 // CategoryMoveHandler moves display order of existed transaction categories by request parameters for current user
-func (a *TransactionCategoriesApi) CategoryMoveHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryMoveHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryMoveReq models.TransactionCategoryMoveRequest
 	err := c.ShouldBindJSON(&categoryMoveReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryMoveHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryMoveHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -315,21 +326,21 @@ func (a *TransactionCategoriesApi) CategoryMoveHandler(c *core.Context) (any, *e
 	err = a.categories.ModifyCategoryDisplayOrders(c, uid, categories)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryMoveHandler] failed to move categories for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryMoveHandler] failed to move categories for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_categories.CategoryMoveHandler] user \"uid:%d\" has moved categories", uid)
+	log.Infof(c, "[transaction_categories.CategoryMoveHandler] user \"uid:%d\" has moved categories", uid)
 	return true, nil
 }

 // CategoryDeleteHandler deletes an existed transaction category by request parameters for current user
-func (a *TransactionCategoriesApi) CategoryDeleteHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionCategoriesApi) CategoryDeleteHandler(c *core.WebContext) (any, *errs.Error) {
 	var categoryDeleteReq models.TransactionCategoryDeleteRequest
 	err := c.ShouldBindJSON(&categoryDeleteReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_categories.CategoryDeleteHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_categories.CategoryDeleteHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -337,15 +348,15 @@ func (a *TransactionCategoriesApi) CategoryDeleteHandler(c *core.Context) (any,
 	err = a.categories.DeleteCategory(c, uid, categoryDeleteReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.CategoryDeleteHandler] failed to delete category \"id:%d\" for user \"uid:%d\", because %s", categoryDeleteReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_categories.CategoryDeleteHandler] failed to delete category \"id:%d\" for user \"uid:%d\", because %s", categoryDeleteReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_categories.CategoryDeleteHandler] user \"uid:%d\" has deleted category \"id:%d\"", uid, categoryDeleteReq.Id)
+	log.Infof(c, "[transaction_categories.CategoryDeleteHandler] user \"uid:%d\" has deleted category \"id:%d\"", uid, categoryDeleteReq.Id)
 	return true, nil
 }

-func (a *TransactionCategoriesApi) createBatchCategories(c *core.Context, uid int64, categoryCreateBatchReq *models.TransactionCategoryCreateBatchRequest) ([]*models.TransactionCategory, error) {
+func (a *TransactionCategoriesApi) createBatchCategories(c *core.WebContext, uid int64, categoryCreateBatchReq *models.TransactionCategoryCreateBatchRequest) ([]*models.TransactionCategory, error) {
 	var err error
 	categoryTypeMaxOrderMap := make(map[models.TransactionCategoryType]int32)
 	categoriesMap := make(map[*models.TransactionCategory][]*models.TransactionCategory)
@@ -360,7 +371,7 @@ func (a *TransactionCategoriesApi) createBatchCategories(c *core.Context, uid in
 			maxOrderId, err = a.categories.GetMaxDisplayOrder(c, uid, categoryCreateReq.Type)

 			if err != nil {
-				log.ErrorfWithRequestId(c, "[transaction_categories.CategoryCreateBatchHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
+				log.Errorf(c, "[transaction_categories.CategoryCreateBatchHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
 				return nil, errs.Or(err, errs.ErrOperationFailed)
 			}
 		}
@@ -388,11 +399,11 @@ func (a *TransactionCategoriesApi) createBatchCategories(c *core.Context, uid in
 	categories, err := a.categories.CreateCategories(c, uid, categoriesMap)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_categories.createBatchCategories] failed to create categories for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_categories.createBatchCategories] failed to create categories for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_categories.createBatchCategories] user \"uid:%d\" has created categories successfully", uid)
+	log.Infof(c, "[transaction_categories.createBatchCategories] user \"uid:%d\" has created categories successfully", uid)

 	return categories, nil
 }
@@ -422,7 +433,7 @@ func (a *TransactionCategoriesApi) getTransactionCategoryListByTypeResponse(cate
 	for i := 0; i < len(categoryResps); i++ {
 		categoryResp := categoryResps[i]

-		if categoryResp.ParentId <= models.LevelOneTransactionParentId {
+		if categoryResp.ParentId <= models.LevelOneTransactionCategoryParentId {
 			continue
 		}

@@ -438,7 +449,7 @@ func (a *TransactionCategoriesApi) getTransactionCategoryListByTypeResponse(cate
 	finalCategoryResps := make(models.TransactionCategoryInfoResponseSlice, 0)

 	for i := 0; i < len(categoryResps); i++ {
-		if parentId <= 0 && categoryResps[i].ParentId == models.LevelOneTransactionParentId {
+		if parentId <= 0 && categoryResps[i].ParentId == models.LevelOneTransactionCategoryParentId {
 			sort.Sort(categoryResps[i].SubCategories)
 			finalCategoryResps = append(finalCategoryResps, categoryResps[i])
 		} else if parentId > 0 && categoryResps[i].ParentId == parentId {
@@ -0,0 +1,183 @@
+package api
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/duplicatechecker"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/services"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+// TransactionPicturesApi represents transaction pictures api
+type TransactionPicturesApi struct {
+	ApiUsingConfig
+	ApiUsingDuplicateChecker
+	users    *services.UserService
+	pictures *services.TransactionPictureService
+}
+
+// Initialize a transaction api singleton instance
+var (
+	TransactionPictures = &TransactionPicturesApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		ApiUsingDuplicateChecker: ApiUsingDuplicateChecker{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			container: duplicatechecker.Container,
+		},
+		users:    services.Users,
+		pictures: services.TransactionPictures,
+	}
+)
+
+// TransactionPictureUploadHandler saves transaction picture by request parameters for current user
+func (a *TransactionPicturesApi) TransactionPictureUploadHandler(c *core.WebContext) (any, *errs.Error) {
+	uid := c.GetCurrentUid()
+	form, err := c.MultipartForm()
+
+	if err != nil {
+		log.Errorf(c, "[transaction_pictures.TransactionPictureUploadHandler] failed to get multi-part form data for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.ErrParameterInvalid
+	}
+
+	pictureFiles := form.File["picture"]
+
+	if len(pictureFiles) < 1 {
+		log.Warnf(c, "[transaction_pictures.TransactionPictureUploadHandler] there is no transaction picture in request for user \"uid:%d\"", uid)
+		return nil, errs.ErrNoTransactionPicture
+	}
+
+	if pictureFiles[0].Size < 1 {
+		log.Warnf(c, "[transaction_pictures.TransactionPictureUploadHandler] the size of transaction picture in request is zero for user \"uid:%d\"", uid)
+		return nil, errs.ErrTransactionPictureIsEmpty
+	}
+
+	if pictureFiles[0].Size > int64(a.CurrentConfig().MaxTransactionPictureFileSize) {
+		log.Warnf(c, "[transaction_pictures.TransactionPictureUploadHandler] the upload file size \"%d\" exceeds the maximum size \"%d\" of transaction picture for user \"uid:%d\"", pictureFiles[0].Size, a.CurrentConfig().MaxTransactionPictureFileSize, uid)
+		return nil, errs.ErrExceedMaxTransactionPictureFileSize
+	}
+
+	fileExtension := utils.GetFileNameExtension(pictureFiles[0].Filename)
+
+	if utils.GetImageContentType(fileExtension) == "" {
+		log.Warnf(c, "[transaction_pictures.TransactionPictureUploadHandler] the file extension \"%s\" of transaction picture in request is not supported for user \"uid:%d\"", fileExtension, uid)
+		return nil, errs.ErrImageTypeNotSupported
+	}
+
+	pictureFile, err := pictureFiles[0].Open()
+
+	if err != nil {
+		log.Errorf(c, "[transaction_pictures.TransactionPictureUploadHandler] failed to get transaction picture file from request for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.ErrOperationFailed
+	}
+
+	pictureInfo := a.createNewPictureInfoModel(uid, fileExtension, c.ClientIP())
+
+	clientSessionIds := form.Value["clientSessionId"]
+	clientSessionId := ""
+
+	if len(clientSessionIds) > 0 {
+		clientSessionId = clientSessionIds[0]
+	}
+
+	if a.CurrentConfig().EnableDuplicateSubmissionsCheck && clientSessionId != "" {
+		found, remark := a.GetSubmissionRemark(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_PICTURE, uid, clientSessionId)
+
+		if found {
+			log.Infof(c, "[transaction_pictures.TransactionPictureUploadHandler] another transaction picture \"id:%s\" has been uploaded for user \"uid:%d\"", remark, uid)
+			pictureId, err := utils.StringToInt64(remark)
+
+			if err == nil {
+				pictureInfo, err = a.pictures.GetPictureInfoByPictureId(c, uid, pictureId)
+
+				if err != nil {
+					log.Errorf(c, "[transaction_pictures.TransactionPictureUploadHandler] failed to get existed transaction picture \"id:%d\" for user \"uid:%d\", because %s", pictureId, uid, err.Error())
+					return nil, errs.Or(err, errs.ErrOperationFailed)
+				}
+
+				pictureInfoResp := a.GetTransactionPictureInfoResponse(pictureInfo)
+
+				return pictureInfoResp, nil
+			}
+		}
+	}
+
+	err = a.pictures.UploadPicture(c, pictureInfo, pictureFile)
+
+	if err != nil {
+		log.Errorf(c, "[transaction_pictures.TransactionPictureUploadHandler] failed to update transaction picture for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	a.SetSubmissionRemarkIfEnable(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_PICTURE, uid, clientSessionId, utils.Int64ToString(pictureInfo.PictureId))
+	pictureInfoResp := a.GetTransactionPictureInfoResponse(pictureInfo)
+
+	return pictureInfoResp, nil
+}
+
+// TransactionPictureGetHandler returns transaction picture data for current user
+func (a *TransactionPicturesApi) TransactionPictureGetHandler(c *core.WebContext) ([]byte, string, *errs.Error) {
+	fileName := c.Param("fileName")
+	fileExtension := utils.GetFileNameExtension(fileName)
+	contentType := utils.GetImageContentType(fileExtension)
+
+	if contentType == "" {
+		return nil, "", errs.ErrImageTypeNotSupported
+	}
+
+	fileBaseName := utils.GetFileNameWithoutExtension(fileName)
+	pictureId, err := utils.StringToInt64(fileBaseName)
+
+	if err != nil {
+		return nil, "", errs.ErrTransactionPictureIdInvalid
+	}
+
+	uid := c.GetCurrentUid()
+	pictureData, err := a.pictures.GetPictureByPictureId(c, uid, pictureId, fileExtension)
+
+	if err != nil {
+		if !errs.IsCustomError(err) {
+			log.Errorf(c, "[transaction_pictures.TransactionPictureUploadHandler] failed to get transaction picture, because %s", err.Error())
+		}
+
+		return nil, "", errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	return pictureData, contentType, nil
+}
+
+// TransactionPictureRemoveUnusedHandler removes unused transaction picture by request parameters for current user
+func (a *TransactionPicturesApi) TransactionPictureRemoveUnusedHandler(c *core.WebContext) (any, *errs.Error) {
+	var pictureDeleteReq models.TransactionPictureUnusedDeleteRequest
+	err := c.ShouldBindJSON(&pictureDeleteReq)
+
+	if err != nil {
+		log.Warnf(c, "[transaction_pictures.TransactionPictureRemoveUnusedHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	err = a.pictures.RemoveUnusedTransactionPicture(c, uid, pictureDeleteReq.Id)
+
+	if err != nil {
+		log.Errorf(c, "[transaction_pictures.TransactionPictureRemoveUnusedHandler] failed to remove unused transaction picture for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	return true, nil
+}
+
+func (a *TransactionPicturesApi) createNewPictureInfoModel(uid int64, fileExtension string, clientIp string) *models.TransactionPictureInfo {
+	return &models.TransactionPictureInfo{
+		Uid:              uid,
+		TransactionId:    models.TransactionPictureNewPictureTransactionId,
+		PictureExtension: fileExtension,
+		CreatedIp:        clientIp,
+	}
+}
@@ -23,12 +23,12 @@ var (
 )

 // TagListHandler returns transaction tag list of current user
-func (a *TransactionTagsApi) TagListHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTagsApi) TagListHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	tags, err := a.tags.GetAllTagsByUid(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagListHandler] failed to get tags for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagListHandler] failed to get tags for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -44,12 +44,12 @@ func (a *TransactionTagsApi) TagListHandler(c *core.Context) (any, *errs.Error)
 }

 // TagGetHandler returns one specific transaction tag of current user
-func (a *TransactionTagsApi) TagGetHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTagsApi) TagGetHandler(c *core.WebContext) (any, *errs.Error) {
 	var tagGetReq models.TransactionTagGetRequest
 	err := c.ShouldBindQuery(&tagGetReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_tags.TagGetHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_tags.TagGetHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -57,7 +57,7 @@ func (a *TransactionTagsApi) TagGetHandler(c *core.Context) (any, *errs.Error) {
 	tag, err := a.tags.GetTagByTagId(c, uid, tagGetReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagGetHandler] failed to get tag \"id:%d\" for user \"uid:%d\", because %s", tagGetReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagGetHandler] failed to get tag \"id:%d\" for user \"uid:%d\", because %s", tagGetReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -67,12 +67,12 @@ func (a *TransactionTagsApi) TagGetHandler(c *core.Context) (any, *errs.Error) {
 }

 // TagCreateHandler saves a new transaction tag by request parameters for current user
-func (a *TransactionTagsApi) TagCreateHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTagsApi) TagCreateHandler(c *core.WebContext) (any, *errs.Error) {
 	var tagCreateReq models.TransactionTagCreateRequest
 	err := c.ShouldBindJSON(&tagCreateReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_tags.TagCreateHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_tags.TagCreateHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -81,7 +81,7 @@ func (a *TransactionTagsApi) TagCreateHandler(c *core.Context) (any, *errs.Error
 	maxOrderId, err := a.tags.GetMaxDisplayOrder(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -90,24 +90,65 @@ func (a *TransactionTagsApi) TagCreateHandler(c *core.Context) (any, *errs.Error
 	err = a.tags.CreateTag(c, tag)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagCreateHandler] failed to create tag \"id:%d\" for user \"uid:%d\", because %s", tag.TagId, uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagCreateHandler] failed to create tag \"id:%d\" for user \"uid:%d\", because %s", tag.TagId, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_tags.TagCreateHandler] user \"uid:%d\" has created a new tag \"id:%d\" successfully", uid, tag.TagId)
+	log.Infof(c, "[transaction_tags.TagCreateHandler] user \"uid:%d\" has created a new tag \"id:%d\" successfully", uid, tag.TagId)

 	tagResp := tag.ToTransactionTagInfoResponse()

 	return tagResp, nil
 }

+// TagCreateBatchHandler saves some new transaction tags by request parameters for current user
+func (a *TransactionTagsApi) TagCreateBatchHandler(c *core.WebContext) (any, *errs.Error) {
+	var tagCreateBatchReq models.TransactionTagCreateBatchRequest
+	err := c.ShouldBindJSON(&tagCreateBatchReq)
+
+	if err != nil {
+		log.Warnf(c, "[transaction_tags.TagCreateBatchHandler] parse request failed, because %s", err.Error())
+		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+
+	maxOrderId, err := a.tags.GetMaxDisplayOrder(c, uid)
+
+	if err != nil {
+		log.Errorf(c, "[transaction_tags.TagCreateBatchHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	tags := a.createNewTagModels(uid, &tagCreateBatchReq, maxOrderId+1)
+
+	err = a.tags.CreateTags(c, uid, tags, tagCreateBatchReq.SkipExists)
+
+	if err != nil {
+		log.Errorf(c, "[transaction_tags.TagCreateBatchHandler] failed to create tags for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.Infof(c, "[transaction_tags.TagCreateBatchHandler] user \"uid:%d\" has created tags successfully", uid)
+
+	tagResps := make(models.TransactionTagInfoResponseSlice, len(tags))
+
+	for i := 0; i < len(tags); i++ {
+		tagResps[i] = tags[i].ToTransactionTagInfoResponse()
+	}
+
+	sort.Sort(tagResps)
+
+	return tagResps, nil
+}
+
 // TagModifyHandler saves an existed transaction tag by request parameters for current user
-func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTagsApi) TagModifyHandler(c *core.WebContext) (any, *errs.Error) {
 	var tagModifyReq models.TransactionTagModifyRequest
 	err := c.ShouldBindJSON(&tagModifyReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_tags.TagModifyHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_tags.TagModifyHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -115,7 +156,7 @@ func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (any, *errs.Error
 	tag, err := a.tags.GetTagByTagId(c, uid, tagModifyReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagModifyHandler] failed to get tag \"id:%d\" for user \"uid:%d\", because %s", tagModifyReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagModifyHandler] failed to get tag \"id:%d\" for user \"uid:%d\", because %s", tagModifyReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -132,11 +173,11 @@ func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (any, *errs.Error
 	err = a.tags.ModifyTag(c, newTag)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagModifyHandler] failed to update tag \"id:%d\" for user \"uid:%d\", because %s", tagModifyReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagModifyHandler] failed to update tag \"id:%d\" for user \"uid:%d\", because %s", tagModifyReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_tags.TagModifyHandler] user \"uid:%d\" has updated tag \"id:%d\" successfully", uid, tagModifyReq.Id)
+	log.Infof(c, "[transaction_tags.TagModifyHandler] user \"uid:%d\" has updated tag \"id:%d\" successfully", uid, tagModifyReq.Id)

 	tag.Name = newTag.Name
 	tagResp := tag.ToTransactionTagInfoResponse()
@@ -144,13 +185,13 @@ func (a *TransactionTagsApi) TagModifyHandler(c *core.Context) (any, *errs.Error
 	return tagResp, nil
 }

-// TagHideHandler hides an transaction tag by request parameters for current user
-func (a *TransactionTagsApi) TagHideHandler(c *core.Context) (any, *errs.Error) {
+// TagHideHandler hides a transaction tag by request parameters for current user
+func (a *TransactionTagsApi) TagHideHandler(c *core.WebContext) (any, *errs.Error) {
 	var tagHideReq models.TransactionTagHideRequest
 	err := c.ShouldBindJSON(&tagHideReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_tags.TagHideHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_tags.TagHideHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -158,21 +199,21 @@ func (a *TransactionTagsApi) TagHideHandler(c *core.Context) (any, *errs.Error)
 	err = a.tags.HideTag(c, uid, []int64{tagHideReq.Id}, tagHideReq.Hidden)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagHideHandler] failed to hide tag \"id:%d\" for user \"uid:%d\", because %s", tagHideReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagHideHandler] failed to hide tag \"id:%d\" for user \"uid:%d\", because %s", tagHideReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_tags.TagHideHandler] user \"uid:%d\" has hidden tag \"id:%d\"", uid, tagHideReq.Id)
+	log.Infof(c, "[transaction_tags.TagHideHandler] user \"uid:%d\" has hidden tag \"id:%d\"", uid, tagHideReq.Id)
 	return true, nil
 }

 // TagMoveHandler moves display order of existed transaction tags by request parameters for current user
-func (a *TransactionTagsApi) TagMoveHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTagsApi) TagMoveHandler(c *core.WebContext) (any, *errs.Error) {
 	var tagMoveReq models.TransactionTagMoveRequest
 	err := c.ShouldBindJSON(&tagMoveReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_tags.TagMoveHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_tags.TagMoveHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -193,21 +234,21 @@ func (a *TransactionTagsApi) TagMoveHandler(c *core.Context) (any, *errs.Error)
 	err = a.tags.ModifyTagDisplayOrders(c, uid, tags)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagMoveHandler] failed to move tags for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagMoveHandler] failed to move tags for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_tags.TagMoveHandler] user \"uid:%d\" has moved tags", uid)
+	log.Infof(c, "[transaction_tags.TagMoveHandler] user \"uid:%d\" has moved tags", uid)
 	return true, nil
 }

 // TagDeleteHandler deletes an existed transaction tag by request parameters for current user
-func (a *TransactionTagsApi) TagDeleteHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTagsApi) TagDeleteHandler(c *core.WebContext) (any, *errs.Error) {
 	var tagDeleteReq models.TransactionTagDeleteRequest
 	err := c.ShouldBindJSON(&tagDeleteReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_tags.TagDeleteHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_tags.TagDeleteHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -215,11 +256,11 @@ func (a *TransactionTagsApi) TagDeleteHandler(c *core.Context) (any, *errs.Error
 	err = a.tags.DeleteTag(c, uid, tagDeleteReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_tags.TagDeleteHandler] failed to delete tag \"id:%d\" for user \"uid:%d\", because %s", tagDeleteReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_tags.TagDeleteHandler] failed to delete tag \"id:%d\" for user \"uid:%d\", because %s", tagDeleteReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_tags.TagDeleteHandler] user \"uid:%d\" has deleted tag \"id:%d\"", uid, tagDeleteReq.Id)
+	log.Infof(c, "[transaction_tags.TagDeleteHandler] user \"uid:%d\" has deleted tag \"id:%d\"", uid, tagDeleteReq.Id)
 	return true, nil
 }

@@ -230,3 +271,15 @@ func (a *TransactionTagsApi) createNewTagModel(uid int64, tagCreateReq *models.T
 		DisplayOrder: order,
 	}
 }
+
+func (a *TransactionTagsApi) createNewTagModels(uid int64, tagCreateBatchReq *models.TransactionTagCreateBatchRequest, order int32) []*models.TransactionTag {
+	tags := make([]*models.TransactionTag, len(tagCreateBatchReq.Tags))
+
+	for i := 0; i < len(tagCreateBatchReq.Tags); i++ {
+		tagCreateReq := tagCreateBatchReq.Tags[i]
+		tag := a.createNewTagModel(uid, tagCreateReq, order+int32(i))
+		tags[i] = tag
+	}
+
+	return tags
+}
@@ -3,6 +3,7 @@ package api
 import (
 	"sort"
 	"strings"
+	"time"

 	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/duplicatechecker"
@@ -14,38 +15,55 @@ import (
 	"github.com/mayswind/ezbookkeeping/pkg/utils"
 )

+const maximumTagsCountOfTemplate = 10
+
 // TransactionTemplatesApi represents transaction template api
 type TransactionTemplatesApi struct {
+	ApiUsingConfig
+	ApiUsingDuplicateChecker
 	templates *services.TransactionTemplateService
 }

 // Initialize a transaction template api singleton instance
 var (
 	TransactionTemplates = &TransactionTemplatesApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		ApiUsingDuplicateChecker: ApiUsingDuplicateChecker{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			container: duplicatechecker.Container,
+		},
 		templates: services.TransactionTemplates,
 	}
 )

 // TemplateListHandler returns transaction template list of current user
-func (a *TransactionTemplatesApi) TemplateListHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTemplatesApi) TemplateListHandler(c *core.WebContext) (any, *errs.Error) {
 	var templateListReq models.TransactionTemplateListRequest
 	err := c.ShouldBindQuery(&templateListReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateListHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_templates.TemplateListHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

-	if templateListReq.TemplateType < models.TRANSACTION_TEMPLATE_TYPE_NORMAL || templateListReq.TemplateType > models.TRANSACTION_TEMPLATE_TYPE_NORMAL {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateListHandler] template type invalid, type is %d", templateListReq.TemplateType)
+	if templateListReq.TemplateType < models.TRANSACTION_TEMPLATE_TYPE_NORMAL || templateListReq.TemplateType > models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE {
+		log.Warnf(c, "[transaction_templates.TemplateListHandler] template type invalid, type is %d", templateListReq.TemplateType)
 		return nil, errs.ErrTransactionTemplateTypeInvalid
 	}

+	if templateListReq.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE && !a.CurrentConfig().EnableScheduledTransaction {
+		return nil, errs.ErrScheduledTransactionNotEnabled
+	}
+
 	uid := c.GetCurrentUid()
 	templates, err := a.templates.GetAllTemplatesByUid(c, uid, templateListReq.TemplateType)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateListHandler] failed to get templates for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateListHandler] failed to get templates for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -62,12 +80,12 @@ func (a *TransactionTemplatesApi) TemplateListHandler(c *core.Context) (any, *er
 }

 // TemplateGetHandler returns one specific transaction template of current user
-func (a *TransactionTemplatesApi) TemplateGetHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTemplatesApi) TemplateGetHandler(c *core.WebContext) (any, *errs.Error) {
 	var templateGetReq models.TransactionTemplateGetRequest
 	err := c.ShouldBindQuery(&templateGetReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateGetHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_templates.TemplateGetHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -75,10 +93,14 @@ func (a *TransactionTemplatesApi) TemplateGetHandler(c *core.Context) (any, *err
 	template, err := a.templates.GetTemplateByTemplateId(c, uid, templateGetReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateGetHandler] failed to get template \"id:%d\" for user \"uid:%d\", because %s", templateGetReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateGetHandler] failed to get template \"id:%d\" for user \"uid:%d\", because %s", templateGetReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

+	if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE && !a.CurrentConfig().EnableScheduledTransaction {
+		return nil, errs.ErrScheduledTransactionNotEnabled
+	}
+
 	serverUtcOffset := utils.GetServerTimezoneOffsetMinutes()
 	templateResp := template.ToTransactionTemplateInfoResponse(serverUtcOffset)

@@ -86,49 +108,76 @@ func (a *TransactionTemplatesApi) TemplateGetHandler(c *core.Context) (any, *err
 }

 // TemplateCreateHandler saves a new transaction template by request parameters for current user
-func (a *TransactionTemplatesApi) TemplateCreateHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTemplatesApi) TemplateCreateHandler(c *core.WebContext) (any, *errs.Error) {
 	var templateCreateReq models.TransactionTemplateCreateRequest
 	err := c.ShouldBindJSON(&templateCreateReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateCreateHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_templates.TemplateCreateHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

-	if templateCreateReq.TemplateType < models.TRANSACTION_TEMPLATE_TYPE_NORMAL || templateCreateReq.TemplateType > models.TRANSACTION_TEMPLATE_TYPE_NORMAL {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateCreateHandler] template type invalid, type is %d", templateCreateReq.TemplateType)
+	if templateCreateReq.TemplateType < models.TRANSACTION_TEMPLATE_TYPE_NORMAL || templateCreateReq.TemplateType > models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE {
+		log.Warnf(c, "[transaction_templates.TemplateCreateHandler] template type invalid, type is %d", templateCreateReq.TemplateType)
 		return nil, errs.ErrTransactionTemplateTypeInvalid
 	}

+	if templateCreateReq.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE && !a.CurrentConfig().EnableScheduledTransaction {
+		return nil, errs.ErrScheduledTransactionNotEnabled
+	}
+
 	if templateCreateReq.Type <= models.TRANSACTION_TYPE_MODIFY_BALANCE || templateCreateReq.Type > models.TRANSACTION_TYPE_TRANSFER {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateCreateHandler] transaction type invalid, type is %d", templateCreateReq.Type)
+		log.Warnf(c, "[transaction_templates.TemplateCreateHandler] transaction type invalid, type is %d", templateCreateReq.Type)
 		return nil, errs.ErrTransactionTypeInvalid
 	}

+	if templateCreateReq.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE {
+		if templateCreateReq.ScheduledFrequencyType == nil ||
+			templateCreateReq.ScheduledFrequency == nil ||
+			templateCreateReq.ScheduledTimezoneUtcOffset == nil {
+			return nil, errs.ErrScheduledTransactionFrequencyInvalid
+		}
+
+		if *templateCreateReq.ScheduledFrequencyType == models.TRANSACTION_SCHEDULE_FREQUENCY_TYPE_DISABLED && *templateCreateReq.ScheduledFrequency != "" {
+			return nil, errs.ErrScheduledTransactionFrequencyInvalid
+		} else if *templateCreateReq.ScheduledFrequencyType != models.TRANSACTION_SCHEDULE_FREQUENCY_TYPE_DISABLED && *templateCreateReq.ScheduledFrequency == "" {
+			return nil, errs.ErrScheduledTransactionFrequencyInvalid
+		}
+	}
+
+	if len(templateCreateReq.TagIds) > maximumTagsCountOfTemplate {
+		return nil, errs.ErrTransactionTemplateHasTooManyTags
+	}
+
 	uid := c.GetCurrentUid()

 	maxOrderId, err := a.templates.GetMaxDisplayOrder(c, uid, templateCreateReq.TemplateType)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateCreateHandler] failed to get max display order for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	serverUtcOffset := utils.GetServerTimezoneOffsetMinutes()
-	template := a.createNewTemplateModel(uid, &templateCreateReq, maxOrderId+1)
+	template, err := a.createNewTemplateModel(uid, &templateCreateReq, maxOrderId+1)

-	if settings.Container.Current.EnableDuplicateSubmissionsCheck && templateCreateReq.ClientSessionId != "" {
-		found, remark := duplicatechecker.Container.Get(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_TEMPLATE, uid, templateCreateReq.ClientSessionId)
+	if err != nil {
+		log.Errorf(c, "[transaction_templates.TemplateCreateHandler] failed to create new template for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	if a.CurrentConfig().EnableDuplicateSubmissionsCheck && templateCreateReq.ClientSessionId != "" {
+		found, remark := a.GetSubmissionRemark(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_TEMPLATE, uid, templateCreateReq.ClientSessionId)

 		if found {
-			log.InfofWithRequestId(c, "[transaction_templates.TemplateCreateHandler] another template \"id:%s\" has been created for user \"uid:%d\"", remark, uid)
+			log.Infof(c, "[transaction_templates.TemplateCreateHandler] another template \"id:%s\" has been created for user \"uid:%d\"", remark, uid)
 			templateId, err := utils.StringToInt64(remark)

 			if err == nil {
 				template, err = a.templates.GetTemplateByTemplateId(c, uid, templateId)

 				if err != nil {
-					log.ErrorfWithRequestId(c, "[transaction_templates.TemplateCreateHandler] failed to get existed template \"id:%d\" for user \"uid:%d\", because %s", templateId, uid, err.Error())
+					log.Errorf(c, "[transaction_templates.TemplateCreateHandler] failed to get existed template \"id:%d\" for user \"uid:%d\", because %s", templateId, uid, err.Error())
 					return nil, errs.Or(err, errs.ErrOperationFailed)
 				}

@@ -142,30 +191,30 @@ func (a *TransactionTemplatesApi) TemplateCreateHandler(c *core.Context) (any, *
 	err = a.templates.CreateTemplate(c, template)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateCreateHandler] failed to create template \"id:%d\" for user \"uid:%d\", because %s", template.TemplateId, uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateCreateHandler] failed to create template \"id:%d\" for user \"uid:%d\", because %s", template.TemplateId, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_templates.TemplateCreateHandler] user \"uid:%d\" has created a new template \"id:%d\" successfully", uid, template.TemplateId)
+	log.Infof(c, "[transaction_templates.TemplateCreateHandler] user \"uid:%d\" has created a new template \"id:%d\" successfully", uid, template.TemplateId)

-	duplicatechecker.Container.Set(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_TEMPLATE, uid, templateCreateReq.ClientSessionId, utils.Int64ToString(template.TemplateId))
+	a.SetSubmissionRemarkIfEnable(duplicatechecker.DUPLICATE_CHECKER_TYPE_NEW_TEMPLATE, uid, templateCreateReq.ClientSessionId, utils.Int64ToString(template.TemplateId))
 	templateResp := template.ToTransactionTemplateInfoResponse(serverUtcOffset)

 	return templateResp, nil
 }

 // TemplateModifyHandler saves an existed transaction template by request parameters for current user
-func (a *TransactionTemplatesApi) TemplateModifyHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTemplatesApi) TemplateModifyHandler(c *core.WebContext) (any, *errs.Error) {
 	var templateModifyReq models.TransactionTemplateModifyRequest
 	err := c.ShouldBindJSON(&templateModifyReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateModifyHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_templates.TemplateModifyHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	if templateModifyReq.Type <= models.TRANSACTION_TYPE_MODIFY_BALANCE || templateModifyReq.Type > models.TRANSACTION_TYPE_TRANSFER {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateModifyHandler] transaction type invalid, type is %d", templateModifyReq.Type)
+		log.Warnf(c, "[transaction_templates.TemplateModifyHandler] transaction type invalid, type is %d", templateModifyReq.Type)
 		return nil, errs.ErrTransactionTypeInvalid
 	}

@@ -173,10 +222,32 @@ func (a *TransactionTemplatesApi) TemplateModifyHandler(c *core.Context) (any, *
 	template, err := a.templates.GetTemplateByTemplateId(c, uid, templateModifyReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateModifyHandler] failed to get template \"id:%d\" for user \"uid:%d\", because %s", templateModifyReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateModifyHandler] failed to get template \"id:%d\" for user \"uid:%d\", because %s", templateModifyReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

+	if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE && !a.CurrentConfig().EnableScheduledTransaction {
+		return nil, errs.ErrScheduledTransactionNotEnabled
+	}
+
+	if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE {
+		if templateModifyReq.ScheduledFrequencyType == nil ||
+			templateModifyReq.ScheduledFrequency == nil ||
+			templateModifyReq.ScheduledTimezoneUtcOffset == nil {
+			return nil, errs.ErrScheduledTransactionFrequencyInvalid
+		}
+
+		if *templateModifyReq.ScheduledFrequencyType == models.TRANSACTION_SCHEDULE_FREQUENCY_TYPE_DISABLED && *templateModifyReq.ScheduledFrequency != "" {
+			return nil, errs.ErrScheduledTransactionFrequencyInvalid
+		} else if *templateModifyReq.ScheduledFrequencyType != models.TRANSACTION_SCHEDULE_FREQUENCY_TYPE_DISABLED && *templateModifyReq.ScheduledFrequency == "" {
+			return nil, errs.ErrScheduledTransactionFrequencyInvalid
+		}
+	}
+
+	if len(templateModifyReq.TagIds) > maximumTagsCountOfTemplate {
+		return nil, errs.ErrTransactionTemplateHasTooManyTags
+	}
+
 	newTemplate := &models.TransactionTemplate{
 		TemplateId:           template.TemplateId,
 		Uid:                  uid,
@@ -192,6 +263,41 @@ func (a *TransactionTemplatesApi) TemplateModifyHandler(c *core.Context) (any, *
 		Comment:              templateModifyReq.Comment,
 	}

+	if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE {
+		newTemplate.ScheduledFrequencyType = *templateModifyReq.ScheduledFrequencyType
+		newTemplate.ScheduledFrequency = a.getOrderedFrequencyValues(*templateModifyReq.ScheduledFrequency)
+		newTemplate.ScheduledAt = a.getUTCScheduledAt(*templateModifyReq.ScheduledTimezoneUtcOffset)
+		newTemplate.ScheduledTimezoneUtcOffset = *templateModifyReq.ScheduledTimezoneUtcOffset
+
+		if templateModifyReq.ScheduledStartDate != nil {
+			startTime, err := utils.ParseFromLongDateFirstTime(*templateModifyReq.ScheduledStartDate, *templateModifyReq.ScheduledTimezoneUtcOffset)
+
+			if err != nil {
+				log.Errorf(c, "[transaction_templates.TemplateModifyHandler] failed to parse scheduled start date for user \"uid:%d\", because %s", uid, err.Error())
+				return nil, errs.Or(err, errs.ErrOperationFailed)
+			}
+
+			startUnixTime := startTime.Unix()
+			newTemplate.ScheduledStartTime = &startUnixTime
+		}
+
+		if templateModifyReq.ScheduledEndDate != nil {
+			endTime, err := utils.ParseFromLongDateLastTime(*templateModifyReq.ScheduledEndDate, *templateModifyReq.ScheduledTimezoneUtcOffset)
+
+			if err != nil {
+				log.Errorf(c, "[transaction_templates.TemplateModifyHandler] failed to parse scheduled end date for user \"uid:%d\", because %s", uid, err.Error())
+				return nil, errs.Or(err, errs.ErrOperationFailed)
+			}
+
+			endUnixTime := endTime.Unix()
+			newTemplate.ScheduledEndTime = &endUnixTime
+		}
+
+		if newTemplate.ScheduledStartTime != nil && newTemplate.ScheduledEndTime != nil && *newTemplate.ScheduledStartTime > *newTemplate.ScheduledEndTime {
+			return nil, errs.ErrScheduledTransactionTemplateStartDataLaterThanEndDate
+		}
+	}
+
 	if newTemplate.Name == template.Name &&
 		newTemplate.Type == template.Type &&
 		newTemplate.CategoryId == template.CategoryId &&
@@ -202,17 +308,28 @@ func (a *TransactionTemplatesApi) TemplateModifyHandler(c *core.Context) (any, *
 		newTemplate.RelatedAccountAmount == template.RelatedAccountAmount &&
 		newTemplate.HideAmount == template.HideAmount &&
 		newTemplate.Comment == template.Comment {
+		if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_NORMAL {
 			return nil, errs.ErrNothingWillBeUpdated
+		} else if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE {
+			if newTemplate.ScheduledFrequencyType == template.ScheduledFrequencyType &&
+				newTemplate.ScheduledFrequency == template.ScheduledFrequency &&
+				newTemplate.ScheduledStartTime == template.ScheduledStartTime &&
+				newTemplate.ScheduledEndTime == template.ScheduledEndTime &&
+				newTemplate.ScheduledAt == template.ScheduledAt &&
+				newTemplate.ScheduledTimezoneUtcOffset == template.ScheduledTimezoneUtcOffset {
+				return nil, errs.ErrNothingWillBeUpdated
+			}
+		}
 	}

 	err = a.templates.ModifyTemplate(c, newTemplate)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateModifyHandler] failed to update template \"id:%d\" for user \"uid:%d\", because %s", templateModifyReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateModifyHandler] failed to update template \"id:%d\" for user \"uid:%d\", because %s", templateModifyReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_templates.TemplateModifyHandler] user \"uid:%d\" has updated template \"id:%d\" successfully", uid, templateModifyReq.Id)
+	log.Infof(c, "[transaction_templates.TemplateModifyHandler] user \"uid:%d\" has updated template \"id:%d\" successfully", uid, templateModifyReq.Id)

 	serverUtcOffset := utils.GetServerTimezoneOffsetMinutes()
 	newTemplate.TemplateType = template.TemplateType
@@ -223,39 +340,65 @@ func (a *TransactionTemplatesApi) TemplateModifyHandler(c *core.Context) (any, *
 	return templateResp, nil
 }

-// TemplateHideHandler hides an transaction template by request parameters for current user
-func (a *TransactionTemplatesApi) TemplateHideHandler(c *core.Context) (any, *errs.Error) {
+// TemplateHideHandler hides a transaction template by request parameters for current user
+func (a *TransactionTemplatesApi) TemplateHideHandler(c *core.WebContext) (any, *errs.Error) {
 	var templateHideReq models.TransactionTemplateHideRequest
 	err := c.ShouldBindJSON(&templateHideReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateHideHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_templates.TemplateHideHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	uid := c.GetCurrentUid()
-	err = a.templates.HideTemplate(c, uid, []int64{templateHideReq.Id}, templateHideReq.Hidden)
+
+	template, err := a.templates.GetTemplateByTemplateId(c, uid, templateHideReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateHideHandler] failed to hide template \"id:%d\" for user \"uid:%d\", because %s", templateHideReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateHideHandler] failed to get template \"id:%d\" for user \"uid:%d\", because %s", templateHideReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_templates.TemplateHideHandler] user \"uid:%d\" has hidden template \"id:%d\"", uid, templateHideReq.Id)
+	if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE && !a.CurrentConfig().EnableScheduledTransaction {
+		return nil, errs.ErrScheduledTransactionNotEnabled
+	}
+
+	err = a.templates.HideTemplate(c, uid, []int64{templateHideReq.Id}, templateHideReq.Hidden)
+
+	if err != nil {
+		log.Errorf(c, "[transaction_templates.TemplateHideHandler] failed to hide template \"id:%d\" for user \"uid:%d\", because %s", templateHideReq.Id, uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.Infof(c, "[transaction_templates.TemplateHideHandler] user \"uid:%d\" has hidden template \"id:%d\"", uid, templateHideReq.Id)
 	return true, nil
 }

 // TemplateMoveHandler moves display order of existed transaction templates by request parameters for current user
-func (a *TransactionTemplatesApi) TemplateMoveHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTemplatesApi) TemplateMoveHandler(c *core.WebContext) (any, *errs.Error) {
 	var templateMoveReq models.TransactionTemplateMoveRequest
 	err := c.ShouldBindJSON(&templateMoveReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_templates.CategoryMoveHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_templates.TemplateMoveHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	uid := c.GetCurrentUid()
+
+	if len(templateMoveReq.NewDisplayOrders) > 0 {
+		template, err := a.templates.GetTemplateByTemplateId(c, uid, templateMoveReq.NewDisplayOrders[0].Id)
+
+		if err != nil {
+			log.Errorf(c, "[transaction_templates.TemplateMoveHandler] failed to get template \"id:%d\" for user \"uid:%d\", because %s", templateMoveReq.NewDisplayOrders[0].Id, uid, err.Error())
+			return nil, errs.Or(err, errs.ErrOperationFailed)
+		}
+
+		if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE && !a.CurrentConfig().EnableScheduledTransaction {
+			return nil, errs.ErrScheduledTransactionNotEnabled
+		}
+	}
+
 	templates := make([]*models.TransactionTemplate, len(templateMoveReq.NewDisplayOrders))

 	for i := 0; i < len(templateMoveReq.NewDisplayOrders); i++ {
@@ -272,38 +415,50 @@ func (a *TransactionTemplatesApi) TemplateMoveHandler(c *core.Context) (any, *er
 	err = a.templates.ModifyTemplateDisplayOrders(c, uid, templates)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateMoveHandler] failed to move templates for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateMoveHandler] failed to move templates for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_templates.TemplateMoveHandler] user \"uid:%d\" has moved templates", uid)
+	log.Infof(c, "[transaction_templates.TemplateMoveHandler] user \"uid:%d\" has moved templates", uid)
 	return true, nil
 }

 // TemplateDeleteHandler deletes an existed transaction template by request parameters for current user
-func (a *TransactionTemplatesApi) TemplateDeleteHandler(c *core.Context) (any, *errs.Error) {
+func (a *TransactionTemplatesApi) TemplateDeleteHandler(c *core.WebContext) (any, *errs.Error) {
 	var templateDeleteReq models.TransactionTemplateDeleteRequest
 	err := c.ShouldBindJSON(&templateDeleteReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[transaction_templates.TemplateDeleteHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[transaction_templates.TemplateDeleteHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	uid := c.GetCurrentUid()
-	err = a.templates.DeleteTemplate(c, uid, templateDeleteReq.Id)
+
+	template, err := a.templates.GetTemplateByTemplateId(c, uid, templateDeleteReq.Id)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[transaction_templates.TemplateDeleteHandler] failed to delete template \"id:%d\" for user \"uid:%d\", because %s", templateDeleteReq.Id, uid, err.Error())
+		log.Errorf(c, "[transaction_templates.TemplateDeleteHandler] failed to get template \"id:%d\" for user \"uid:%d\", because %s", templateDeleteReq.Id, uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[transaction_templates.TemplateDeleteHandler] user \"uid:%d\" has deleted template \"id:%d\"", uid, templateDeleteReq.Id)
+	if template.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE && !a.CurrentConfig().EnableScheduledTransaction {
+		return nil, errs.ErrScheduledTransactionNotEnabled
+	}
+
+	err = a.templates.DeleteTemplate(c, uid, templateDeleteReq.Id)
+
+	if err != nil {
+		log.Errorf(c, "[transaction_templates.TemplateDeleteHandler] failed to delete template \"id:%d\" for user \"uid:%d\", because %s", templateDeleteReq.Id, uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	log.Infof(c, "[transaction_templates.TemplateDeleteHandler] user \"uid:%d\" has deleted template \"id:%d\"", uid, templateDeleteReq.Id)
 	return true, nil
 }

-func (a *TransactionTemplatesApi) createNewTemplateModel(uid int64, templateCreateReq *models.TransactionTemplateCreateRequest, order int32) *models.TransactionTemplate {
-	return &models.TransactionTemplate{
+func (a *TransactionTemplatesApi) createNewTemplateModel(uid int64, templateCreateReq *models.TransactionTemplateCreateRequest, order int32) (*models.TransactionTemplate, error) {
+	template := &models.TransactionTemplate{
 		Uid:                  uid,
 		TemplateType:         templateCreateReq.TemplateType,
 		Name:                 templateCreateReq.Name,
@@ -318,4 +473,86 @@ func (a *TransactionTemplatesApi) createNewTemplateModel(uid int64, templateCrea
 		Comment:              templateCreateReq.Comment,
 		DisplayOrder:         order,
 	}
+
+	if templateCreateReq.TemplateType == models.TRANSACTION_TEMPLATE_TYPE_SCHEDULE {
+		template.ScheduledFrequencyType = *templateCreateReq.ScheduledFrequencyType
+		template.ScheduledFrequency = a.getOrderedFrequencyValues(*templateCreateReq.ScheduledFrequency)
+		template.ScheduledAt = a.getUTCScheduledAt(*templateCreateReq.ScheduledTimezoneUtcOffset)
+		template.ScheduledTimezoneUtcOffset = *templateCreateReq.ScheduledTimezoneUtcOffset
+
+		if templateCreateReq.ScheduledStartDate != nil {
+			startTime, err := utils.ParseFromLongDateFirstTime(*templateCreateReq.ScheduledStartDate, *templateCreateReq.ScheduledTimezoneUtcOffset)
+
+			if err != nil {
+				return nil, err
+			}
+
+			startUnixTime := startTime.Unix()
+			template.ScheduledStartTime = &startUnixTime
+		}
+
+		if templateCreateReq.ScheduledEndDate != nil {
+			endTime, err := utils.ParseFromLongDateLastTime(*templateCreateReq.ScheduledEndDate, *templateCreateReq.ScheduledTimezoneUtcOffset)
+
+			if err != nil {
+				return nil, err
+			}
+
+			endUnixTime := endTime.Unix()
+			template.ScheduledEndTime = &endUnixTime
+		}
+
+		if template.ScheduledStartTime != nil && template.ScheduledEndTime != nil && *template.ScheduledStartTime > *template.ScheduledEndTime {
+			return nil, errs.ErrScheduledTransactionTemplateStartDataLaterThanEndDate
+		}
+	}
+
+	return template, nil
+}
+
+func (a *TransactionTemplatesApi) getUTCScheduledAt(scheduledTimezoneUtcOffset int16) int16 {
+	templateTimeZone := time.FixedZone("Template Timezone", int(scheduledTimezoneUtcOffset)*60)
+	transactionTime := time.Date(2020, 1, 1, 0, 0, 0, 0, templateTimeZone)
+	transactionTimeInUTC := transactionTime.In(time.UTC)
+
+	minutesElapsedOfDayInUtc := transactionTimeInUTC.Hour()*60 + transactionTimeInUTC.Minute()
+
+	return int16(minutesElapsedOfDayInUtc)
+}
+
+func (a *TransactionTemplatesApi) getOrderedFrequencyValues(frequencyValue string) string {
+	if frequencyValue == "" {
+		return ""
+	}
+
+	items := strings.Split(frequencyValue, ",")
+	values := make([]int, 0, len(items))
+	valueExistMap := make(map[int]bool)
+
+	for i := 0; i < len(items); i++ {
+		value, err := utils.StringToInt(items[i])
+
+		if err != nil {
+			continue
+		}
+
+		if _, exists := valueExistMap[value]; !exists {
+			values = append(values, value)
+			valueExistMap[value] = true
+		}
+	}
+
+	sort.Ints(values)
+
+	var sortedFrequencyValueBuilder strings.Builder
+
+	for i := 0; i < len(values); i++ {
+		if sortedFrequencyValueBuilder.Len() > 0 {
+			sortedFrequencyValueBuilder.WriteRune(',')
+		}
+
+		sortedFrequencyValueBuilder.WriteString(utils.IntToString(values[i]))
+	}
+
+	return sortedFrequencyValueBuilder.String()
 }
@@ -32,7 +32,7 @@ var (
 )

 // TwoFactorStatusHandler returns 2fa status of current user
-func (a *TwoFactorAuthorizationsApi) TwoFactorStatusHandler(c *core.Context) (any, *errs.Error) {
+func (a *TwoFactorAuthorizationsApi) TwoFactorStatusHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	twoFactorSetting, err := a.twoFactorAuthorizations.GetUserTwoFactorSettingByUid(c, uid)

@@ -45,7 +45,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorStatusHandler(c *core.Context) (an
 	}

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorStatusHandler] failed to get two-factor setting, because %s", err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorStatusHandler] failed to get two-factor setting, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -58,12 +58,12 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorStatusHandler(c *core.Context) (an
 }

 // TwoFactorEnableRequestHandler returns a new 2fa secret and qr code for current user to set 2fa and verify passcode next
-func (a *TwoFactorAuthorizationsApi) TwoFactorEnableRequestHandler(c *core.Context) (any, *errs.Error) {
+func (a *TwoFactorAuthorizationsApi) TwoFactorEnableRequestHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	enabled, err := a.twoFactorAuthorizations.ExistsTwoFactorSetting(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to check two-factor setting, because %s", err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to check two-factor setting, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -75,23 +75,27 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableRequestHandler(c *core.Conte

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_ENABLE_2FA) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
 	key, err := a.twoFactorAuthorizations.GenerateTwoFactorSecret(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to generate two-factor secret, because %s", err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to generate two-factor secret, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	img, err := key.Image(240, 240)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to generate two-factor qrcode, because %s", err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableRequestHandler] failed to generate two-factor qrcode, because %s", err.Error())
 		return nil, errs.ErrOperationFailed
 	}

@@ -110,12 +114,12 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableRequestHandler(c *core.Conte
 }

 // TwoFactorEnableConfirmHandler enables 2fa for current user
-func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Context) (any, *errs.Error) {
+func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.WebContext) (any, *errs.Error) {
 	var confirmReq models.TwoFactorEnableConfirmRequest
 	err := c.ShouldBindJSON(&confirmReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -123,7 +127,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Conte
 	exists, err := a.twoFactorAuthorizations.ExistsTwoFactorSetting(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to check two-factor setting, because %s", err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to check two-factor setting, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -135,58 +139,62 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Conte

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_ENABLE_2FA) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
 	twoFactorSetting := &models.TwoFactor{
 		Uid:    uid,
 		Secret: confirmReq.Secret,
 	}

 	if !totp.Validate(confirmReq.Passcode, confirmReq.Secret) {
-		log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] passcode is invalid")
+		log.Warnf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] passcode is invalid")
 		return nil, errs.ErrPasscodeInvalid
 	}

 	recoveryCodes, err := a.twoFactorAuthorizations.GenerateTwoFactorRecoveryCodes()

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to generate two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to generate two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	err = a.twoFactorAuthorizations.CreateTwoFactorRecoveryCodes(c, uid, recoveryCodes, user.Salt)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to create two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to create two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	err = a.twoFactorAuthorizations.CreateTwoFactorSetting(c, twoFactorSetting)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to create two-factor setting for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to create two-factor setting for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] user \"uid:%d\" has enabled two-factor authorization", uid)
+	log.Infof(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] user \"uid:%d\" has enabled two-factor authorization", uid)

 	now := time.Now().Unix()
 	err = a.tokens.DeleteTokensBeforeTime(c, uid, now)

 	if err == nil {
-		log.InfofWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] revoke old tokens before unix time \"%d\" for user \"uid:%d\"", now, user.Uid)
+		log.Infof(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] revoke old tokens before unix time \"%d\" for user \"uid:%d\"", now, user.Uid)
 	} else {
-		log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to revoke old tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Warnf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to revoke old tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
 	}

 	token, claims, err := a.tokens.CreateToken(c, user)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Warnf(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())

 		confirmResp := &models.TwoFactorEnableConfirmResponse{
 			RecoveryCodes: recoveryCodes,
@@ -198,7 +206,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Conte
 	c.SetTextualToken(token)
 	c.SetTokenClaims(claims)

-	log.InfofWithRequestId(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)
+	log.Infof(c, "[twofactor_authorizations.TwoFactorEnableConfirmHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)

 	confirmResp := &models.TwoFactorEnableConfirmResponse{
 		Token:         token,
@@ -209,12 +217,12 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorEnableConfirmHandler(c *core.Conte
 }

 // TwoFactorDisableHandler disables 2fa for current user
-func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.Context) (any, *errs.Error) {
+func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.WebContext) (any, *errs.Error) {
 	var disableReq models.TwoFactorDisableRequest
 	err := c.ShouldBindJSON(&disableReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorDisableHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[twofactor_authorizations.TwoFactorDisableHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -223,12 +231,16 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.Context) (a

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
+			log.Warnf(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_DISABLE_2FA) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
 	if !a.users.IsPasswordEqualsUserPassword(disableReq.Password, user) {
 		return nil, errs.ErrUserPasswordWrong
 	}
@@ -236,7 +248,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.Context) (a
 	enableTwoFactor, err := a.twoFactorAuthorizations.ExistsTwoFactorSetting(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to check two-factor setting, because %s", err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to check two-factor setting, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -247,29 +259,29 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorDisableHandler(c *core.Context) (a
 	err = a.twoFactorAuthorizations.DeleteTwoFactorRecoveryCodes(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to delete two-factor recovery codes for user \"uid:%d\"", uid)
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to delete two-factor recovery codes for user \"uid:%d\"", uid)
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	err = a.twoFactorAuthorizations.DeleteTwoFactorSetting(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to delete two-factor setting for user \"uid:%d\"", uid)
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorDisableHandler] failed to delete two-factor setting for user \"uid:%d\"", uid)
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[twofactor_authorizations.TwoFactorDisableHandler] user \"uid:%d\" has disabled two-factor authorization", uid)
+	log.Infof(c, "[twofactor_authorizations.TwoFactorDisableHandler] user \"uid:%d\" has disabled two-factor authorization", uid)

 	return true, nil
 }

 // TwoFactorRecoveryCodeRegenerateHandler returns new 2fa recovery codes and revokes old recovery codes for current user
-func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *core.Context) (any, *errs.Error) {
+func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *core.WebContext) (any, *errs.Error) {
 	var regenerateReq models.TwoFactorRegenerateRecoveryCodeRequest
 	err := c.ShouldBindJSON(&regenerateReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -278,7 +290,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *c

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.WarnfWithRequestId(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
+			log.Warnf(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
 		}

 		return nil, errs.ErrUserNotFound
@@ -291,7 +303,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *c
 	enableTwoFactor, err := a.twoFactorAuthorizations.ExistsTwoFactorSetting(c, uid)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to check two-factor setting, because %s", err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to check two-factor setting, because %s", err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -302,14 +314,14 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *c
 	recoveryCodes, err := a.twoFactorAuthorizations.GenerateTwoFactorRecoveryCodes()

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to generate two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to generate two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	err = a.twoFactorAuthorizations.CreateTwoFactorRecoveryCodes(c, uid, recoveryCodes, user.Salt)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to create two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
+		log.Errorf(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] failed to create two-factor recovery codes for user \"uid:%d\", because %s", uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -317,7 +329,7 @@ func (a *TwoFactorAuthorizationsApi) TwoFactorRecoveryCodeRegenerateHandler(c *c
 		RecoveryCodes: recoveryCodes,
 	}

-	log.InfofWithRequestId(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] user \"uid:%d\" has regenerated two-factor recovery codes", uid)
+	log.Infof(c, "[twofactor_authorizations.TwoFactorRecoveryCodeRegenerateHandler] user \"uid:%d\" has regenerated two-factor recovery codes", uid)

 	return recoveryCodesResp, nil
 }
@@ -0,0 +1,235 @@
+package api
+
+import (
+	"encoding/json"
+	"time"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/services"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+// UserApplicationCloudSettingsApi represents user application cloud settings api
+type UserApplicationCloudSettingsApi struct {
+	userAppCloudSettings *services.UserApplicationCloudSettingsService
+	users                *services.UserService
+}
+
+// Initialize a user application cloud settings api singleton instance
+var (
+	UserApplicationCloudSettings = &UserApplicationCloudSettingsApi{
+		userAppCloudSettings: services.UserApplicationCloudSettings,
+		users:                services.Users,
+	}
+)
+
+// ApplicationSettingsGetHandler returns application cloud settings of current user
+func (a *UserApplicationCloudSettingsApi) ApplicationSettingsGetHandler(c *core.WebContext) (any, *errs.Error) {
+	uid := c.GetCurrentUid()
+
+	userApplicationCloudSettings, err := a.userAppCloudSettings.GetUserApplicationCloudSettingsByUid(c, uid)
+
+	if err != nil {
+		log.Errorf(c, "[user_app_cloud_settings.ApplicationSettingsGetHandler] failed to get latest user application cloud settings for user \"uid:%d\", because %s", uid, err.Error())
+		return nil, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	if userApplicationCloudSettings == nil {
+		return false, nil
+	}
+
+	applicationCloudSettingSlice := userApplicationCloudSettings.Settings
+
+	if len(applicationCloudSettingSlice) < 1 {
+		return false, nil
+	}
+
+	return applicationCloudSettingSlice, nil
+}
+
+// ApplicationSettingsUpdateHandler updates user application cloud settings by request parameters for current user
+func (a *UserApplicationCloudSettingsApi) ApplicationSettingsUpdateHandler(c *core.WebContext) (any, *errs.Error) {
+	var userAppCloudSettingUpdateReq models.UserApplicationCloudSettingsUpdateRequest
+	err := c.ShouldBindJSON(&userAppCloudSettingUpdateReq)
+
+	if err != nil {
+		log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] parse request failed, because %s", err.Error())
+		return false, errs.NewIncompleteOrIncorrectSubmissionError(err)
+	}
+
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		if !errs.IsCustomError(err) {
+			log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
+		}
+
+		return false, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_SYNC_APPLICATION_SETTINGS) {
+		return false, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	var userApplicationCloudSettings *models.UserApplicationCloudSetting
+
+	// Retry up to 3 times
+	for i := 0; i < 3; i++ {
+		userApplicationCloudSettings, err = a.userAppCloudSettings.GetUserApplicationCloudSettingsByUid(c, uid)
+
+		if err != nil {
+			log.Errorf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] failed to get latest user application cloud settings for user \"uid:%d\" (try count %d), because %s", uid, i+1, err.Error())
+			return false, errs.Or(err, errs.ErrOperationFailed)
+		}
+
+		oldApplicationCloudSettingsMap := make(map[string]models.ApplicationCloudSetting)
+		lastUpdateTime := int64(0)
+
+		if userApplicationCloudSettings != nil {
+			for _, setting := range userApplicationCloudSettings.Settings {
+				oldApplicationCloudSettingsMap[setting.SettingKey] = setting
+			}
+
+			lastUpdateTime = userApplicationCloudSettings.UpdatedUnixTime
+		}
+
+		// Check if the full update settings are the same as the existing settings
+		if userAppCloudSettingUpdateReq.FullUpdate {
+			if len(userAppCloudSettingUpdateReq.Settings) == len(oldApplicationCloudSettingsMap) {
+				needUpdate := false
+
+				for _, setting := range userAppCloudSettingUpdateReq.Settings {
+					oldSetting, exists := oldApplicationCloudSettingsMap[setting.SettingKey]
+
+					if !exists || oldSetting.SettingValue != setting.SettingValue {
+						needUpdate = true
+						break
+					}
+				}
+
+				if !needUpdate {
+					return false, errs.ErrNothingWillBeUpdated
+				}
+			}
+		} else { // Check if the partial update settings are the same as the existing settings or the settings to update are not set to sync
+			needUpdate := true
+
+			for _, setting := range userAppCloudSettingUpdateReq.Settings {
+				cloudSetting, exists := oldApplicationCloudSettingsMap[setting.SettingKey]
+
+				if !exists {
+					needUpdate = false
+					log.Infof(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user application cloud setting key \"%s\" is not set to sync (try count %d)", setting.SettingKey, i+1)
+				} else if cloudSetting.SettingValue == setting.SettingValue {
+					needUpdate = false
+					log.Infof(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user application cloud setting key \"%s\" value \"%s\" is not changed, no need to update (try count %d)", setting.SettingKey, setting.SettingValue, i+1)
+				}
+			}
+
+			if !needUpdate {
+				log.Infof(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] no user application cloud settings need to update for user \"uid:%d\" (try count %d)", uid, i+1)
+				return true, nil
+			}
+		}
+
+		newApplicationCloudSettingsMap := make(map[string]models.ApplicationCloudSetting)
+		var newApplicationCloudSettingSlice models.ApplicationCloudSettingSlice
+
+		if userAppCloudSettingUpdateReq.FullUpdate {
+			log.Infof(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user \"uid:%d\" application cloud settings force update, will overwrite all existing settings (try count %d)", uid, i+1)
+		} else {
+			if len(oldApplicationCloudSettingsMap) > 0 {
+				log.Infof(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user \"uid:%d\" application cloud settings exists, try to merge it with request settings (try count %d)", uid, i+1)
+				newApplicationCloudSettingsMap = oldApplicationCloudSettingsMap
+			}
+		}
+
+		for _, setting := range userAppCloudSettingUpdateReq.Settings {
+			newApplicationCloudSettingsMap[setting.SettingKey] = setting
+		}
+
+		for settingKey, setting := range newApplicationCloudSettingsMap {
+			settingType, exists := models.ALL_ALLOWED_CLOUD_SYNC_APP_SETTING_KEY_TYPES[settingKey]
+
+			if !exists {
+				log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user application cloud setting key \"%s\" is not supported to sync (try count %d)", settingKey, i+1)
+				continue
+			}
+
+			if settingType == models.USER_APPLICATION_CLOUD_SETTING_TYPE_STRING {
+				// Do Nothing
+			} else if settingType == models.USER_APPLICATION_CLOUD_SETTING_TYPE_NUMBER {
+				_, err := utils.StringToFloat64(setting.SettingValue)
+
+				if err != nil {
+					log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user application cloud setting key \"%s\" has invalid number value \"%s\" (try count %d)", settingKey, setting.SettingValue, i+1)
+					continue
+				}
+			} else if settingType == models.USER_APPLICATION_CLOUD_SETTING_TYPE_BOOLEAN {
+				if setting.SettingValue != "true" && setting.SettingValue != "false" {
+					log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user application cloud setting key \"%s\" has invalid boolean value \"%s\" (try count %d)", settingKey, setting.SettingValue, i+1)
+					continue
+				}
+			} else if settingType == models.USER_APPLICATION_CLOUD_SETTING_TYPE_STRING_BOOLEAN_MAP {
+				var settingValueMap map[string]bool
+				err := json.Unmarshal([]byte(setting.SettingValue), &settingValueMap)
+
+				if err != nil {
+					log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user application cloud setting key \"%s\" has invalid map value \"%s\" (try count %d), because %s", settingKey, setting.SettingValue, i+1, err.Error())
+					continue
+				}
+			} else {
+				log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] user application cloud setting key \"%s\" has unknown type \"%s\" (try count %d)", settingKey, settingType, i+1)
+				continue
+			}
+
+			newApplicationCloudSettingSlice = append(newApplicationCloudSettingSlice, setting)
+		}
+
+		err = a.userAppCloudSettings.UpdateUserApplicationCloudSettings(c, uid, newApplicationCloudSettingSlice, userAppCloudSettingUpdateReq.FullUpdate, lastUpdateTime)
+
+		if err == nil {
+			break
+		}
+
+		time.Sleep(100 * time.Millisecond) // Wait for 100 milliseconds before retrying
+	}
+
+	if err != nil {
+		log.Errorf(c, "[user_app_cloud_settings.ApplicationSettingsUpdateHandler] failed to update user application cloud settings for user \"uid:%d\", because %s", uid, err.Error())
+		return false, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	return true, nil
+}
+
+// ApplicationSettingsDisableHandler disabled user application cloud settings by request parameters for current user
+func (a *UserApplicationCloudSettingsApi) ApplicationSettingsDisableHandler(c *core.WebContext) (any, *errs.Error) {
+	uid := c.GetCurrentUid()
+	user, err := a.users.GetUserById(c, uid)
+
+	if err != nil {
+		if !errs.IsCustomError(err) {
+			log.Warnf(c, "[user_app_cloud_settings.ApplicationSettingsDisableHandler] failed to get user for user \"uid:%d\", because %s", uid, err.Error())
+		}
+
+		return false, errs.ErrUserNotFound
+	}
+
+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_SYNC_APPLICATION_SETTINGS) {
+		return false, errs.ErrNotPermittedToPerformThisAction
+	}
+
+	err = a.userAppCloudSettings.ClearUserApplicationCloudSettings(c, uid)
+
+	if err != nil {
+		log.Errorf(c, "[user_app_cloud_settings.ApplicationSettingsDisableHandler] failed to clear user application cloud settings for user \"uid:%d\", because %s", uid, err.Error())
+		return false, errs.Or(err, errs.ErrOperationFailed)
+	}
+
+	return true, nil
+}
@@ -1,13 +1,12 @@
 package api

 import (
-	"io"
-	"os"
 	"strings"
 	"time"

 	"github.com/gin-gonic/gin/binding"

+	"github.com/mayswind/ezbookkeeping/pkg/avatars"
 	"github.com/mayswind/ezbookkeeping/pkg/core"
 	"github.com/mayswind/ezbookkeeping/pkg/errs"
 	"github.com/mayswind/ezbookkeeping/pkg/locales"
@@ -15,13 +14,14 @@ import (
 	"github.com/mayswind/ezbookkeeping/pkg/models"
 	"github.com/mayswind/ezbookkeeping/pkg/services"
 	"github.com/mayswind/ezbookkeeping/pkg/settings"
-	"github.com/mayswind/ezbookkeeping/pkg/storage"
 	"github.com/mayswind/ezbookkeeping/pkg/utils"
 	"github.com/mayswind/ezbookkeeping/pkg/validators"
 )

 // UsersApi represents user api
 type UsersApi struct {
+	ApiUsingConfig
+	ApiWithUserInfo
 	users    *services.UserService
 	tokens   *services.TokenService
 	accounts *services.AccountService
@@ -30,6 +30,17 @@ type UsersApi struct {
 // Initialize a user api singleton instance
 var (
 	Users = &UsersApi{
+		ApiUsingConfig: ApiUsingConfig{
+			container: settings.Container,
+		},
+		ApiWithUserInfo: ApiWithUserInfo{
+			ApiUsingConfig: ApiUsingConfig{
+				container: settings.Container,
+			},
+			ApiUsingAvatarProvider: ApiUsingAvatarProvider{
+				container: avatars.Container,
+			},
+		},
 		users:    services.Users,
 		tokens:   services.Tokens,
 		accounts: services.Accounts,
@@ -37,8 +48,8 @@ var (
 )

 // UserRegisterHandler saves a new user by request parameters
-func (a *UsersApi) UserRegisterHandler(c *core.Context) (any, *errs.Error) {
-	if !settings.Container.Current.EnableUserRegister {
+func (a *UsersApi) UserRegisterHandler(c *core.WebContext) (any, *errs.Error) {
+	if !a.CurrentConfig().EnableUserRegister {
 		return nil, errs.ErrUserRegistrationNotAllowed
 	}

@@ -46,12 +57,12 @@ func (a *UsersApi) UserRegisterHandler(c *core.Context) (any, *errs.Error) {
 	err := c.ShouldBindBodyWith(&userRegisterReq, binding.JSON)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[users.UserRegisterHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[users.UserRegisterHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

 	if userRegisterReq.DefaultCurrency == validators.ParentAccountCurrencyPlaceholder {
-		log.WarnfWithRequestId(c, "[users.UserRegisterHandler] user default currency is invalid")
+		log.Warnf(c, "[users.UserRegisterHandler] user default currency is invalid")
 		return nil, errs.ErrUserDefaultCurrencyIsInvalid
 	}

@@ -67,17 +78,19 @@ func (a *UsersApi) UserRegisterHandler(c *core.Context) (any, *errs.Error) {
 		Language:             userRegisterReq.Language,
 		DefaultCurrency:      userRegisterReq.DefaultCurrency,
 		FirstDayOfWeek:       userRegisterReq.FirstDayOfWeek,
+		FiscalYearStart:      core.FISCAL_YEAR_START_DEFAULT,
 		TransactionEditScope: models.TRANSACTION_EDIT_SCOPE_ALL,
+		FeatureRestriction:   a.CurrentConfig().DefaultFeatureRestrictions,
 	}

 	err = a.users.CreateUser(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserRegisterHandler] failed to create user \"%s\", because %s", user.Username, err.Error())
+		log.Errorf(c, "[users.UserRegisterHandler] failed to create user \"%s\", because %s", user.Username, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	log.InfofWithRequestId(c, "[users.UserRegisterHandler] user \"%s\" has registered successfully, uid is %d", user.Username, user.Uid)
+	log.Infof(c, "[users.UserRegisterHandler] user \"%s\" has registered successfully, uid is %d", user.Username, user.Uid)

 	presetCategoriesSaved := false

@@ -92,37 +105,37 @@ func (a *UsersApi) UserRegisterHandler(c *core.Context) (any, *errs.Error) {
 	authResp := &models.RegisterResponse{
 		AuthResponse: models.AuthResponse{
 			Need2FA:             false,
-			User:                user.ToUserBasicInfo(),
-			NotificationContent: settings.Container.GetAfterRegisterNotificationContent(user.Language, c.GetClientLocale()),
+			User:                a.GetUserBasicInfo(user),
+			NotificationContent: a.GetAfterRegisterNotificationContent(user.Language, c.GetClientLocale()),
 		},
-		NeedVerifyEmail:       settings.Container.Current.EnableUserVerifyEmail && settings.Container.Current.EnableUserForceVerifyEmail,
+		NeedVerifyEmail:       a.CurrentConfig().EnableUserVerifyEmail && a.CurrentConfig().EnableUserForceVerifyEmail,
 		PresetCategoriesSaved: presetCategoriesSaved,
 	}

-	if settings.Container.Current.EnableUserVerifyEmail && settings.Container.Current.EnableSMTP {
+	if a.CurrentConfig().EnableUserVerifyEmail && a.CurrentConfig().EnableSMTP {
 		token, _, err := a.tokens.CreateEmailVerifyToken(c, user)

 		if err != nil {
-			log.ErrorfWithRequestId(c, "[users.UserRegisterHandler] failed to create email verify token for user \"uid:%d\", because %s", user.Uid, err.Error())
+			log.Errorf(c, "[users.UserRegisterHandler] failed to create email verify token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		} else {
 			go func() {
 				err = a.users.SendVerifyEmail(user, token, c.GetClientLocale())

 				if err != nil {
-					log.WarnfWithRequestId(c, "[users.UserRegisterHandler] cannot send verify email to \"%s\", because %s", user.Email, err.Error())
+					log.Warnf(c, "[users.UserRegisterHandler] cannot send verify email to \"%s\", because %s", user.Email, err.Error())
 				}
 			}()
 		}
 	}

-	if settings.Container.Current.EnableUserForceVerifyEmail {
+	if a.CurrentConfig().EnableUserForceVerifyEmail {
 		return authResp, nil
 	}

 	token, claims, err := a.tokens.CreateToken(c, user)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[users.UserRegisterHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Warnf(c, "[users.UserRegisterHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return authResp, nil
 	}

@@ -130,13 +143,13 @@ func (a *UsersApi) UserRegisterHandler(c *core.Context) (any, *errs.Error) {
 	c.SetTextualToken(token)
 	c.SetTokenClaims(claims)

-	log.InfofWithRequestId(c, "[users.UserRegisterHandler] user \"uid:%d\" has logined, token will be expired at %d", user.Uid, claims.ExpiresAt)
+	log.Infof(c, "[users.UserRegisterHandler] user \"uid:%d\" has logined, token will be expired at %d", user.Uid, claims.ExpiresAt)

 	return authResp, nil
 }

 // UserEmailVerifyHandler sets user email address verified
-func (a *UsersApi) UserEmailVerifyHandler(c *core.Context) (any, *errs.Error) {
+func (a *UsersApi) UserEmailVerifyHandler(c *core.WebContext) (any, *errs.Error) {
 	var userVerifyEmailReq models.UserVerifyEmailRequest
 	err := c.ShouldBindJSON(&userVerifyEmailReq)

@@ -145,35 +158,35 @@ func (a *UsersApi) UserEmailVerifyHandler(c *core.Context) (any, *errs.Error) {

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserEmailVerifyHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[users.UserEmailVerifyHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

 	if user.Disabled {
-		log.WarnfWithRequestId(c, "[users.UserEmailVerifyHandler] user \"uid:%d\" is disabled", user.Uid)
+		log.Warnf(c, "[users.UserEmailVerifyHandler] user \"uid:%d\" is disabled", user.Uid)
 		return nil, errs.ErrUserIsDisabled
 	}

 	if user.EmailVerified {
-		log.WarnfWithRequestId(c, "[users.UserEmailVerifyHandler] user \"uid:%d\" email has been verified", user.Uid)
+		log.Warnf(c, "[users.UserEmailVerifyHandler] user \"uid:%d\" email has been verified", user.Uid)
 		return nil, errs.ErrEmailIsVerified
 	}

 	err = a.users.SetUserEmailVerified(c, user.Username)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserEmailVerifyHandler] failed to update user \"uid:%d\" email address verified, because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserEmailVerifyHandler] failed to update user \"uid:%d\" email address verified, because %s", user.Uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	err = a.tokens.DeleteTokensByType(c, uid, core.USER_TOKEN_TYPE_EMAIL_VERIFY)

 	if err == nil {
-		log.InfofWithRequestId(c, "[users.UserEmailVerifyHandler] revoke old email verify tokens for user \"uid:%d\"", user.Uid)
+		log.Infof(c, "[users.UserEmailVerifyHandler] revoke old email verify tokens for user \"uid:%d\"", user.Uid)
 	} else {
-		log.WarnfWithRequestId(c, "[users.UserEmailVerifyHandler] failed to revoke old email verify tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Warnf(c, "[users.UserEmailVerifyHandler] failed to revoke old email verify tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
 	}

 	resp := &models.UserVerifyEmailResponse{}
@@ -182,47 +195,47 @@ func (a *UsersApi) UserEmailVerifyHandler(c *core.Context) (any, *errs.Error) {
 		token, claims, err := a.tokens.CreateToken(c, user)

 		if err != nil {
-			log.WarnfWithRequestId(c, "[users.UserEmailVerifyHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+			log.Warnf(c, "[users.UserEmailVerifyHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 			return resp, nil
 		}

 		resp.NewToken = token
-		resp.User = user.ToUserBasicInfo()
-		resp.NotificationContent = settings.Container.GetAfterLoginNotificationContent(user.Language, c.GetClientLocale())
+		resp.User = a.GetUserBasicInfo(user)
+		resp.NotificationContent = a.GetAfterLoginNotificationContent(user.Language, c.GetClientLocale())

 		c.SetTextualToken(token)
 		c.SetTokenClaims(claims)

-		log.InfofWithRequestId(c, "[users.UserEmailVerifyHandler] user \"uid:%d\" token created, new token will be expired at %d", user.Uid, claims.ExpiresAt)
+		log.Infof(c, "[users.UserEmailVerifyHandler] user \"uid:%d\" token created, new token will be expired at %d", user.Uid, claims.ExpiresAt)
 	}

 	return resp, nil
 }

 // UserProfileHandler returns user profile of current user
-func (a *UsersApi) UserProfileHandler(c *core.Context) (any, *errs.Error) {
+func (a *UsersApi) UserProfileHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	user, err := a.users.GetUserById(c, uid)

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserRegisterHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[users.UserRegisterHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

-	userResp := user.ToUserProfileResponse()
+	userResp := a.getUserProfileResponse(user)
 	return userResp, nil
 }

 // UserUpdateProfileHandler saves user profile by request parameters for current user
-func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error) {
+func (a *UsersApi) UserUpdateProfileHandler(c *core.WebContext) (any, *errs.Error) {
 	var userUpdateReq models.UserProfileUpdateRequest
 	err := c.ShouldBindJSON(&userUpdateReq)

 	if err != nil {
-		log.WarnfWithRequestId(c, "[users.UserUpdateProfileHandler] parse request failed, because %s", err.Error())
+		log.Warnf(c, "[users.UserUpdateProfileHandler] parse request failed, because %s", err.Error())
 		return nil, errs.NewIncompleteOrIncorrectSubmissionError(err)
 	}

@@ -231,7 +244,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserUpdateProfileHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[users.UserUpdateProfileHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
@@ -240,6 +253,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 	userUpdateReq.Email = strings.TrimSpace(userUpdateReq.Email)
 	userUpdateReq.Nickname = strings.TrimSpace(userUpdateReq.Nickname)

+	modifyProfileBasicInfo := false
 	anythingUpdate := false
 	userNew := &models.User{
 		Uid:  user.Uid,
@@ -247,12 +261,20 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 	}

 	if userUpdateReq.Email != "" && userUpdateReq.Email != user.Email {
+		if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_UPDATE_EMAIL) {
+			return nil, errs.ErrNotPermittedToPerformThisAction
+		}
+
 		user.Email = userUpdateReq.Email
 		userNew.Email = userUpdateReq.Email
 		anythingUpdate = true
 	}

 	if userUpdateReq.Password != "" {
+		if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_UPDATE_PASSWORD) {
+			return nil, errs.ErrNotPermittedToPerformThisAction
+		}
+
 		if !a.users.IsPasswordEqualsUserPassword(userUpdateReq.OldPassword, user) {
 			return nil, errs.ErrUserPasswordWrong
 		}
@@ -266,6 +288,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 	if userUpdateReq.Nickname != "" && userUpdateReq.Nickname != user.Nickname {
 		user.Nickname = userUpdateReq.Nickname
 		userNew.Nickname = userUpdateReq.Nickname
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	}

@@ -277,23 +300,25 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 		}

 		if _, exists := accountMap[userUpdateReq.DefaultAccountId]; !exists {
-			log.WarnfWithRequestId(c, "[users.UserUpdateProfileHandler] account \"id:%d\" does not exist for user \"uid:%d\"", userUpdateReq.DefaultAccountId, uid)
+			log.Warnf(c, "[users.UserUpdateProfileHandler] account \"id:%d\" does not exist for user \"uid:%d\"", userUpdateReq.DefaultAccountId, uid)
 			return nil, errs.ErrUserDefaultAccountIsInvalid
 		}

 		if accountMap[userUpdateReq.DefaultAccountId].Hidden {
-			log.WarnfWithRequestId(c, "[users.UserUpdateProfileHandler] account \"id:%d\" is hidden of user \"uid:%d\"", userUpdateReq.DefaultAccountId, uid)
+			log.Warnf(c, "[users.UserUpdateProfileHandler] account \"id:%d\" is hidden of user \"uid:%d\"", userUpdateReq.DefaultAccountId, uid)
 			return nil, errs.ErrUserDefaultAccountIsHidden
 		}

 		user.DefaultAccountId = userUpdateReq.DefaultAccountId
 		userNew.DefaultAccountId = userUpdateReq.DefaultAccountId
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	}

 	if userUpdateReq.TransactionEditScope != nil && *userUpdateReq.TransactionEditScope != user.TransactionEditScope {
 		user.TransactionEditScope = *userUpdateReq.TransactionEditScope
 		userNew.TransactionEditScope = *userUpdateReq.TransactionEditScope
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
 		userNew.TransactionEditScope = models.TRANSACTION_EDIT_SCOPE_INVALID
@@ -305,58 +330,120 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 		user.Language = userUpdateReq.Language
 		userNew.Language = userUpdateReq.Language
 		modifyUserLanguage = true
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	}

 	if userUpdateReq.DefaultCurrency != "" && userUpdateReq.DefaultCurrency != user.DefaultCurrency {
 		user.DefaultCurrency = userUpdateReq.DefaultCurrency
 		userNew.DefaultCurrency = userUpdateReq.DefaultCurrency
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	}

 	if userUpdateReq.FirstDayOfWeek != nil && *userUpdateReq.FirstDayOfWeek != user.FirstDayOfWeek {
 		user.FirstDayOfWeek = *userUpdateReq.FirstDayOfWeek
 		userNew.FirstDayOfWeek = *userUpdateReq.FirstDayOfWeek
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
-		userNew.FirstDayOfWeek = models.WEEKDAY_INVALID
+		userNew.FirstDayOfWeek = core.WEEKDAY_INVALID
+	}
+
+	if userUpdateReq.FiscalYearStart != nil && *userUpdateReq.FiscalYearStart != user.FiscalYearStart {
+		user.FiscalYearStart = *userUpdateReq.FiscalYearStart
+		userNew.FiscalYearStart = *userUpdateReq.FiscalYearStart
+		modifyProfileBasicInfo = true
+		anythingUpdate = true
+	} else {
+		userNew.FiscalYearStart = core.FISCAL_YEAR_START_INVALID
+	}
+
+	if userUpdateReq.CalendarDisplayType != nil && *userUpdateReq.CalendarDisplayType != user.CalendarDisplayType {
+		user.CalendarDisplayType = *userUpdateReq.CalendarDisplayType
+		userNew.CalendarDisplayType = *userUpdateReq.CalendarDisplayType
+		modifyProfileBasicInfo = true
+		anythingUpdate = true
+	} else {
+		userNew.CalendarDisplayType = core.CALENDAR_DISPLAY_TYPE_INVALID
+	}
+
+	if userUpdateReq.DateDisplayType != nil && *userUpdateReq.DateDisplayType != user.DateDisplayType {
+		user.DateDisplayType = *userUpdateReq.DateDisplayType
+		userNew.DateDisplayType = *userUpdateReq.DateDisplayType
+		modifyProfileBasicInfo = true
+		anythingUpdate = true
+	} else {
+		userNew.DateDisplayType = core.DATE_DISPLAY_TYPE_INVALID
 	}

 	if userUpdateReq.LongDateFormat != nil && *userUpdateReq.LongDateFormat != user.LongDateFormat {
 		user.LongDateFormat = *userUpdateReq.LongDateFormat
 		userNew.LongDateFormat = *userUpdateReq.LongDateFormat
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
-		userNew.LongDateFormat = models.LONG_DATE_FORMAT_INVALID
+		userNew.LongDateFormat = core.LONG_DATE_FORMAT_INVALID
 	}

 	if userUpdateReq.ShortDateFormat != nil && *userUpdateReq.ShortDateFormat != user.ShortDateFormat {
 		user.ShortDateFormat = *userUpdateReq.ShortDateFormat
 		userNew.ShortDateFormat = *userUpdateReq.ShortDateFormat
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
-		userNew.ShortDateFormat = models.SHORT_DATE_FORMAT_INVALID
+		userNew.ShortDateFormat = core.SHORT_DATE_FORMAT_INVALID
 	}

 	if userUpdateReq.LongTimeFormat != nil && *userUpdateReq.LongTimeFormat != user.LongTimeFormat {
 		user.LongTimeFormat = *userUpdateReq.LongTimeFormat
 		userNew.LongTimeFormat = *userUpdateReq.LongTimeFormat
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
-		userNew.LongTimeFormat = models.LONG_TIME_FORMAT_INVALID
+		userNew.LongTimeFormat = core.LONG_TIME_FORMAT_INVALID
 	}

 	if userUpdateReq.ShortTimeFormat != nil && *userUpdateReq.ShortTimeFormat != user.ShortTimeFormat {
 		user.ShortTimeFormat = *userUpdateReq.ShortTimeFormat
 		userNew.ShortTimeFormat = *userUpdateReq.ShortTimeFormat
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
-		userNew.ShortTimeFormat = models.SHORT_TIME_FORMAT_INVALID
+		userNew.ShortTimeFormat = core.SHORT_TIME_FORMAT_INVALID
+	}
+
+	if userUpdateReq.FiscalYearFormat != nil && *userUpdateReq.FiscalYearFormat != user.FiscalYearFormat {
+		user.FiscalYearFormat = *userUpdateReq.FiscalYearFormat
+		userNew.FiscalYearFormat = *userUpdateReq.FiscalYearFormat
+		modifyProfileBasicInfo = true
+		anythingUpdate = true
+	} else {
+		userNew.FiscalYearFormat = core.FISCAL_YEAR_FORMAT_INVALID
+	}
+
+	if userUpdateReq.CurrencyDisplayType != nil && *userUpdateReq.CurrencyDisplayType != user.CurrencyDisplayType {
+		user.CurrencyDisplayType = *userUpdateReq.CurrencyDisplayType
+		userNew.CurrencyDisplayType = *userUpdateReq.CurrencyDisplayType
+		modifyProfileBasicInfo = true
+		anythingUpdate = true
+	} else {
+		userNew.CurrencyDisplayType = core.CURRENCY_DISPLAY_TYPE_INVALID
+	}
+
+	if userUpdateReq.NumeralSystem != nil && *userUpdateReq.NumeralSystem != user.NumeralSystem {
+		user.NumeralSystem = *userUpdateReq.NumeralSystem
+		userNew.NumeralSystem = *userUpdateReq.NumeralSystem
+		modifyProfileBasicInfo = true
+		anythingUpdate = true
+	} else {
+		userNew.NumeralSystem = core.NUMERAL_SYSTEM_INVALID
 	}

 	if userUpdateReq.DecimalSeparator != nil && *userUpdateReq.DecimalSeparator != user.DecimalSeparator {
 		user.DecimalSeparator = *userUpdateReq.DecimalSeparator
 		userNew.DecimalSeparator = *userUpdateReq.DecimalSeparator
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
 		userNew.DecimalSeparator = core.DECIMAL_SEPARATOR_INVALID
@@ -365,6 +452,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 	if userUpdateReq.DigitGroupingSymbol != nil && *userUpdateReq.DigitGroupingSymbol != user.DigitGroupingSymbol {
 		user.DigitGroupingSymbol = *userUpdateReq.DigitGroupingSymbol
 		userNew.DigitGroupingSymbol = *userUpdateReq.DigitGroupingSymbol
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
 		userNew.DigitGroupingSymbol = core.DIGIT_GROUPING_SYMBOL_INVALID
@@ -373,22 +461,25 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 	if userUpdateReq.DigitGrouping != nil && *userUpdateReq.DigitGrouping != user.DigitGrouping {
 		user.DigitGrouping = *userUpdateReq.DigitGrouping
 		userNew.DigitGrouping = *userUpdateReq.DigitGrouping
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
 		userNew.DigitGrouping = core.DIGIT_GROUPING_TYPE_INVALID
 	}

-	if userUpdateReq.CurrencyDisplayType != nil && *userUpdateReq.CurrencyDisplayType != user.CurrencyDisplayType {
-		user.CurrencyDisplayType = *userUpdateReq.CurrencyDisplayType
-		userNew.CurrencyDisplayType = *userUpdateReq.CurrencyDisplayType
+	if userUpdateReq.CoordinateDisplayType != nil && *userUpdateReq.CoordinateDisplayType != user.CoordinateDisplayType {
+		user.CoordinateDisplayType = *userUpdateReq.CoordinateDisplayType
+		userNew.CoordinateDisplayType = *userUpdateReq.CoordinateDisplayType
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
-		userNew.CurrencyDisplayType = models.CURRENCY_DISPLAY_TYPE_INVALID
+		userNew.CoordinateDisplayType = core.COORDINATE_DISPLAY_TYPE_INVALID
 	}

 	if userUpdateReq.ExpenseAmountColor != nil && *userUpdateReq.ExpenseAmountColor != user.ExpenseAmountColor {
 		user.ExpenseAmountColor = *userUpdateReq.ExpenseAmountColor
 		userNew.ExpenseAmountColor = *userUpdateReq.ExpenseAmountColor
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
 		userNew.ExpenseAmountColor = models.AMOUNT_COLOR_TYPE_INVALID
@@ -397,11 +488,16 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 	if userUpdateReq.IncomeAmountColor != nil && *userUpdateReq.IncomeAmountColor != user.IncomeAmountColor {
 		user.IncomeAmountColor = *userUpdateReq.IncomeAmountColor
 		userNew.IncomeAmountColor = *userUpdateReq.IncomeAmountColor
+		modifyProfileBasicInfo = true
 		anythingUpdate = true
 	} else {
 		userNew.IncomeAmountColor = models.AMOUNT_COLOR_TYPE_INVALID
 	}

+	if modifyProfileBasicInfo && user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_UPDATE_PROFILE_BASIC_INFO) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
 	if modifyUserLanguage || userNew.DecimalSeparator != core.DECIMAL_SEPARATOR_INVALID || userNew.DigitGroupingSymbol != core.DIGIT_GROUPING_SYMBOL_INVALID {
 		decimalSeparator := userNew.DecimalSeparator
 		digitGroupingSymbol := userNew.DigitGroupingSymbol
@@ -436,7 +532,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 	keyProfileUpdated, emailSetToUnverified, err := a.users.UpdateUser(c, userNew, modifyUserLanguage)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserUpdateProfileHandler] failed to update user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserUpdateProfileHandler] failed to update user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

@@ -444,28 +540,28 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 		user.EmailVerified = false
 	}

-	log.InfofWithRequestId(c, "[users.UserUpdateProfileHandler] user \"uid:%d\" has updated successfully", user.Uid)
+	log.Infof(c, "[users.UserUpdateProfileHandler] user \"uid:%d\" has updated successfully", user.Uid)

 	resp := &models.UserProfileUpdateResponse{
-		User: user.ToUserBasicInfo(),
+		User: a.GetUserBasicInfo(user),
 	}

-	if emailSetToUnverified && settings.Container.Current.EnableUserVerifyEmail && settings.Container.Current.EnableSMTP {
+	if emailSetToUnverified && a.CurrentConfig().EnableUserVerifyEmail && a.CurrentConfig().EnableSMTP {
 		err = a.tokens.DeleteTokensByType(c, uid, core.USER_TOKEN_TYPE_EMAIL_VERIFY)

 		if err != nil {
-			log.ErrorfWithRequestId(c, "[users.UserUpdateProfileHandler] failed to revoke old email verify tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
+			log.Errorf(c, "[users.UserUpdateProfileHandler] failed to revoke old email verify tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
 		} else {
 			token, _, err := a.tokens.CreateEmailVerifyToken(c, user)

 			if err != nil {
-				log.ErrorfWithRequestId(c, "[users.UserUpdateProfileHandler] failed to create email verify token for user \"uid:%d\", because %s", user.Uid, err.Error())
+				log.Errorf(c, "[users.UserUpdateProfileHandler] failed to create email verify token for user \"uid:%d\", because %s", user.Uid, err.Error())
 			} else {
 				go func() {
 					err = a.users.SendVerifyEmail(user, token, c.GetClientLocale())

 					if err != nil {
-						log.WarnfWithRequestId(c, "[users.UserUpdateProfileHandler] cannot send verify email to \"%s\", because %s", user.Email, err.Error())
+						log.Warnf(c, "[users.UserUpdateProfileHandler] cannot send verify email to \"%s\", because %s", user.Email, err.Error())
 					}
 				}()
 			}
@@ -477,15 +573,15 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 		err = a.tokens.DeleteTokensBeforeTime(c, uid, now)

 		if err == nil {
-			log.InfofWithRequestId(c, "[users.UserUpdateProfileHandler] revoke old tokens before unix time \"%d\" for user \"uid:%d\"", now, user.Uid)
+			log.Infof(c, "[users.UserUpdateProfileHandler] revoke old tokens before unix time \"%d\" for user \"uid:%d\"", now, user.Uid)
 		} else {
-			log.WarnfWithRequestId(c, "[users.UserUpdateProfileHandler] failed to revoke old tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
+			log.Warnf(c, "[users.UserUpdateProfileHandler] failed to revoke old tokens for user \"uid:%d\", because %s", user.Uid, err.Error())
 		}

 		token, claims, err := a.tokens.CreateToken(c, user)

 		if err != nil {
-			log.WarnfWithRequestId(c, "[users.UserUpdateProfileHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+			log.Warnf(c, "[users.UserUpdateProfileHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 			return resp, nil
 		}

@@ -493,7 +589,7 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 		c.SetTextualToken(token)
 		c.SetTokenClaims(claims)

-		log.InfofWithRequestId(c, "[users.UserUpdateProfileHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)
+		log.Infof(c, "[users.UserUpdateProfileHandler] user \"uid:%d\" token refreshed, new token will be expired at %d", user.Uid, claims.ExpiresAt)

 		return resp, nil
 	}
@@ -502,130 +598,108 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (any, *errs.Error)
 }

 // UserUpdateAvatarHandler saves user avatar by request parameters for current user
-func (a *UsersApi) UserUpdateAvatarHandler(c *core.Context) (any, *errs.Error) {
+func (a *UsersApi) UserUpdateAvatarHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	user, err := a.users.GetUserById(c, uid)

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserUpdateAvatarHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[users.UserUpdateAvatarHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_UPDATE_AVATAR) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
 	form, err := c.MultipartForm()

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserUpdateAvatarHandler] failed to get multi-part form data for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserUpdateAvatarHandler] failed to get multi-part form data for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrParameterInvalid
 	}

-	avatars := form.File["avatar"]
+	avatarFiles := form.File["avatar"]

-	if len(avatars) < 1 {
-		log.WarnfWithRequestId(c, "[users.UserUpdateAvatarHandler] there is no user avatar in request for user \"uid:%d\"", user.Uid)
+	if len(avatarFiles) < 1 {
+		log.Warnf(c, "[users.UserUpdateAvatarHandler] there is no user avatar in request for user \"uid:%d\"", user.Uid)
 		return nil, errs.ErrNoUserAvatar
 	}

-	if avatars[0].Size < 1 {
-		log.WarnfWithRequestId(c, "[users.UserUpdateAvatarHandler] the size of user avatar in request is zero for user \"uid:%d\"", user.Uid)
+	if avatarFiles[0].Size < 1 {
+		log.Warnf(c, "[users.UserUpdateAvatarHandler] the size of user avatar in request is zero for user \"uid:%d\"", user.Uid)
 		return nil, errs.ErrUserAvatarIsEmpty
 	}

-	fileExtension := utils.GetFileNameExtension(avatars[0].Filename)
+	if avatarFiles[0].Size > int64(a.CurrentConfig().MaxAvatarFileSize) {
+		log.Warnf(c, "[users.UserUpdateAvatarHandler] the upload file size \"%d\" exceeds the maximum size \"%d\" of user avatar for user \"uid:%d\"", avatarFiles[0].Size, a.CurrentConfig().MaxAvatarFileSize, uid)
+		return nil, errs.ErrExceedMaxUserAvatarFileSize
+	}
+
+	fileExtension := utils.GetFileNameExtension(avatarFiles[0].Filename)

 	if utils.GetImageContentType(fileExtension) == "" {
-		log.WarnfWithRequestId(c, "[users.UserUpdateAvatarHandler] the file extension \"%s\" of user avatar in request is not supported for user \"uid:%d\"", fileExtension, user.Uid)
+		log.Warnf(c, "[users.UserUpdateAvatarHandler] the file extension \"%s\" of user avatar in request is not supported for user \"uid:%d\"", fileExtension, user.Uid)
 		return nil, errs.ErrImageTypeNotSupported
 	}

-	avatarFile, err := avatars[0].Open()
+	avatarFile, err := avatarFiles[0].Open()

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserUpdateAvatarHandler] failed to get avatar file from request for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserUpdateAvatarHandler] failed to get avatar file from request for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrOperationFailed
 	}

-	defer avatarFile.Close()
-
-	err = storage.Container.SaveAvatar(user.Uid, avatarFile, fileExtension)
+	err = a.users.UpdateUserAvatar(c, user.Uid, avatarFile, fileExtension, user.CustomAvatarType)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserUpdateAvatarHandler] failed to save avatar file for user \"uid:%d\", because %s", user.Uid, err.Error())
-		return nil, errs.ErrOperationFailed
-	}
-
-	err = a.users.UpdateUserAvatar(c, user.Uid, fileExtension)
-
-	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserUpdateAvatarHandler] failed to update user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserUpdateAvatarHandler] failed to update avatar for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

-	if fileExtension != user.CustomAvatarType {
-		err = storage.Container.DeleteAvatar(user.Uid, user.CustomAvatarType)
-
-		if err != nil {
-			log.WarnfWithRequestId(c, "[users.UserUpdateAvatarHandler] failed to delete old avatar with extension \"%s\" for user \"uid:%d\", because %s", user.CustomAvatarType, user.Uid, err.Error())
-		}
-	}
-
 	user.CustomAvatarType = fileExtension
-	userResp := user.ToUserProfileResponse()
+	userResp := a.getUserProfileResponse(user)
 	return userResp, nil
 }

 // UserRemoveAvatarHandler removes user avatar by request parameters for current user
-func (a *UsersApi) UserRemoveAvatarHandler(c *core.Context) (any, *errs.Error) {
+func (a *UsersApi) UserRemoveAvatarHandler(c *core.WebContext) (any, *errs.Error) {
 	uid := c.GetCurrentUid()
 	user, err := a.users.GetUserById(c, uid)

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserRemoveAvatarHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[users.UserRemoveAvatarHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

+	if user.FeatureRestriction.Contains(core.USER_FEATURE_RESTRICTION_TYPE_UPDATE_AVATAR) {
+		return nil, errs.ErrNotPermittedToPerformThisAction
+	}
+
 	if user.CustomAvatarType == "" {
 		return nil, errs.ErrNothingWillBeUpdated
 	}

-	err = storage.Container.DeleteAvatar(user.Uid, user.CustomAvatarType)
+	err = a.users.RemoveUserAvatar(c, user.Uid, user.CustomAvatarType)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserRemoveAvatarHandler] failed to delete avatar file for user \"uid:%d\", because %s", user.Uid, err.Error())
-
-		exists, err := storage.Container.ExistsAvatar(user.Uid, user.CustomAvatarType)
-
-		if err != nil {
-			log.ErrorfWithRequestId(c, "[users.UserRemoveAvatarHandler] failed to check whether avatar file exist for user \"uid:%d\", because %s", user.Uid, err.Error())
-			return nil, errs.ErrOperationFailed
-		}
-
-		if exists {
-			log.ErrorfWithRequestId(c, "[users.UserRemoveAvatarHandler] failed to delete whether avatar file exist for user \"uid:%d\", the avatar file still exist", user.Uid)
-			return nil, errs.ErrOperationFailed
-		}
-	}
-
-	err = a.users.UpdateUserAvatar(c, user.Uid, "")
-
-	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserRemoveAvatarHandler] failed to update user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserRemoveAvatarHandler] failed to remove avatar for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.Or(err, errs.ErrOperationFailed)
 	}

 	user.CustomAvatarType = ""
-	userResp := user.ToUserProfileResponse()
+	userResp := a.getUserProfileResponse(user)
 	return userResp, nil
 }

 // UserSendVerifyEmailByUnloginUserHandler sends unlogin user verify email
-func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.Context) (any, *errs.Error) {
-	if !settings.Container.Current.EnableUserVerifyEmail {
+func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.WebContext) (any, *errs.Error) {
+	if !a.CurrentConfig().EnableUserVerifyEmail {
 		return nil, errs.ErrEmailValidationNotAllowed
 	}

@@ -636,35 +710,35 @@ func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.Context) (any

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserSendVerifyEmailByUnloginUserHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[users.UserSendVerifyEmailByUnloginUserHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

 	if !a.users.IsPasswordEqualsUserPassword(userResendVerifyEmailReq.Password, user) {
-		log.WarnfWithRequestId(c, "[users.UserSendVerifyEmailByUnloginUserHandler] request password not equals to the user password")
+		log.Warnf(c, "[users.UserSendVerifyEmailByUnloginUserHandler] request password not equals to the user password")
 		return nil, errs.ErrUserPasswordWrong
 	}

 	if user.Disabled {
-		log.WarnfWithRequestId(c, "[users.UserSendVerifyEmailByUnloginUserHandler] user \"uid:%d\" is disabled", user.Uid)
+		log.Warnf(c, "[users.UserSendVerifyEmailByUnloginUserHandler] user \"uid:%d\" is disabled", user.Uid)
 		return nil, errs.ErrUserIsDisabled
 	}

 	if user.EmailVerified {
-		log.WarnfWithRequestId(c, "[users.UserSendVerifyEmailByUnloginUserHandler] user \"uid:%d\" email has been verified", user.Uid)
+		log.Warnf(c, "[users.UserSendVerifyEmailByUnloginUserHandler] user \"uid:%d\" email has been verified", user.Uid)
 		return nil, errs.ErrEmailIsVerified
 	}

-	if !settings.Container.Current.EnableSMTP {
+	if !a.CurrentConfig().EnableSMTP {
 		return nil, errs.ErrSMTPServerNotEnabled
 	}

 	token, _, err := a.tokens.CreateEmailVerifyToken(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserSendVerifyEmailByUnloginUserHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserSendVerifyEmailByUnloginUserHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrTokenGenerating
 	}

@@ -672,7 +746,7 @@ func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.Context) (any
 		err = a.users.SendVerifyEmail(user, token, c.GetClientLocale())

 		if err != nil {
-			log.WarnfWithRequestId(c, "[users.UserSendVerifyEmailByUnloginUserHandler] cannot send email to \"%s\", because %s", user.Email, err.Error())
+			log.Warnf(c, "[users.UserSendVerifyEmailByUnloginUserHandler] cannot send email to \"%s\", because %s", user.Email, err.Error())
 		}
 	}()

@@ -680,8 +754,8 @@ func (a *UsersApi) UserSendVerifyEmailByUnloginUserHandler(c *core.Context) (any
 }

 // UserSendVerifyEmailByLoginedUserHandler sends logined user verify email
-func (a *UsersApi) UserSendVerifyEmailByLoginedUserHandler(c *core.Context) (any, *errs.Error) {
-	if !settings.Container.Current.EnableUserVerifyEmail {
+func (a *UsersApi) UserSendVerifyEmailByLoginedUserHandler(c *core.WebContext) (any, *errs.Error) {
+	if !a.CurrentConfig().EnableUserVerifyEmail {
 		return nil, errs.ErrEmailValidationNotAllowed
 	}

@@ -690,25 +764,25 @@ func (a *UsersApi) UserSendVerifyEmailByLoginedUserHandler(c *core.Context) (any

 	if err != nil {
 		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserSendVerifyEmailByLoginedUserHandler] failed to get user, because %s", err.Error())
+			log.Errorf(c, "[users.UserSendVerifyEmailByLoginedUserHandler] failed to get user, because %s", err.Error())
 		}

 		return nil, errs.ErrUserNotFound
 	}

 	if user.EmailVerified {
-		log.WarnfWithRequestId(c, "[users.UserSendVerifyEmailByLoginedUserHandler] user \"uid:%d\" email has been verified", user.Uid)
+		log.Warnf(c, "[users.UserSendVerifyEmailByLoginedUserHandler] user \"uid:%d\" email has been verified", user.Uid)
 		return nil, errs.ErrEmailIsVerified
 	}

-	if !settings.Container.Current.EnableSMTP {
+	if !a.CurrentConfig().EnableSMTP {
 		return nil, errs.ErrSMTPServerNotEnabled
 	}

 	token, _, err := a.tokens.CreateEmailVerifyToken(c, user)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserSendVerifyEmailByLoginedUserHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
+		log.Errorf(c, "[users.UserSendVerifyEmailByLoginedUserHandler] failed to create token for user \"uid:%d\", because %s", user.Uid, err.Error())
 		return nil, errs.ErrTokenGenerating
 	}

@@ -716,7 +790,7 @@ func (a *UsersApi) UserSendVerifyEmailByLoginedUserHandler(c *core.Context) (any
 		err = a.users.SendVerifyEmail(user, token, c.GetClientLocale())

 		if err != nil {
-			log.WarnfWithRequestId(c, "[users.UserSendVerifyEmailByLoginedUserHandler] cannot send email to \"%s\", because %s", user.Email, err.Error())
+			log.Warnf(c, "[users.UserSendVerifyEmailByLoginedUserHandler] cannot send email to \"%s\", because %s", user.Email, err.Error())
 		}
 	}()

@@ -724,58 +798,36 @@ func (a *UsersApi) UserSendVerifyEmailByLoginedUserHandler(c *core.Context) (any
 }

 // UserGetAvatarHandler returns user avatar data for current user
-func (a *UsersApi) UserGetAvatarHandler(c *core.Context) ([]byte, string, *errs.Error) {
-	uid := c.GetCurrentUid()
-	user, err := a.users.GetUserById(c, uid)
-
-	if err != nil {
-		if !errs.IsCustomError(err) {
-			log.ErrorfWithRequestId(c, "[users.UserGetAvatarHandler] failed to get user, because %s", err.Error())
-		}
-
-		return nil, "", errs.ErrUserNotFound
-	}
-
-	if user.CustomAvatarType == "" {
-		log.WarnfWithRequestId(c, "[users.UserGetAvatarHandler] user does not have avatar for user \"uid:%d\"", user.Uid)
-		return nil, "", errs.ErrUserAvatarNoExists
-	}
-
+func (a *UsersApi) UserGetAvatarHandler(c *core.WebContext) ([]byte, string, *errs.Error) {
 	fileName := c.Param("fileName")
+	fileExtension := utils.GetFileNameExtension(fileName)
+	contentType := utils.GetImageContentType(fileExtension)
+
+	if contentType == "" {
+		return nil, "", errs.ErrImageTypeNotSupported
+	}
+
+	uid := c.GetCurrentUid()
 	fileBaseName := utils.GetFileNameWithoutExtension(fileName)

-	if utils.Int64ToString(user.Uid) != fileBaseName {
-		log.WarnfWithRequestId(c, "[users.UserGetAvatarHandler] cannot get other user avatar \"uid:%s\" for user \"uid:%d\"", fileBaseName, user.Uid)
+	if utils.Int64ToString(uid) != fileBaseName {
+		log.Warnf(c, "[users.UserGetAvatarHandler] cannot get other user avatar \"uid:%s\" for user \"uid:%d\"", fileBaseName, uid)
 		return nil, "", errs.ErrUserIdInvalid
 	}

-	fileExtension := utils.GetFileNameExtension(fileName)
-
-	if user.CustomAvatarType != fileExtension {
-		log.WarnfWithRequestId(c, "[users.UserGetAvatarHandler] user avatar extension is invalid \"%s\" for user \"uid:%d\"", fileExtension, user.Uid)
-		return nil, "", errs.ErrUserAvatarNoExists
-	}
-
-	avatarFile, err := storage.Container.ReadAvatar(user.Uid, fileExtension)
-
-	if os.IsNotExist(err) {
-		log.WarnfWithRequestId(c, "[users.UserGetAvatarHandler] user avatar file not exist for user \"uid:%d\", because %s", user.Uid, err.Error())
-		return nil, "", errs.ErrUserAvatarNoExists
-	}
+	avatarData, err := a.users.GetUserAvatar(c, uid, fileExtension)

 	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserGetAvatarHandler] failed to get user avatar object for user \"uid:%d\", because %s", user.Uid, err.Error())
-		return nil, "", errs.ErrOperationFailed
+		if !errs.IsCustomError(err) {
+			log.Errorf(c, "[users.UserGetAvatarHandler] failed to get user avatar, because %s", err.Error())
 		}

-	defer avatarFile.Close()
-
-	avatarData, err := io.ReadAll(avatarFile)
-
-	if err != nil {
-		log.ErrorfWithRequestId(c, "[users.UserGetAvatarHandler] failed to read user avatar object data for user \"uid:%d\", because %s", user.Uid, err.Error())
-		return nil, "", errs.ErrOperationFailed
+		return nil, "", errs.Or(err, errs.ErrOperationFailed)
 	}

-	return avatarData, utils.GetImageContentType(fileExtension), nil
+	return avatarData, contentType, nil
+}
+
+func (a *UsersApi) getUserProfileResponse(user *models.User) *models.UserProfileResponse {
+	return user.ToUserProfileResponse(a.GetUserBasicInfo(user))
 }
@@ -0,0 +1,8 @@
+package avatars
+
+import "github.com/mayswind/ezbookkeeping/pkg/models"
+
+// AvatarProvider is user avatar provider interface
+type AvatarProvider interface {
+	GetAvatarUrl(user *models.User) string
+}
@@ -0,0 +1,43 @@
+package avatars
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+)
+
+// AvatarProviderContainer contains the current user avatar provider
+type AvatarProviderContainer struct {
+	current AvatarProvider
+}
+
+// Initialize a user avatar provider container singleton instance
+var (
+	Container = &AvatarProviderContainer{}
+)
+
+// InitializeAvatarProvider initializes the current user avatar provider according to the config
+func InitializeAvatarProvider(config *settings.Config) error {
+	if config.AvatarProvider == core.USER_AVATAR_PROVIDER_INTERNAL {
+		Container.current = NewInternalStorageAvatarProvider(config)
+		return nil
+	} else if config.AvatarProvider == core.USER_AVATAR_PROVIDER_GRAVATAR {
+		Container.current = NewGravatarAvatarProvider()
+		return nil
+	} else if config.AvatarProvider == "" {
+		Container.current = NewNullAvatarProvider()
+		return nil
+	}
+
+	return errs.ErrInvalidAvatarProvider
+}
+
+// GetAvatarUrl returns the avatar url by the current user avatar provider
+func (p *AvatarProviderContainer) GetAvatarUrl(user *models.User) string {
+	if p.current == nil {
+		return ""
+	}
+
+	return p.current.GetAvatarUrl(user)
+}
@@ -0,0 +1,31 @@
+package avatars
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+// Reference: https://en.gravatar.com/site/implement/hash/
+const gravatarUrlFormat = "https://www.gravatar.com/avatar/%s"
+
+// GravatarAvatarProvider represents the gravatar avatar provider
+type GravatarAvatarProvider struct {
+}
+
+// NewGravatarAvatarProvider returns a new gravatar avatar provider
+func NewGravatarAvatarProvider() *GravatarAvatarProvider {
+	return &GravatarAvatarProvider{}
+}
+
+// GetAvatarUrl returns the gravatar url
+func (p *GravatarAvatarProvider) GetAvatarUrl(user *models.User) string {
+	email := user.Email
+	email = strings.TrimSpace(email)
+	email = strings.ToLower(email)
+	emailMd5 := utils.MD5EncodeToString([]byte(email))
+
+	return fmt.Sprintf(gravatarUrlFormat, emailMd5)
+}
@@ -0,0 +1,20 @@
+package avatars
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+func TestGravatarAvatarProvider_GetGravatarUrl(t *testing.T) {
+	avatarProvider := NewGravatarAvatarProvider()
+
+	expectedValue := "https://www.gravatar.com/avatar/0bc83cb571cd1c50ba6f3e8a78ef1346"
+	actualValue := avatarProvider.GetAvatarUrl(&models.User{
+		Email: "MyEmailAddress@example.com",
+	})
+
+	assert.Equal(t, expectedValue, actualValue)
+}
@@ -0,0 +1,31 @@
+package avatars
+
+import (
+	"fmt"
+
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+)
+
+const internalAvatarUrlFormat = "%savatar/%d.%s"
+
+// InternalStorageAvatarProvider represents the internal storage avatar provider
+type InternalStorageAvatarProvider struct {
+	webRootUrl string
+}
+
+// NewInternalStorageAvatarProvider returns a new internal storage avatar provider
+func NewInternalStorageAvatarProvider(config *settings.Config) *InternalStorageAvatarProvider {
+	return &InternalStorageAvatarProvider{
+		webRootUrl: config.RootUrl,
+	}
+}
+
+// GetAvatarUrl returns the built-in avatar url
+func (p *InternalStorageAvatarProvider) GetAvatarUrl(user *models.User) string {
+	if user.CustomAvatarType == "" {
+		return ""
+	}
+
+	return fmt.Sprintf(internalAvatarUrlFormat, p.webRootUrl, user.Uid, user.CustomAvatarType)
+}
@@ -0,0 +1,38 @@
+package avatars
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/settings"
+)
+
+func TestInternalStorageAvatarProvider_GetAvatarUrl(t *testing.T) {
+	avatarProvider := NewInternalStorageAvatarProvider(&settings.Config{
+		RootUrl: "https://foo.bar/",
+	})
+
+	expectedValue := "https://foo.bar/avatar/1234567890.jpg"
+	actualValue := avatarProvider.GetAvatarUrl(&models.User{
+		Uid:              1234567890,
+		CustomAvatarType: "jpg",
+	})
+
+	assert.Equal(t, expectedValue, actualValue)
+}
+
+func TestInternalStorageAvatarProvider_GetAvatarUrl_EmptyCustomAvatarType(t *testing.T) {
+	avatarProvider := NewInternalStorageAvatarProvider(&settings.Config{
+		RootUrl: "https://foo.bar/",
+	})
+
+	expectedValue := ""
+	actualValue := avatarProvider.GetAvatarUrl(&models.User{
+		Uid:              1234567890,
+		CustomAvatarType: "",
+	})
+
+	assert.Equal(t, expectedValue, actualValue)
+}
@@ -0,0 +1,19 @@
+package avatars
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+// NullAvatarProvider represents the null avatar provider
+type NullAvatarProvider struct {
+}
+
+// NewNullAvatarProvider returns a new null avatar provider
+func NewNullAvatarProvider() *NullAvatarProvider {
+	return &NullAvatarProvider{}
+}
+
+// GetAvatarUrl returns an empty url
+func (p *NullAvatarProvider) GetAvatarUrl(user *models.User) string {
+	return ""
+}
@@ -0,0 +1,20 @@
+package avatars
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+func TestNullAvatarProvider_GetGravatarUrl(t *testing.T) {
+	avatarProvider := NewNullAvatarProvider()
+
+	expectedValue := ""
+	actualValue := avatarProvider.GetAvatarUrl(&models.User{
+		Email: "MyEmailAddress@example.com",
+	})
+
+	assert.Equal(t, expectedValue, actualValue)
+}
@@ -0,0 +1,13 @@
+package cli
+
+import "github.com/mayswind/ezbookkeeping/pkg/settings"
+
+// CliUsingConfig represents a cli that need to use config
+type CliUsingConfig struct {
+	container *settings.ConfigContainer
+}
+
+// CurrentConfig returns the current config
+func (l *CliUsingConfig) CurrentConfig() *settings.Config {
+	return l.container.GetCurrentConfig()
+}
@@ -0,0 +1,27 @@
+package alipay
+
+// alipayAppTransactionDataCsvFileImporter defines the structure of alipay app csv importer for transaction data
+type alipayAppTransactionDataCsvFileImporter struct {
+	alipayTransactionDataCsvFileImporter
+}
+
+// Initialize a alipay app transaction data csv file importer singleton instance
+var (
+	AlipayAppTransactionDataCsvFileImporter = &alipayAppTransactionDataCsvFileImporter{
+		alipayTransactionDataCsvFileImporter{
+			fileHeaderLine:         "------------------------------------------------------------------------------------",
+			dataHeaderStartContent: "支付宝（中国）网络技术有限公司  电子客户回单",
+			originalColumnNames: alipayTransactionColumnNames{
+				timeColumnName:           "交易时间",
+				categoryColumnName:       "交易分类",
+				targetNameColumnName:     "交易对方",
+				productNameColumnName:    "商品说明",
+				amountColumnName:         "金额",
+				typeColumnName:           "收/支",
+				relatedAccountColumnName: "收/付款方式",
+				statusColumnName:         "交易状态",
+				descriptionColumnName:    "备注",
+			},
+		},
+	}
+)
@@ -0,0 +1,87 @@
+package alipay
+
+import (
+	"bytes"
+
+	"golang.org/x/text/encoding/simplifiedchinese"
+	"golang.org/x/text/transform"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/converter"
+	"github.com/mayswind/ezbookkeeping/pkg/converters/csv"
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+var alipayTransactionSupportedColumns = map[datatable.TransactionDataTableColumn]bool{
+	datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME:     true,
+	datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE:     true,
+	datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY:         true,
+	datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME:         true,
+	datatable.TRANSACTION_DATA_TABLE_AMOUNT:               true,
+	datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME: true,
+	datatable.TRANSACTION_DATA_TABLE_DESCRIPTION:          true,
+}
+
+var alipayTransactionTypeNameMapping = map[models.TransactionType]string{
+	models.TRANSACTION_TYPE_INCOME:   "收入",
+	models.TRANSACTION_TYPE_EXPENSE:  "支出",
+	models.TRANSACTION_TYPE_TRANSFER: "不计收支",
+}
+
+// alipayTransactionColumnNames defines the structure of alipay transaction plain text header names
+type alipayTransactionColumnNames struct {
+	timeColumnName           string
+	categoryColumnName       string
+	targetNameColumnName     string
+	productNameColumnName    string
+	amountColumnName         string
+	typeColumnName           string
+	relatedAccountColumnName string
+	statusColumnName         string
+	descriptionColumnName    string
+}
+
+// alipayTransactionDataCsvFileImporter defines the structure of alipay csv importer for transaction data
+type alipayTransactionDataCsvFileImporter struct {
+	fileHeaderLine         string
+	dataHeaderStartContent string
+	dataBottomEndLineRune  rune
+	originalColumnNames    alipayTransactionColumnNames
+}
+
+// ParseImportedData returns the imported data by parsing the alipay transaction csv data
+func (c *alipayTransactionDataCsvFileImporter) ParseImportedData(ctx core.Context, user *models.User, data []byte, defaultTimezoneOffset int16, accountMap map[string]*models.Account, expenseCategoryMap map[string]map[string]*models.TransactionCategory, incomeCategoryMap map[string]map[string]*models.TransactionCategory, transferCategoryMap map[string]map[string]*models.TransactionCategory, tagMap map[string]*models.TransactionTag) (models.ImportedTransactionSlice, []*models.Account, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionTag, error) {
+	enc := simplifiedchinese.GB18030
+	reader := transform.NewReader(bytes.NewReader(data), enc.NewDecoder())
+
+	csvDataTable, err := csv.CreateNewCsvBasicDataTable(ctx, reader, false)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	dataTable, err := createNewAlipayTransactionBasicDataTable(ctx, csvDataTable, c.fileHeaderLine, c.dataHeaderStartContent, c.dataBottomEndLineRune)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	commonDataTable := datatable.CreateNewCommonDataTableFromBasicDataTable(dataTable)
+
+	if !commonDataTable.HasColumn(c.originalColumnNames.timeColumnName) ||
+		!commonDataTable.HasColumn(c.originalColumnNames.amountColumnName) ||
+		!commonDataTable.HasColumn(c.originalColumnNames.typeColumnName) ||
+		!commonDataTable.HasColumn(c.originalColumnNames.statusColumnName) {
+		log.Errorf(ctx, "[alipay_transaction_data_csv_file_importer.ParseImportedData] cannot parse alipay csv data, because missing essential columns in header row")
+		return nil, nil, nil, nil, nil, nil, errs.ErrMissingRequiredFieldInHeaderRow
+	}
+
+	transactionRowParser := createAlipayTransactionDataRowParser(c.originalColumnNames, dataTable.HeaderColumnNames())
+	transactionDataTable := datatable.CreateNewTransactionDataTableFromCommonDataTable(commonDataTable, alipayTransactionSupportedColumns, transactionRowParser)
+	dataTableImporter := converter.CreateNewSimpleImporterWithTypeNameMapping(alipayTransactionTypeNameMapping)
+
+	return dataTableImporter.ParseImportedData(ctx, user, transactionDataTable, defaultTimezoneOffset, accountMap, expenseCategoryMap, incomeCategoryMap, transferCategoryMap, tagMap)
+}
@@ -0,0 +1,614 @@
+package alipay
+
+import (
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"golang.org/x/text/encoding/simplifiedchinese"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+func TestAlipayCsvFileImporterParseImportedData_MinimumValidData(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 01:23:45 ,xxxx            ,0.12   ,收入      ,交易成功    ,\n" +
+		"2024-09-01 12:34:56 ,xxxx            ,123.45  ,支出      ,交易成功    ,\n" +
+		"2024-09-01 23:59:59 ,充值-普通充值             ,0.05   ,不计收支    ,交易成功    ,\n" +
+		"2024-09-02 23:59:59 ,提现-普通提现             ,0.03   ,不计收支    ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, allNewAccounts, allNewSubExpenseCategories, allNewSubIncomeCategories, allNewSubTransferCategories, allNewTags, err := converter.ParseImportedData(context, user, []byte(data), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 4, len(allNewTransactions))
+	assert.Equal(t, 2, len(allNewAccounts))
+	assert.Equal(t, 1, len(allNewSubExpenseCategories))
+	assert.Equal(t, 1, len(allNewSubIncomeCategories))
+	assert.Equal(t, 1, len(allNewSubTransferCategories))
+	assert.Equal(t, 0, len(allNewTags))
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[0].Type)
+	assert.Equal(t, "2024-09-01 01:23:45", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime), time.UTC))
+	assert.Equal(t, int64(12), allNewTransactions[0].Amount)
+	assert.Equal(t, "Alipay", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[1].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[1].Type)
+	assert.Equal(t, "2024-09-01 12:34:56", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime), time.UTC))
+	assert.Equal(t, int64(12345), allNewTransactions[1].Amount)
+	assert.Equal(t, "", allNewTransactions[1].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[1].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[2].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[2].Type)
+	assert.Equal(t, "2024-09-01 23:59:59", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime), time.UTC))
+	assert.Equal(t, int64(5), allNewTransactions[2].Amount)
+	assert.Equal(t, "", allNewTransactions[2].OriginalSourceAccountName)
+	assert.Equal(t, "Alipay", allNewTransactions[2].OriginalDestinationAccountName)
+	assert.Equal(t, "", allNewTransactions[2].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[3].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[3].Type)
+	assert.Equal(t, "2024-09-02 23:59:59", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[3].TransactionTime), time.UTC))
+	assert.Equal(t, int64(3), allNewTransactions[3].Amount)
+	assert.Equal(t, "Alipay", allNewTransactions[3].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[3].OriginalDestinationAccountName)
+	assert.Equal(t, "", allNewTransactions[3].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
+	assert.Equal(t, "Alipay", allNewAccounts[0].Name)
+	assert.Equal(t, "CNY", allNewAccounts[0].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[1].Uid)
+	assert.Equal(t, "", allNewAccounts[1].Name)
+	assert.Equal(t, "CNY", allNewAccounts[1].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewSubExpenseCategories[0].Uid)
+	assert.Equal(t, "", allNewSubExpenseCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubIncomeCategories[0].Uid)
+	assert.Equal(t, "", allNewSubIncomeCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubTransferCategories[0].Uid)
+	assert.Equal(t, "", allNewSubTransferCategories[0].Name)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_ParseRefundTransaction(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 01:23:45 ,0.12   ,不计收支    ,退款成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[0].Type)
+	assert.Equal(t, "2024-09-01 01:23:45", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime), time.UTC))
+	assert.Equal(t, int64(-12), allNewTransactions[0].Amount)
+	assert.Equal(t, "", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
+
+	data2, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 01:23:45 ,0.12   ,收入      ,退税成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data2), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[0].Type)
+	assert.Equal(t, "2024-09-01 01:23:45", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime), time.UTC))
+	assert.Equal(t, int64(-12), allNewTransactions[0].Amount)
+	assert.Equal(t, "", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_ParseInvalidTime(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01T12:34:56 ,0.12   ,收入      ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrTransactionTimeInvalid.Message)
+
+	data2, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,收/支     ,交易状态    ,\n" +
+		"09/01/2024 12:34:56 ,0.12   ,收入      ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data2), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrTransactionTimeInvalid.Message)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_ParseInvalidType(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,0.12   ,        ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_ParseAccountName(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	// income to alipay wallet
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,交易对方            ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,test                ,0.12   ,收入      ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "Alipay", allNewTransactions[0].OriginalSourceAccountName)
+
+	// refund to other account
+	data2, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,交易对方            ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,test                ,0.12   ,不计收支    ,退款成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data2), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "", allNewTransactions[0].OriginalSourceAccountName)
+
+	// transfer to alipay wallet
+	data3, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,交易对方            ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,test                ,充值-普通充值             ,0.12   ,不计收支    ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data3), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "Alipay", allNewTransactions[0].OriginalDestinationAccountName)
+
+	// transfer from alipay wallet
+	data4, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,交易对方            ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,test                ,提现-实时提现             ,0.12   ,不计收支    ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data4), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "Alipay", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "test", allNewTransactions[0].OriginalDestinationAccountName)
+
+	// transfer in
+	data5, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,交易对方            ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,test                ,xx-转入             ,0.12   ,不计收支    ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data5), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "test", allNewTransactions[0].OriginalDestinationAccountName)
+
+	// transfer out
+	data6, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,交易对方            ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,test                ,xx-转出             ,0.12   ,不计收支    ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data6), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "test", allNewTransactions[0].OriginalDestinationAccountName)
+
+	// repayment
+	data7, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,交易对方            ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,test                ,xx还款             ,0.12   ,不计收支    ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data7), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "test", allNewTransactions[0].OriginalDestinationAccountName)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_ParseCategory(t *testing.T) {
+	converter := AlipayAppTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("------------------------------------------------------------------------------------\n" +
+		"导出信息：\n" +
+		"姓名：xxx\n" +
+		"支付宝账户：xxx@xxx.xxx\n" +
+		"起始时间：[2024-01-01 00:00:00]    终止时间：[2024-09-01 23:59:59]\n" +
+		"导出交易类型：[全部]\n" +
+		"------------------------支付宝（中国）网络技术有限公司  电子客户回单------------------------\n" +
+		"交易时间,交易分类,商品说明,收/支,金额,交易状态,\n" +
+		"2024-09-01 01:23:45,Test Category,xxxx,收入,0.12,交易成功,\n" +
+		"2024-09-01 12:34:56,Test Category2,xxxx,支出,123.45,交易成功,\n" +
+		"2024-09-01 23:59:59,Test Category3,充值-普通充值,不计收支,0.05,交易成功,\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, allNewSubExpenseCategories, allNewSubIncomeCategories, allNewSubTransferCategories, _, err := converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 3, len(allNewTransactions))
+	assert.Equal(t, 1, len(allNewSubExpenseCategories))
+	assert.Equal(t, 1, len(allNewSubIncomeCategories))
+	assert.Equal(t, 1, len(allNewSubTransferCategories))
+
+	assert.Equal(t, int64(1234567890), allNewSubExpenseCategories[0].Uid)
+	assert.Equal(t, "Test Category2", allNewSubExpenseCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubIncomeCategories[0].Uid)
+	assert.Equal(t, "Test Category", allNewSubIncomeCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubTransferCategories[0].Uid)
+	assert.Equal(t, "Test Category3", allNewSubTransferCategories[0].Name)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_ParseRelatedAccount(t *testing.T) {
+	converter := AlipayAppTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("------------------------------------------------------------------------------------\n" +
+		"导出信息：\n" +
+		"姓名：xxx\n" +
+		"支付宝账户：xxx@xxx.xxx\n" +
+		"起始时间：[2024-01-01 00:00:00]    终止时间：[2024-09-01 23:59:59]\n" +
+		"导出交易类型：[全部]\n" +
+		"------------------------支付宝（中国）网络技术有限公司  电子客户回单------------------------\n" +
+		"交易时间,商品说明,收/支,金额,收/付款方式,交易状态,\n" +
+		"2024-09-01 03:45:07,余额宝-单次转入,不计收支,0.01,Test Account,交易成功,\n" +
+		"2024-09-01 05:07:29,信用卡还款,不计收支,0.02,Test Account2,交易成功,\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, allNewAccounts, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, len(allNewTransactions))
+	assert.Equal(t, 3, len(allNewAccounts))
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, int64(1), allNewTransactions[0].Amount)
+	assert.Equal(t, "Test Account", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[0].OriginalDestinationAccountName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[1].Uid)
+	assert.Equal(t, int64(2), allNewTransactions[1].Amount)
+	assert.Equal(t, "Test Account2", allNewTransactions[1].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[1].OriginalDestinationAccountName)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
+	assert.Equal(t, "Test Account", allNewAccounts[0].Name)
+	assert.Equal(t, "CNY", allNewAccounts[0].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[1].Uid)
+	assert.Equal(t, "", allNewAccounts[1].Name)
+	assert.Equal(t, "CNY", allNewAccounts[1].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[2].Uid)
+	assert.Equal(t, "Test Account2", allNewAccounts[2].Name)
+	assert.Equal(t, "CNY", allNewAccounts[2].Currency)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_ParseDescription(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,商品名称                ,金额（元）,收/支     ,交易状态    ,备注                  ,\n" +
+		"2024-09-01 12:34:56 ,test                ,0.12   ,收入      ,交易成功    ,test2               ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "test2", allNewTransactions[0].Comment)
+
+	data2, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,商品名称                ,金额（元）,收/支     ,交易状态    ,备注                  ,\n" +
+		"2024-09-01 12:34:56 ,test                ,0.12   ,收入      ,交易成功    ,                    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data2), 0, nil, nil, nil, nil, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "test", allNewTransactions[0].Comment)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_SkipClosedIncomeOrTransferTransaction(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 01:23:45 ,xxxx            ,0.12   ,收入      ,交易关闭    ,\n" +
+		"2024-09-01 23:59:59 ,充值-普通充值             ,0.05   ,不计收支    ,交易关闭    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_SkipUnknownProductTransferTransaction(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 23:59:59 ,xxxx                ,0.05   ,不计收支    ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_SkipUnknownStatusTransaction(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	data, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,商品名称                ,金额（元）,收/支     ,交易状态    ,\n" +
+		"2024-09-01 01:23:45 ,xxxx            ,0.12   ,收入      ,xxxx    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_MissingFileHeader(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1,
+		DefaultCurrency: "CNY",
+	}
+
+	data, err := simplifiedchinese.GB18030.NewEncoder().String(
+		"交易创建时间              ,金额（元）,收/支     ,交易状态    ,\n" +
+			"2024-09-01 12:34:56 ,0.12   ,收入      ,交易成功    ,\n" +
+			"------------------------------------------------------------------------------------\n")
+	assert.Nil(t, err)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrInvalidFileHeader.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(""), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrInvalidFileHeader.Message)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_MissingRequiredColumn(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1,
+		DefaultCurrency: "CNY",
+	}
+
+	// Missing Time Column
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"金额（元）,收/支     ,交易状态    ,\n" +
+		"0.12   ,收入      ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrMissingRequiredFieldInHeaderRow.Message)
+
+	// Missing Amount Column
+	data2, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,收/支     ,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,收入      ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data2), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrMissingRequiredFieldInHeaderRow.Message)
+
+	// Missing Status Column
+	data3, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,收/支     ,\n" +
+		"2024-09-01 12:34:56 ,0.12   ,收入      ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data3), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrMissingRequiredFieldInHeaderRow.Message)
+
+	// Missing Type Column
+	data4, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,交易状态    ,\n" +
+		"2024-09-01 12:34:56 ,0.12   ,交易成功    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data4), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrMissingRequiredFieldInHeaderRow.Message)
+}
+
+func TestAlipayCsvFileImporterParseImportedData_NoTransactionData(t *testing.T) {
+	converter := AlipayWebTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1,
+		DefaultCurrency: "CNY",
+	}
+
+	data1, err := simplifiedchinese.GB18030.NewEncoder().String("支付宝交易记录明细查询\n" +
+		"账号:[xxx@xxx.xxx]\n" +
+		"起始日期:[2024-01-01 00:00:00]    终止日期:[2024-09-01 23:59:59]\n" +
+		"---------------------------------交易记录明细列表------------------------------------\n" +
+		"交易创建时间              ,金额（元）,收/支     ,交易状态    ,\n" +
+		"------------------------------------------------------------------------------------\n")
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(data1), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+}
@@ -0,0 +1,78 @@
+package alipay
+
+import (
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/csv"
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+func createNewAlipayTransactionBasicDataTable(ctx core.Context, originalDataTable datatable.BasicDataTable, fileHeaderLine string, dataHeaderStartContent string, dataBottomEndLineRune rune) (datatable.BasicDataTable, error) {
+	iterator := originalDataTable.DataRowIterator()
+	allOriginalLines := make([][]string, 0)
+	hasFileHeader := false
+	foundContentBeforeDataHeaderLine := false
+
+	for iterator.HasNext() {
+		row := iterator.Next()
+
+		if !hasFileHeader {
+			if row.ColumnCount() <= 0 {
+				continue
+			} else if strings.Index(row.GetData(0), fileHeaderLine) == 0 {
+				hasFileHeader = true
+				continue
+			} else {
+				log.Warnf(ctx, "[alipay_transaction_data_extrator.createNewAlipayTransactionBasicDataTable] read unexpected line in row \"%s\" before read file header", iterator.CurrentRowId())
+				continue
+			}
+		}
+
+		if !foundContentBeforeDataHeaderLine {
+			if row.ColumnCount() <= 0 {
+				continue
+			} else if strings.Index(row.GetData(0), dataHeaderStartContent) >= 0 {
+				foundContentBeforeDataHeaderLine = true
+				continue
+			} else {
+				continue
+			}
+		}
+
+		if foundContentBeforeDataHeaderLine {
+			if row.ColumnCount() <= 0 {
+				continue
+			} else if row.ColumnCount() == 1 && dataBottomEndLineRune > 0 && utils.ContainsOnlyOneRune(row.GetData(0), dataBottomEndLineRune) {
+				break
+			}
+
+			items := make([]string, row.ColumnCount())
+
+			for i := 0; i < row.ColumnCount(); i++ {
+				items[i] = strings.Trim(row.GetData(i), " ")
+			}
+
+			if len(allOriginalLines) > 0 && len(items) < len(allOriginalLines[0]) {
+				log.Errorf(ctx, "[alipay_transaction_data_extrator.createNewAlipayTransactionBasicDataTable] cannot parse row \"%s\", because may missing some columns (column count %d in data row is less than header column count %d)", iterator.CurrentRowId(), len(items), len(allOriginalLines[0]))
+				return nil, errs.ErrFewerFieldsInDataRowThanInHeaderRow
+			}
+
+			allOriginalLines = append(allOriginalLines, items)
+		}
+	}
+
+	if !hasFileHeader || !foundContentBeforeDataHeaderLine {
+		return nil, errs.ErrInvalidFileHeader
+	}
+
+	if len(allOriginalLines) < 2 {
+		log.Errorf(ctx, "[alipay_transaction_data_extrator.createNewAlipayTransactionBasicDataTable] cannot parse import data, because data table row count is less 1")
+		return nil, errs.ErrNotFoundTransactionDataInFile
+	}
+
+	return csv.CreateNewCustomCsvBasicDataTable(allOriginalLines, true), nil
+}
@@ -0,0 +1,191 @@
+package alipay
+
+import (
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/locales"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+const alipayTransactionDataStatusSuccessName = "交易成功"
+const alipayTransactionDataStatusPaymentSuccessName = "支付成功"
+const alipayTransactionDataStatusRepaymentSuccessName = "还款成功"
+const alipayTransactionDataStatusClosedName = "交易关闭"
+const alipayTransactionDataStatusRefundSuccessName = "退款成功"
+const alipayTransactionDataStatusTaxRefundSuccessName = "退税成功"
+
+const alipayTransactionDataProductNameTransferToAlipayPrefix = "充值-"
+const alipayTransactionDataProductNameTransferFromAlipayPrefix = "提现-"
+const alipayTransactionDataProductNameTransferInText = "转入"
+const alipayTransactionDataProductNameTransferOutText = "转出"
+const alipayTransactionDataProductNameRepaymentText = "还款"
+
+// alipayTransactionDataRowParser defines the structure of alipay transaction data row parser
+type alipayTransactionDataRowParser struct {
+	columns                    alipayTransactionColumnNames
+	existedOriginalDataColumns map[string]bool
+}
+
+// Parse returns the converted transaction data row
+func (p *alipayTransactionDataRowParser) Parse(ctx core.Context, user *models.User, dataRow datatable.CommonDataTableRow, rowId string) (rowData map[datatable.TransactionDataTableColumn]string, rowDataValid bool, err error) {
+	if dataRow.GetData(p.columns.typeColumnName) != alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_INCOME] &&
+		dataRow.GetData(p.columns.typeColumnName) != alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_EXPENSE] &&
+		dataRow.GetData(p.columns.typeColumnName) != alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_TRANSFER] {
+		log.Warnf(ctx, "[alipay_transaction_data_row_parser.Parse] skip parsing transaction in row \"%s\", because type is \"%s\"", rowId, dataRow.GetData(p.columns.typeColumnName))
+		return nil, false, nil
+	}
+
+	if dataRow.GetData(p.columns.statusColumnName) != alipayTransactionDataStatusSuccessName &&
+		dataRow.GetData(p.columns.statusColumnName) != alipayTransactionDataStatusPaymentSuccessName &&
+		dataRow.GetData(p.columns.statusColumnName) != alipayTransactionDataStatusRepaymentSuccessName &&
+		dataRow.GetData(p.columns.statusColumnName) != alipayTransactionDataStatusClosedName &&
+		dataRow.GetData(p.columns.statusColumnName) != alipayTransactionDataStatusRefundSuccessName &&
+		dataRow.GetData(p.columns.statusColumnName) != alipayTransactionDataStatusTaxRefundSuccessName {
+		log.Warnf(ctx, "[alipay_transaction_data_row_parser.Parse] skip parsing transaction in row \"%s\", because status is \"%s\"", rowId, dataRow.GetData(p.columns.statusColumnName))
+		return nil, false, nil
+	}
+
+	data := make(map[datatable.TransactionDataTableColumn]string, len(alipayTransactionSupportedColumns))
+
+	if p.hasOriginalColumn(p.columns.timeColumnName) {
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME] = dataRow.GetData(p.columns.timeColumnName)
+	}
+
+	if p.hasOriginalColumn(p.columns.categoryColumnName) {
+		data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = dataRow.GetData(p.columns.categoryColumnName)
+	} else {
+		data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = ""
+	}
+
+	if p.hasOriginalColumn(p.columns.amountColumnName) {
+		data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = dataRow.GetData(p.columns.amountColumnName)
+	}
+
+	if p.hasOriginalColumn(p.columns.descriptionColumnName) && dataRow.GetData(p.columns.descriptionColumnName) != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = dataRow.GetData(p.columns.descriptionColumnName)
+	} else if p.hasOriginalColumn(p.columns.productNameColumnName) && dataRow.GetData(p.columns.productNameColumnName) != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = dataRow.GetData(p.columns.productNameColumnName)
+	} else {
+		data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = ""
+	}
+
+	relatedAccountName := ""
+
+	if p.hasOriginalColumn(p.columns.relatedAccountColumnName) {
+		relatedAccountName = dataRow.GetData(p.columns.relatedAccountColumnName)
+	}
+
+	statusName := ""
+
+	if p.hasOriginalColumn(p.columns.statusColumnName) {
+		statusName = dataRow.GetData(p.columns.statusColumnName)
+	}
+
+	locale := user.Language
+
+	if locale == "" {
+		locale = ctx.GetClientLocale()
+	}
+
+	localeTextItems := locales.GetLocaleTextItems(locale)
+
+	if p.hasOriginalColumn(p.columns.typeColumnName) {
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = dataRow.GetData(p.columns.typeColumnName)
+
+		if dataRow.GetData(p.columns.typeColumnName) == alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_INCOME] {
+			if statusName == alipayTransactionDataStatusClosedName {
+				log.Warnf(ctx, "[alipay_transaction_data_row_parser.Parse] skip parsing transaction in row \"%s\", because income transaction is closed", rowId)
+				return nil, false, nil
+			}
+
+			if statusName == alipayTransactionDataStatusSuccessName {
+				data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = localeTextItems.DataConverterTextItems.Alipay
+				data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = ""
+			} else {
+				data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = ""
+				data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = ""
+			}
+		} else if dataRow.GetData(p.columns.typeColumnName) == alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_TRANSFER] {
+			if statusName == alipayTransactionDataStatusClosedName {
+				log.Warnf(ctx, "[alipay_transaction_data_row_parser.Parse] skip parsing transaction in row \"%s\", because non-income/expense transaction is closed", rowId)
+				return nil, false, nil
+			}
+
+			targetName := ""
+			productName := ""
+
+			if p.hasOriginalColumn(p.columns.targetNameColumnName) {
+				targetName = dataRow.GetData(p.columns.targetNameColumnName)
+			}
+
+			if p.hasOriginalColumn(p.columns.productNameColumnName) {
+				productName = dataRow.GetData(p.columns.productNameColumnName)
+			}
+
+			if statusName == alipayTransactionDataStatusRefundSuccessName {
+				data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_INCOME]
+				data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
+				data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = ""
+			} else {
+				if strings.Index(productName, alipayTransactionDataProductNameTransferToAlipayPrefix) == 0 { // transfer to alipay wallet
+					data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = ""
+					data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = localeTextItems.DataConverterTextItems.Alipay
+				} else if strings.Index(productName, alipayTransactionDataProductNameTransferFromAlipayPrefix) == 0 { // transfer from alipay wallet
+					data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = localeTextItems.DataConverterTextItems.Alipay
+					data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = targetName
+				} else if strings.Index(productName, alipayTransactionDataProductNameTransferInText) >= 0 { // transfer in
+					data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
+					data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = targetName
+				} else if strings.Index(productName, alipayTransactionDataProductNameTransferOutText) >= 0 { // transfer out
+					data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
+					data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = targetName
+				} else if strings.Index(productName, alipayTransactionDataProductNameRepaymentText) >= 0 { // repayment
+					data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
+					data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = targetName
+				} else {
+					log.Warnf(ctx, "[alipay_transaction_data_row_parser.Parse] skip parsing transaction in row \"%s\", because product name (\"%s\") is unknown", rowId, productName)
+					return nil, false, nil
+				}
+			}
+		} else {
+			data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
+			data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = ""
+		}
+	}
+
+	if data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] == alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_INCOME] && statusName != "" {
+		if statusName == alipayTransactionDataStatusRefundSuccessName || statusName == alipayTransactionDataStatusTaxRefundSuccessName {
+			amount, err := utils.ParseAmount(data[datatable.TRANSACTION_DATA_TABLE_AMOUNT])
+
+			if err == nil {
+				data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = alipayTransactionTypeNameMapping[models.TRANSACTION_TYPE_EXPENSE]
+				data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = utils.FormatAmount(-amount)
+			}
+		}
+	}
+
+	return data, true, nil
+}
+
+func (p *alipayTransactionDataRowParser) hasOriginalColumn(columnName string) bool {
+	_, exists := p.existedOriginalDataColumns[columnName]
+	return exists
+}
+
+// createAlipayTransactionDataRowParser returns alipay transaction data row parser
+func createAlipayTransactionDataRowParser(originalColumnNames alipayTransactionColumnNames, headerColumnNames []string) datatable.CommonTransactionDataRowParser {
+	existedOriginalDataColumns := make(map[string]bool, len(headerColumnNames))
+
+	for i := 0; i < len(headerColumnNames); i++ {
+		existedOriginalDataColumns[headerColumnNames[i]] = true
+	}
+
+	return &alipayTransactionDataRowParser{
+		columns:                    originalColumnNames,
+		existedOriginalDataColumns: existedOriginalDataColumns,
+	}
+}
@@ -0,0 +1,28 @@
+package alipay
+
+// alipayWebTransactionDataCsvFileImporter defines the structure of alipay (web) csv importer for transaction data
+type alipayWebTransactionDataCsvFileImporter struct {
+	alipayTransactionDataCsvFileImporter
+}
+
+// Initialize a alipay (web) transaction data csv file importer singleton instance
+var (
+	AlipayWebTransactionDataCsvFileImporter = &alipayWebTransactionDataCsvFileImporter{
+		alipayTransactionDataCsvFileImporter{
+			fileHeaderLine:         "支付宝交易记录明细查询",
+			dataHeaderStartContent: "交易记录明细列表",
+			dataBottomEndLineRune:  '-',
+			originalColumnNames: alipayTransactionColumnNames{
+				timeColumnName:           "交易创建时间",
+				categoryColumnName:       "",
+				targetNameColumnName:     "交易对方",
+				productNameColumnName:    "商品名称",
+				amountColumnName:         "金额（元）",
+				typeColumnName:           "收/支",
+				relatedAccountColumnName: "",
+				statusColumnName:         "交易状态",
+				descriptionColumnName:    "备注",
+			},
+		},
+	}
+)
@@ -0,0 +1,197 @@
+package beancount
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+)
+
+var operatorPriority = map[rune]int{
+	'+': 1,
+	'-': 1,
+	'*': 2,
+	'/': 2,
+}
+
+func toPostfixExprTokens(ctx core.Context, expr string) ([]string, error) {
+	finalTokens := make([]string, 0)
+	operatorStack := make([]rune, 0)
+	currentNumberBuilder := strings.Builder{}
+	isLastTokenOperator := true
+
+	expr = strings.ReplaceAll(expr, " ", "")
+
+	for i := 0; i < len(expr); i++ {
+		ch := rune(expr[i])
+
+		// number
+		if '0' <= ch && ch <= '9' || ch == '.' {
+			currentNumberBuilder.WriteRune(ch)
+			continue
+		} else if ch == '-' && i+1 < len(expr) && '0' <= expr[i+1] && expr[i+1] <= '9' && currentNumberBuilder.Len() == 0 && isLastTokenOperator {
+			currentNumberBuilder.WriteRune(ch)
+			continue
+		}
+
+		// operator or parenthesis
+		if currentNumberBuilder.Len() > 0 {
+			finalTokens = append(finalTokens, currentNumberBuilder.String())
+			currentNumberBuilder.Reset()
+			isLastTokenOperator = false
+		}
+
+		switch ch {
+		case '+', '-', '*', '/':
+			if ch == '-' && isLastTokenOperator {
+				currentNumberBuilder.WriteRune(ch)
+				continue
+			}
+
+			for len(operatorStack) > 0 {
+				topOperator := operatorStack[len(operatorStack)-1]
+
+				if topOperator == '(' {
+					break
+				}
+
+				if operatorPriority[topOperator] >= operatorPriority[ch] {
+					finalTokens = append(finalTokens, string(topOperator))
+					operatorStack = operatorStack[:len(operatorStack)-1]
+				} else {
+					break
+				}
+			}
+
+			operatorStack = append(operatorStack, ch)
+			isLastTokenOperator = true
+		case '(':
+			operatorStack = append(operatorStack, ch)
+			isLastTokenOperator = true
+		case ')':
+			hasLeftParenthesis := false
+
+			for len(operatorStack) > 0 {
+				topOperator := operatorStack[len(operatorStack)-1]
+				operatorStack = operatorStack[:len(operatorStack)-1]
+
+				if topOperator == '(' {
+					hasLeftParenthesis = true
+					break
+				}
+
+				finalTokens = append(finalTokens, string(topOperator))
+			}
+
+			if !hasLeftParenthesis {
+				log.Warnf(ctx, "[beancount_amount_expression_evaluator.toPostfixExprTokens] cannot parse expression \"%s\", because missing left parenthesis", expr)
+				return nil, errs.ErrInvalidAmountExpression
+			}
+
+			isLastTokenOperator = false
+		default:
+			log.Warnf(ctx, "[beancount_amount_expression_evaluator.toPostfixExprTokens] cannot parse expression \"%s\", because containing unknown token \"%c\"", expr, ch)
+			return nil, errs.ErrInvalidAmountExpression
+		}
+	}
+
+	if currentNumberBuilder.Len() > 0 {
+		finalTokens = append(finalTokens, currentNumberBuilder.String())
+	}
+
+	for len(operatorStack) > 0 {
+		topOperator := operatorStack[len(operatorStack)-1]
+		operatorStack = operatorStack[:len(operatorStack)-1]
+
+		if topOperator == '(' {
+			log.Warnf(ctx, "[beancount_amount_expression_evaluator.toPostfixExprTokens] cannot parse expression \"%s\", because missing right parenthesis", expr)
+			return nil, errs.ErrInvalidAmountExpression
+		}
+
+		finalTokens = append(finalTokens, string(topOperator))
+	}
+
+	return finalTokens, nil
+}
+
+func evaluatePostfixExpr(ctx core.Context, tokens []string) (float64, error) {
+	stack := make([]float64, 0)
+
+	for i := 0; i < len(tokens); i++ {
+		token := tokens[i]
+
+		switch token {
+		case "+", "-", "*", "/": // operators
+			if len(stack) < 2 {
+				log.Warnf(ctx, "[beancount_amount_expression_evaluator.evaluatePostfixExpr] cannot evaluate expression \"%s\", because not enough operands", strings.Join(tokens, " "))
+				return 0, errs.ErrInvalidAmountExpression
+			}
+
+			// pop the top two operands
+			b := stack[len(stack)-1]
+			stack = stack[:len(stack)-1]
+
+			a := stack[len(stack)-1]
+			stack = stack[:len(stack)-1]
+
+			// evaluate the operation
+			var result float64
+			switch token {
+			case "+":
+				result = a + b
+			case "-":
+				result = a - b
+			case "*":
+				result = a * b
+			case "/":
+				if b == 0 {
+					log.Warnf(ctx, "[beancount_amount_expression_evaluator.evaluatePostfixExpr] cannot evaluate expression \"%s\", because division by zero", strings.Join(tokens, " "))
+					return 0, errs.ErrInvalidAmountExpression
+				}
+				result = a / b
+			}
+
+			// push the result back to the stack
+			stack = append(stack, result)
+		default: // operands
+			num, err := strconv.ParseFloat(token, 64)
+
+			if err != nil {
+				log.Warnf(ctx, "[beancount_amount_expression_evaluator.evaluatePostfixExpr] cannot evaluate expression \"%s\", because containing invalid number", strings.Join(tokens, " "))
+				return 0, errs.ErrInvalidAmountExpression
+			}
+
+			stack = append(stack, num)
+		}
+	}
+
+	if len(stack) != 1 {
+		log.Warnf(ctx, "[beancount_amount_expression_evaluator.evaluatePostfixExpr] cannot evaluate expression \"%s\", because missing operator", strings.Join(tokens, " "))
+		return 0, errs.ErrInvalidAmountExpression
+	}
+
+	return stack[0], nil
+}
+
+func evaluateBeancountAmountExpression(ctx core.Context, expr string) (string, error) {
+	if expr == "" {
+		return "", nil
+	}
+
+	postfixExprTokens, err := toPostfixExprTokens(ctx, expr)
+
+	if err != nil {
+		return "", err
+	}
+
+	result, err := evaluatePostfixExpr(ctx, postfixExprTokens)
+
+	if err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("%.2f", result), nil
+}
@@ -0,0 +1,216 @@
+package beancount
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+)
+
+func TestToPostfixExprTokens_ValidExpression(t *testing.T) {
+	context := core.NewNullContext()
+
+	result, err := toPostfixExprTokens(context, "1+2")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"1", "2", "+"}, result)
+
+	result, err = toPostfixExprTokens(context, "3-4")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"3", "4", "-"}, result)
+
+	result, err = toPostfixExprTokens(context, "5*6")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"5", "6", "*"}, result)
+
+	result, err = toPostfixExprTokens(context, "8/2")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"8", "2", "/"}, result)
+
+	result, err = toPostfixExprTokens(context, "1+2*3-(4/2)")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"1", "2", "3", "*", "+", "4", "2", "/", "-"}, result)
+
+	result, err = toPostfixExprTokens(context, "1 + 2 * 3")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"1", "2", "3", "*", "+"}, result)
+
+	result, err = toPostfixExprTokens(context, "-1+2")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"-1", "2", "+"}, result)
+
+	result, err = toPostfixExprTokens(context, "1.5+2.3")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"1.5", "2.3", "+"}, result)
+
+	result, err = toPostfixExprTokens(context, "(1+2)-3")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"1", "2", "+", "3", "-"}, result)
+
+	result, err = toPostfixExprTokens(context, "2*-3-3/-2")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"2", "-3", "*", "3", "-2", "/", "-"}, result)
+
+	result, err = toPostfixExprTokens(context, "-1.2-3.4*(-5.6/7.8*(9.0-1.2))")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"-1.2", "3.4", "-5.6", "7.8", "/", "9.0", "1.2", "-", "*", "*", "-"}, result)
+
+	result, err = toPostfixExprTokens(context, "((((((1+2)*(3+4))))))")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"1", "2", "+", "3", "4", "+", "*"}, result)
+
+	result, err = toPostfixExprTokens(context, "(((())))")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{}, result)
+
+	result, err = toPostfixExprTokens(context, "+-*/")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{"-", "*", "/", "+"}, result)
+
+	result, err = toPostfixExprTokens(context, "")
+	assert.Nil(t, err)
+	assert.Equal(t, []string{}, result)
+}
+
+func TestToPostfixExprTokens_InvalidExpression(t *testing.T) {
+	context := core.NewNullContext()
+
+	_, err := toPostfixExprTokens(context, "1=2")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = toPostfixExprTokens(context, "(1")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = toPostfixExprTokens(context, "2)")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = toPostfixExprTokens(context, "((((1+2)))")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = toPostfixExprTokens(context, ")(")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+}
+
+func TestEvaluatePostfixExpr_ValidExpression(t *testing.T) {
+	context := core.NewNullContext()
+
+	result, err := evaluatePostfixExpr(context, []string{"1", "2", "+"})
+	assert.Nil(t, err)
+	assert.Equal(t, float64(3), result)
+
+	result, err = evaluatePostfixExpr(context, []string{"5", "3", "-"})
+	assert.Nil(t, err)
+	assert.Equal(t, float64(2), result)
+
+	result, err = evaluatePostfixExpr(context, []string{"4", "3", "*"})
+	assert.Nil(t, err)
+	assert.Equal(t, float64(12), result)
+
+	result, err = evaluatePostfixExpr(context, []string{"6", "2", "/"})
+	assert.Nil(t, err)
+	assert.Equal(t, float64(3), result)
+
+	result, err = evaluatePostfixExpr(context, []string{"1", "2", "3", "*", "+", "4", "2", "/", "-"})
+	assert.Nil(t, err)
+	assert.Equal(t, float64(5), result)
+}
+
+func TestEvaluatePostfixExpr_InvalidExpression(t *testing.T) {
+	context := core.NewNullContext()
+
+	_, err := evaluatePostfixExpr(context, []string{"1", "0", "/"})
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluatePostfixExpr(context, []string{"1", "+"})
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluatePostfixExpr(context, []string{"1", "="})
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluatePostfixExpr(context, []string{"1", "("})
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluatePostfixExpr(context, []string{"1", ")"})
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluatePostfixExpr(context, []string{"1", "2", "+", "3"})
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluatePostfixExpr(context, []string{"abc"})
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+}
+
+func TestEvaluateBeancountAmountExpression_ValidExpression(t *testing.T) {
+	context := core.NewNullContext()
+
+	result, err := evaluateBeancountAmountExpression(context, "")
+	assert.Nil(t, err)
+	assert.Equal(t, "", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "1+2")
+	assert.Nil(t, err)
+	assert.Equal(t, "3.00", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "(1+2)*3")
+	assert.Nil(t, err)
+	assert.Equal(t, "9.00", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "-1+2")
+	assert.Nil(t, err)
+	assert.Equal(t, "1.00", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "1.5+2.5")
+	assert.Nil(t, err)
+	assert.Equal(t, "4.00", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "1+2*3-(4/2)")
+	assert.Nil(t, err)
+	assert.Equal(t, "5.00", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "2*-3-3/-2")
+	assert.Nil(t, err)
+	assert.Equal(t, "-4.50", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "-1.2-3.4*(-5.6/7.8*(9.0-1.2))")
+	assert.Nil(t, err)
+	assert.Equal(t, "17.84", result)
+
+	result, err = evaluateBeancountAmountExpression(context, "(((2+3)))*(((((-5+7)))))")
+	assert.Nil(t, err)
+	assert.Equal(t, "10.00", result)
+}
+
+func TestEvaluateBeancountAmountExpression_InvalidExpression(t *testing.T) {
+	context := core.NewNullContext()
+
+	_, err := evaluateBeancountAmountExpression(context, "1++2")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "1^2")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "+-*/")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "a+b")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "1/0")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "1+(2*3")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "1+2*3)")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "1+((((2*3)))")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "1+2(3)")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+
+	_, err = evaluateBeancountAmountExpression(context, "1)*(2")
+	assert.Equal(t, errs.ErrInvalidAmountExpression, err)
+}
@@ -0,0 +1,93 @@
+package beancount
+
+import "strings"
+
+const beancountEquityAccountNameOpeningBalance = "Opening-Balances"
+
+// beancountDirective represents the Beancount directive
+type beancountDirective string
+
+// Beancount directives
+const (
+	beancountDirectiveOpen                  beancountDirective = "open"
+	beancountDirectiveClose                 beancountDirective = "close"
+	beancountDirectiveTransaction           beancountDirective = "txn"
+	beancountDirectiveCompletedTransaction  beancountDirective = "*"
+	beancountDirectiveInCompleteTransaction beancountDirective = "!"
+	beancountDirectivePaddingTransaction    beancountDirective = "P"
+	beancountDirectiveCommodity             beancountDirective = "commodity"
+	beancountDirectivePrice                 beancountDirective = "price"
+	beancountDirectiveNote                  beancountDirective = "note"
+	beancountDirectiveDocument              beancountDirective = "document"
+	beancountDirectiveEvent                 beancountDirective = "event"
+	beancountDirectiveBalance               beancountDirective = "balance"
+	beancountDirectivePad                   beancountDirective = "pad"
+	beancountDirectiveQuery                 beancountDirective = "query"
+	beancountDirectiveCustom                beancountDirective = "custom"
+)
+
+// beancountAccountType represents the Beancount account type
+type beancountAccountType byte
+
+// Beancount account types
+const (
+	beancountUnknownAccountType     beancountAccountType = 0
+	beancountAssetsAccountType      beancountAccountType = 1
+	beancountLiabilitiesAccountType beancountAccountType = 2
+	beancountEquityAccountType      beancountAccountType = 3
+	beancountIncomeAccountType      beancountAccountType = 4
+	beancountExpensesAccountType    beancountAccountType = 5
+)
+
+// beancountData defines the structure of beancount data
+type beancountData struct {
+	Accounts     map[string]*beancountAccount
+	Transactions []*beancountTransactionEntry
+}
+
+// beancountAccount defines the structure of beancount account
+type beancountAccount struct {
+	Name        string
+	AccountType beancountAccountType
+	OpenDate    string
+	CloseDate   string
+}
+
+// beancountTransactionEntry defines the structure of beancount transaction entry
+type beancountTransactionEntry struct {
+	Date      string
+	Directive beancountDirective
+	Payee     string
+	Narration string
+	Postings  []*beancountPosting
+	Tags      []string
+	Links     []string
+	Metadata  map[string]string
+}
+
+// beancountPosting defines the structure of beancount transaction posting
+type beancountPosting struct {
+	Account            string
+	Amount             string
+	OriginalAmount     string
+	Commodity          string
+	TotalCost          string
+	TotalCostCommodity string
+	Price              string
+	PriceCommodity     string
+	Metadata           map[string]string
+}
+
+func (a *beancountAccount) isOpeningBalanceEquityAccount() bool {
+	if a.AccountType != beancountEquityAccountType {
+		return false
+	}
+
+	nameItems := strings.Split(a.Name, string(beancountMetadataKeySuffix))
+
+	if len(nameItems) != 2 {
+		return false
+	}
+
+	return nameItems[1] == beancountEquityAccountNameOpeningBalance
+}
@@ -0,0 +1,655 @@
+package beancount
+
+import (
+	"bytes"
+	"encoding/csv"
+	"io"
+	"strings"
+
+	"golang.org/x/text/encoding/unicode"
+	"golang.org/x/text/transform"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+const beancountDefaultAssetsAccountTypeName = "Assets"
+const beancountDefaultLiabilitiesAccountTypeName = "Liabilities"
+const beancountDefaultEquityAccountTypeName = "Equity"
+const beancountDefaultIncomeAccountTypeName = "Income"
+const beancountDefaultExpenseAccountTypeName = "Expenses"
+
+const beancountOptionAssetsAccountTypeName = "name_assets"
+const beancountOptionLiabilitiesAccountTypeName = "name_liabilities"
+const beancountOptionEquityAccountTypeName = "name_equity"
+const beancountOptionIncomeAccountTypeName = "name_income"
+const beancountOptionExpenseAccountTypeName = "name_expenses"
+
+const beancountCommentPrefix = ';'
+const beancountAccountNameItemsSeparator = ":"
+const beancountMetadataKeySuffix = ':'
+const beancountPricePrefix = '@'
+const beancountLinkPrefix = '^'
+const beancountTagPrefix = '#'
+
+// beancountDataReader defines the structure of Beancount data reader
+type beancountDataReader struct {
+	accountTypeNameMap         map[string]beancountAccountType
+	accountTypeNameReversedMap map[beancountAccountType]string
+	allData                    [][]string
+}
+
+// read returns the imported Beancount data
+// Reference: https://beancount.github.io/docs/beancount_language_syntax.html
+func (r *beancountDataReader) read(ctx core.Context) (*beancountData, error) {
+	if len(r.allData) < 1 {
+		return nil, errs.ErrNotFoundTransactionDataInFile
+	}
+
+	data := &beancountData{
+		Accounts:     make(map[string]*beancountAccount),
+		Transactions: make([]*beancountTransactionEntry, 0),
+	}
+
+	var err error
+	var currentTransactionEntry *beancountTransactionEntry
+	var currentTransactionPosting *beancountPosting
+	var currentTags []string
+
+	for i := 0; i < len(r.allData); i++ {
+		items := r.allData[i]
+
+		if len(items) == 0 || (len(items) == 1 && len(items[0]) == 0) || (len(r.getNotEmptyItemByIndex(items, 0)) > 0 && r.getNotEmptyItemByIndex(items, 0)[0] == beancountCommentPrefix) { // skip empty or comment lines
+			continue
+		}
+
+		if r.getNotEmptyItemsCount(items) < 2 {
+			log.Warnf(ctx, "[beancount_data_reader.read] cannot parse line#%d \"%s\", because not enough items in line", i, strings.Join(items, " "))
+			continue
+		}
+
+		firstItem := items[0]
+
+		if firstItem == "include" { // not support include directive
+			return nil, errs.ErrBeancountFileNotSupportInclude
+		} else if firstItem == "plugin" { // skip plugin directive lines
+			currentTransactionEntry, currentTransactionPosting = r.updateCurrentState(data, currentTransactionEntry, currentTransactionPosting)
+			continue
+		} else if firstItem == "option" {
+			currentTransactionEntry, currentTransactionPosting = r.updateCurrentState(data, currentTransactionEntry, currentTransactionPosting)
+			r.readAndSetOption(ctx, i, items)
+			continue
+		} else if firstItem == "pushtag" {
+			currentTransactionEntry, currentTransactionPosting = r.updateCurrentState(data, currentTransactionEntry, currentTransactionPosting)
+			currentTags = r.readAndSetTags(ctx, i, items, currentTags, true)
+			continue
+		} else if firstItem == "poptag" {
+			currentTransactionEntry, currentTransactionPosting = r.updateCurrentState(data, currentTransactionEntry, currentTransactionPosting)
+			currentTags = r.readAndSetTags(ctx, i, items, currentTags, false)
+			continue
+		}
+
+		if len(firstItem) == 0 { // original line has space prefix, maybe transaction posting or metadata line
+			actualFirstItem := r.getNotEmptyItemByIndex(items, 0)
+
+			if len(actualFirstItem) == 0 { // skip empty lines
+				continue
+			}
+
+			if ('A' <= actualFirstItem[0] && actualFirstItem[0] <= 'Z') || actualFirstItem[0] == '!' { // transaction posting
+				if currentTransactionEntry != nil && currentTransactionPosting != nil {
+					currentTransactionEntry.Postings = append(currentTransactionEntry.Postings, currentTransactionPosting)
+					currentTransactionPosting = nil
+				}
+
+				currentTransactionPosting, err = r.readTransactionPostingLine(ctx, i, items, data, actualFirstItem[0] == '!')
+
+				if err != nil {
+					return nil, err
+				}
+			} else if 'a' <= actualFirstItem[0] && actualFirstItem[0] <= 'z' { // metadata
+				metadata := r.readTransactionMetadataLine(ctx, i, items)
+
+				if metadata == nil {
+					continue
+				}
+
+				metadataKey := metadata[0]
+				metadataValue := metadata[1]
+
+				if currentTransactionPosting != nil {
+					if _, exists := currentTransactionPosting.Metadata[metadataKey]; !exists {
+						currentTransactionPosting.Metadata[metadataKey] = metadataValue
+					}
+				} else if currentTransactionEntry != nil {
+					if _, exists := currentTransactionEntry.Metadata[metadataKey]; !exists {
+						currentTransactionEntry.Metadata[metadataKey] = metadataValue
+					}
+				}
+			} else {
+				log.Warnf(ctx, "[beancount_data_reader.read] cannot parse line#%d \"%s\", because line prefix is invalid", i, strings.Join(items, " "))
+				currentTransactionEntry, currentTransactionPosting = r.updateCurrentState(data, currentTransactionEntry, currentTransactionPosting)
+				continue
+			}
+		} else if _, err := utils.ParseFromLongDateFirstTime(firstItem, 0); err == nil { // original line has date as first item
+			currentTransactionEntry, currentTransactionPosting = r.updateCurrentState(data, currentTransactionEntry, currentTransactionPosting)
+
+			directive := r.getNotEmptyItemByIndex(items, 1)
+
+			if directive == string(beancountDirectiveOpen) ||
+				directive == string(beancountDirectiveClose) {
+				_, err := r.readAccountLine(ctx, i, items, firstItem, beancountDirective(directive), data)
+
+				if err != nil {
+					return nil, err
+				}
+			} else if directive == string(beancountDirectiveTransaction) ||
+				directive == string(beancountDirectiveCompletedTransaction) ||
+				directive == string(beancountDirectiveInCompleteTransaction) ||
+				directive == string(beancountDirectivePaddingTransaction) {
+				currentTransactionEntry = r.readTransactionLine(ctx, i, items, firstItem, beancountDirective(directive), currentTags)
+			} else if directive == string(beancountDirectiveCommodity) ||
+				directive == string(beancountDirectivePrice) ||
+				directive == string(beancountDirectiveNote) ||
+				directive == string(beancountDirectiveDocument) ||
+				directive == string(beancountDirectiveEvent) ||
+				directive == string(beancountDirectiveBalance) ||
+				directive == string(beancountDirectivePad) ||
+				directive == string(beancountDirectiveQuery) ||
+				directive == string(beancountDirectiveCustom) { // skip commodity / price / note / document / event / balance / pad / query / custom lines
+				continue
+			} else {
+				log.Warnf(ctx, "[beancount_data_reader.read] cannot parse line#%d \"%s\", because directive is unknown", i, strings.Join(items, " "))
+				continue
+			}
+		} else { // first item not start with date or space
+			currentTransactionEntry, currentTransactionPosting = r.updateCurrentState(data, currentTransactionEntry, currentTransactionPosting)
+			continue
+		}
+	}
+
+	if currentTransactionEntry != nil {
+		if currentTransactionPosting != nil {
+			currentTransactionEntry.Postings = append(currentTransactionEntry.Postings, currentTransactionPosting)
+			currentTransactionPosting = nil
+		}
+
+		data.Transactions = append(data.Transactions, currentTransactionEntry)
+		currentTransactionEntry = nil
+	}
+
+	return data, nil
+}
+
+func (r *beancountDataReader) updateCurrentState(data *beancountData, currentTransactionEntry *beancountTransactionEntry, currentTransactionPosting *beancountPosting) (*beancountTransactionEntry, *beancountPosting) {
+	if currentTransactionEntry != nil {
+		if currentTransactionPosting != nil {
+			currentTransactionEntry.Postings = append(currentTransactionEntry.Postings, currentTransactionPosting)
+			currentTransactionPosting = nil
+		}
+
+		data.Transactions = append(data.Transactions, currentTransactionEntry)
+		currentTransactionEntry = nil
+		currentTransactionPosting = nil
+	}
+
+	return currentTransactionEntry, currentTransactionPosting
+}
+
+func (r *beancountDataReader) readAndSetOption(ctx core.Context, lineIndex int, items []string) {
+	if r.getNotEmptyItemsCount(items) != 3 {
+		log.Warnf(ctx, "[beancount_data_reader.readAndSetOption] cannot parse account type name option line#%d \"%s\", because items count in line not correct", lineIndex, strings.Join(items, " "))
+		return
+	}
+
+	optionName := r.getNotEmptyItemByIndex(items, 1)
+	optionValue := r.getNotEmptyItemByIndex(items, 2)
+
+	switch optionName {
+	case beancountOptionAssetsAccountTypeName:
+		r.setAccountTypeNameMap(beancountAssetsAccountType, optionValue)
+		break
+	case beancountOptionLiabilitiesAccountTypeName:
+		r.setAccountTypeNameMap(beancountLiabilitiesAccountType, optionValue)
+		break
+	case beancountOptionEquityAccountTypeName:
+		r.setAccountTypeNameMap(beancountEquityAccountType, optionValue)
+		break
+	case beancountOptionIncomeAccountTypeName:
+		r.setAccountTypeNameMap(beancountIncomeAccountType, optionValue)
+		break
+	case beancountOptionExpenseAccountTypeName:
+		r.setAccountTypeNameMap(beancountExpensesAccountType, optionValue)
+		break
+	default:
+		log.Warnf(ctx, "[beancount_data_reader.readAndSetOption] skip option line#%d \"%s\"", lineIndex, strings.Join(items, " "))
+		break
+	}
+}
+
+func (r *beancountDataReader) readAndSetTags(ctx core.Context, lineIndex int, items []string, currentTags []string, pushTag bool) []string {
+	if r.getNotEmptyItemsCount(items) != 2 {
+		log.Warnf(ctx, "[beancount_data_reader.readAndSetTags] cannot parse push/pop tag line#%d \"%s\", because items count in line not correct", lineIndex, strings.Join(items, " "))
+		return currentTags
+	}
+
+	tag := r.getNotEmptyItemByIndex(items, 1)
+
+	if len(tag) < 2 || tag[0] != beancountTagPrefix {
+		log.Warnf(ctx, "[beancount_data_reader.readAndSetTags] cannot parse push/pop tag line#%d \"%s\", because tag is invalid", lineIndex, strings.Join(items, " "))
+		return currentTags
+	}
+
+	tag = tag[1:]
+
+	if pushTag {
+		for i := 0; i < len(currentTags); i++ {
+			if currentTags[i] == tag {
+				return currentTags
+			}
+		}
+
+		return append(currentTags, tag)
+	} else { // pop tag
+		for i := 0; i < len(currentTags); i++ {
+			if currentTags[i] == tag {
+				return append(currentTags[:i], currentTags[i+1:]...)
+			}
+		}
+
+		return currentTags
+	}
+}
+
+func (r *beancountDataReader) setAccountTypeNameMap(accountType beancountAccountType, accountTypeName string) {
+	delete(r.accountTypeNameMap, r.accountTypeNameReversedMap[accountType])
+	r.accountTypeNameMap[accountTypeName] = accountType
+	r.accountTypeNameReversedMap[accountType] = accountTypeName
+}
+
+func (r *beancountDataReader) readAccountLine(ctx core.Context, lineIndex int, items []string, date string, directive beancountDirective, data *beancountData) (*beancountAccount, error) {
+	if r.getNotEmptyItemsCount(items) < 3 {
+		log.Warnf(ctx, "[beancount_data_reader.parseAccount] cannot parse account line#%d \"%s\", because items count in line not correct", lineIndex, strings.Join(items, " "))
+		return nil, nil
+	}
+
+	var err error
+	accountName := r.getNotEmptyItemByIndex(items, 2)
+	account, exists := data.Accounts[accountName]
+
+	if !exists {
+		account, err = r.createAccount(ctx, data, accountName)
+
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if directive == beancountDirectiveOpen {
+		account.OpenDate = date
+		return account, nil
+	} else if directive == beancountDirectiveClose {
+		account.CloseDate = date
+		return account, nil
+	} else {
+		log.Warnf(ctx, "[beancount_data_reader.parseAccount] cannot parse account line#%d \"%s\", because directive is invalid", lineIndex, strings.Join(items, " "))
+		return nil, nil
+	}
+}
+
+func (r *beancountDataReader) createAccount(ctx core.Context, data *beancountData, accountName string) (*beancountAccount, error) {
+	account := &beancountAccount{
+		Name:        accountName,
+		AccountType: beancountUnknownAccountType,
+	}
+
+	accountNameItems := strings.Split(accountName, beancountAccountNameItemsSeparator)
+
+	if len(accountNameItems) > 1 {
+		accountType, exists := r.accountTypeNameMap[accountNameItems[0]]
+
+		if exists {
+			account.AccountType = accountType
+		} else {
+			log.Warnf(ctx, "[beancount_data_reader.createAccount] cannot parse account \"%s\", because account type \"%s\" is invalid", accountName, accountNameItems[0])
+			return nil, errs.ErrInvalidBeancountFile
+		}
+	}
+
+	data.Accounts[accountName] = account
+	return account, nil
+}
+
+func (r *beancountDataReader) readTransactionLine(ctx core.Context, lineIndex int, items []string, date string, directive beancountDirective, tags []string) *beancountTransactionEntry {
+	transactionEntry := &beancountTransactionEntry{
+		Date:      date,
+		Directive: directive,
+		Tags:      make([]string, 0),
+		Links:     make([]string, 0),
+		Metadata:  make(map[string]string),
+	}
+
+	transactionEntry.Tags = append(transactionEntry.Tags, tags...)
+
+	allTags := make(map[string]bool, len(transactionEntry.Tags))
+
+	for _, tag := range transactionEntry.Tags {
+		allTags[tag] = true
+	}
+
+	// YYYY-MM-DD [txn|Flag] [[Payee] Narration] [#tag] [ˆlink]
+	payeeNarrationFirstIndex := 2
+	payeeNarrationLastIndex := len(items) - 1
+
+	// parse remain items
+	for i := payeeNarrationFirstIndex; i < len(items); i++ {
+		item := items[i]
+
+		if len(item) == 0 {
+			continue
+		}
+
+		if item[0] == beancountCommentPrefix { // ; comment
+			if i-1 < payeeNarrationLastIndex {
+				payeeNarrationLastIndex = i - 1
+			}
+
+			break
+		}
+
+		if item[0] == beancountTagPrefix { // [#tag]
+			tagName := item[1:]
+
+			if _, exists := allTags[tagName]; !exists {
+				transactionEntry.Tags = append(transactionEntry.Tags, tagName)
+				allTags[tagName] = true
+			}
+
+			if i-1 < payeeNarrationLastIndex {
+				payeeNarrationLastIndex = i - 1
+			}
+		} else if item[0] == beancountLinkPrefix { // [ˆlink]
+			transactionEntry.Links = append(transactionEntry.Links, item[1:])
+
+			if i-1 < payeeNarrationLastIndex {
+				payeeNarrationLastIndex = i - 1
+			}
+		}
+	}
+
+	if payeeNarrationLastIndex-payeeNarrationFirstIndex >= 1 {
+		transactionEntry.Payee = items[payeeNarrationFirstIndex]
+		transactionEntry.Narration = items[payeeNarrationFirstIndex+1]
+	} else if payeeNarrationLastIndex-payeeNarrationFirstIndex >= 0 {
+		transactionEntry.Narration = items[payeeNarrationFirstIndex]
+	}
+
+	return transactionEntry
+}
+
+func (r *beancountDataReader) readTransactionPostingLine(ctx core.Context, lineIndex int, items []string, data *beancountData, hasFlag bool) (*beancountPosting, error) {
+	// [Flag] Account Amount [{Cost}] [@ Price]
+	accountNameExpectedIndex := 0
+
+	if hasFlag {
+		accountNameExpectedIndex = 1
+	}
+
+	if r.getNotEmptyItemsCount(items) <= accountNameExpectedIndex {
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionPostingLine] cannot parse transaction posting line#%d \"%s\", because items count in line not correct", lineIndex, strings.Join(items, " "))
+		return nil, nil
+	}
+
+	accountName, accountNameActualIndex := r.getNotEmptyItemAndIndexByIndex(items, accountNameExpectedIndex)
+
+	if accountName == "" || accountNameActualIndex < 0 {
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionPostingLine] cannot parse transaction posting line#%d \"%s\", because missing account name", lineIndex, strings.Join(items, " "))
+		return nil, errs.ErrMissingAccountData
+	}
+
+	transactionPositing := &beancountPosting{
+		Account:  accountName,
+		Metadata: make(map[string]string),
+	}
+
+	amountActualLastIndex := -1
+	transactionPositing.OriginalAmount, amountActualLastIndex = r.getOriginalAmountAndLastIndexFromIndex(items, accountNameActualIndex+1)
+
+	if transactionPositing.OriginalAmount == "" || amountActualLastIndex < 0 {
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionPostingLine] cannot parse transaction posting line#%d \"%s\", because missing amount", lineIndex, strings.Join(items, " "))
+		return nil, errs.ErrAmountInvalid
+	}
+
+	finalAmount, err := evaluateBeancountAmountExpression(ctx, transactionPositing.OriginalAmount)
+
+	if err != nil {
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionPostingLine] cannot evaluate amount expression in line#%d \"%s\", because %s", lineIndex, strings.Join(items, " "), err.Error())
+		return nil, errs.ErrAmountInvalid
+	} else {
+		transactionPositing.Amount = finalAmount
+	}
+
+	commodityActualIndex := -1
+	transactionPositing.Commodity, commodityActualIndex = r.getNotEmptyItemAndIndexFromIndex(items, amountActualLastIndex+1)
+
+	if transactionPositing.Commodity == "" || commodityActualIndex < 0 {
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionPostingLine] cannot parse transaction posting line#%d \"%s\", because missing commodity", lineIndex, strings.Join(items, " "))
+		return nil, errs.ErrInvalidBeancountFile
+	}
+
+	if strings.ToUpper(transactionPositing.Commodity) != transactionPositing.Commodity { // The syntax for a currency is a word all in capital letters
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionPostingLine] cannot parse transaction posting line#%d \"%s\", because commodity name is not capital letters", lineIndex, strings.Join(items, " "))
+		return nil, errs.ErrInvalidBeancountFile
+	}
+
+	// parse remain items
+	if commodityActualIndex > 0 {
+		for i := commodityActualIndex + 1; i < len(items); i++ {
+			item := items[i]
+
+			if len(item) == 0 {
+				continue
+			}
+
+			if item[0] == beancountCommentPrefix { // ; comment
+				break
+			}
+
+			if len(item) == 2 && item[0] == beancountPricePrefix && item[1] == beancountPricePrefix { // [@@ TotalCost]
+				totalCost, totalCostActualIndex := r.getNotEmptyItemAndIndexFromIndex(items, i+1)
+
+				if totalCostActualIndex > 0 {
+					transactionPositing.TotalCost = totalCost
+					i = totalCostActualIndex
+
+					totalCostCommodity, totalCostCommodityActualIndex := r.getNotEmptyItemAndIndexFromIndex(items, totalCostActualIndex+1)
+
+					if totalCostCommodityActualIndex > 0 {
+						transactionPositing.TotalCostCommodity = totalCostCommodity
+						i = totalCostCommodityActualIndex
+					}
+				}
+			} else if len(item) == 1 && item[0] == beancountPricePrefix { // [@ Price]
+				price, priceActualIndex := r.getNotEmptyItemAndIndexFromIndex(items, i+1)
+
+				if priceActualIndex > 0 {
+					transactionPositing.Price = price
+					i = priceActualIndex
+
+					priceCommodity, priceCommodityActualIndex := r.getNotEmptyItemAndIndexFromIndex(items, priceActualIndex+1)
+
+					if priceCommodityActualIndex > 0 {
+						transactionPositing.PriceCommodity = priceCommodity
+						i = priceCommodityActualIndex
+					}
+				}
+			}
+		}
+	}
+
+	if transactionPositing.Account != "" {
+		_, exists := data.Accounts[transactionPositing.Account]
+
+		if !exists {
+			_, err := r.createAccount(ctx, data, transactionPositing.Account)
+
+			if err != nil {
+				return nil, err
+			}
+		}
+	}
+
+	return transactionPositing, nil
+}
+
+func (r *beancountDataReader) readTransactionMetadataLine(ctx core.Context, lineIndex int, items []string) []string {
+	key := r.getNotEmptyItemByIndex(items, 0)
+	value := r.getNotEmptyItemByIndex(items, 1)
+
+	if key == "" || value == "" {
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionMetadataLine] cannot parse metadata line#%d \"%s\", because key or value is empty", lineIndex, strings.Join(items, " "))
+		return nil
+	}
+
+	if len(key) == 0 || key[len(key)-1] != beancountMetadataKeySuffix {
+		log.Warnf(ctx, "[beancount_data_reader.readTransactionMetadataLine] cannot parse metadata line#%d \"%s\", because key is invalid correct", lineIndex, strings.Join(items, " "))
+		return nil
+	}
+
+	key = key[:len(key)-1]
+
+	return []string{key, value}
+}
+
+func (r *beancountDataReader) getNotEmptyItemByIndex(items []string, index int) string {
+	item, _ := r.getNotEmptyItemAndIndexByIndex(items, index)
+	return item
+}
+
+func (r *beancountDataReader) getNotEmptyItemAndIndexByIndex(items []string, index int) (string, int) {
+	count := -1
+
+	for i := 0; i < len(items); i++ {
+		item := items[i]
+
+		if len(item) == 0 {
+			continue
+		}
+
+		count++
+
+		if count == index {
+			return items[i], i
+		}
+	}
+
+	return "", -1
+}
+
+func (r *beancountDataReader) getNotEmptyItemAndIndexFromIndex(items []string, startIndex int) (string, int) {
+	for i := startIndex; i < len(items); i++ {
+		item := items[i]
+
+		if len(item) == 0 {
+			continue
+		}
+
+		return item, i
+	}
+
+	return "", -1
+}
+
+func (r *beancountDataReader) getNotEmptyItemsCount(items []string) int {
+	count := 0
+
+	for i := 0; i < len(items); i++ {
+		if len(items[i]) > 0 {
+			count++
+		}
+	}
+
+	return count
+}
+
+func (r *beancountDataReader) getOriginalAmountAndLastIndexFromIndex(items []string, startIndex int) (string, int) {
+	amountBuilder := strings.Builder{}
+	lastIndex := -1
+
+	for i := startIndex; i < len(items); i++ {
+		item := items[i]
+
+		if len(item) == 0 {
+			continue
+		}
+
+		valid := true
+
+		// The Amount in “Postings” can also be an arithmetic expression using ( ) * / - +
+		for j := 0; j < len(item); j++ {
+			if !(item[j] >= '0' && item[j] <= '9') && item[j] != '.' && item[j] != '(' && item[j] != ')' &&
+				item[j] != '*' && item[j] != '/' && item[j] != '-' && item[j] != '+' {
+				valid = false
+				break
+			}
+		}
+
+		if !valid {
+			break
+		}
+
+		if amountBuilder.Len() > 0 {
+			amountBuilder.WriteRune(' ')
+		}
+
+		amountBuilder.WriteString(item)
+		lastIndex = i
+	}
+
+	return amountBuilder.String(), lastIndex
+}
+
+func createNewBeancountDataReader(ctx core.Context, data []byte) (*beancountDataReader, error) {
+	fallback := unicode.UTF8.NewDecoder()
+	reader := transform.NewReader(bytes.NewReader(data), unicode.BOMOverride(fallback))
+	csvReader := csv.NewReader(reader)
+	csvReader.Comma = ' '
+	csvReader.FieldsPerRecord = -1
+
+	allData := make([][]string, 0)
+
+	for {
+		items, err := csvReader.Read()
+
+		if err == io.EOF {
+			break
+		}
+
+		if err != nil {
+			log.Errorf(ctx, "[beancount_data_reader.createNewBeancountDataReader] cannot parse data, because %s", err.Error())
+			return nil, errs.ErrInvalidBeancountFile
+		}
+
+		allData = append(allData, items)
+	}
+
+	return &beancountDataReader{
+		accountTypeNameMap: map[string]beancountAccountType{
+			beancountDefaultAssetsAccountTypeName:      beancountAssetsAccountType,
+			beancountDefaultLiabilitiesAccountTypeName: beancountLiabilitiesAccountType,
+			beancountDefaultEquityAccountTypeName:      beancountEquityAccountType,
+			beancountDefaultIncomeAccountTypeName:      beancountIncomeAccountType,
+			beancountDefaultExpenseAccountTypeName:     beancountExpensesAccountType,
+		},
+		accountTypeNameReversedMap: map[beancountAccountType]string{
+			beancountAssetsAccountType:      beancountDefaultAssetsAccountTypeName,
+			beancountLiabilitiesAccountType: beancountDefaultLiabilitiesAccountTypeName,
+			beancountEquityAccountType:      beancountDefaultEquityAccountTypeName,
+			beancountIncomeAccountType:      beancountDefaultIncomeAccountTypeName,
+			beancountExpensesAccountType:    beancountDefaultExpenseAccountTypeName,
+		},
+		allData: allData,
+	}, nil
+}
@@ -0,0 +1,520 @@
+package beancount
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+)
+
+func TestBeancountDataReaderRead(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"; Test Beancount Data\n"+
+		"option \"name_assets\" \"AssetsAccount\"\n"+
+		"option \"name_liabilities\" \"LiabilitiesAccount\"\n"+
+		"option \"name_equity\" \"EquityAccount\"\n"+
+		"option \"name_income\" \"IncomeAccount\"\n"+
+		"option \"name_expenses\" \"ExpensesAccount\"\n"+
+		"\n"+
+		"2024-01-01 open AssetsAccount:TestAccount\n"+
+		"2024-01-02 open LiabilitiesAccount:TestAccount2\n"+
+		"2024-01-03 open EquityAccount:Opening-Balances\n"+
+		"\n"+
+		"; The following transactions with tag1 and tag2\n"+
+		"pushtag #tag1\n"+
+		"pushtag #tag2\n"+
+		"\n"+
+		"2024-01-05 * \"Payee Name\" \"Foo Bar\" #tag3 #tag4 ^test-link\n"+
+		"  IncomeAccount:TestCategory -123.45 CNY\n"+
+		"  AssetsAccount:TestAccount 123.45 CNY\n"+
+		"; The following transactions with tag2\n"+
+		"poptag #tag1\n"+
+		"2024-01-06 * \"test\n#test2\" #tag5 #tag6 ^test-link2\n"+
+		"  LiabilitiesAccount:TestAccount2 -0.12 USD\n"+
+		"  ExpensesAccount:TestCategory2 0.12 USD\n"+
+		"2024-01-07 close AssetsAccount:TestAccount\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 5, len(actualData.Accounts))
+	assert.Equal(t, "AssetsAccount:TestAccount", actualData.Accounts["AssetsAccount:TestAccount"].Name)
+	assert.Equal(t, beancountAssetsAccountType, actualData.Accounts["AssetsAccount:TestAccount"].AccountType)
+	assert.Equal(t, "2024-01-01", actualData.Accounts["AssetsAccount:TestAccount"].OpenDate)
+	assert.Equal(t, "2024-01-07", actualData.Accounts["AssetsAccount:TestAccount"].CloseDate)
+
+	assert.Equal(t, "LiabilitiesAccount:TestAccount2", actualData.Accounts["LiabilitiesAccount:TestAccount2"].Name)
+	assert.Equal(t, beancountLiabilitiesAccountType, actualData.Accounts["LiabilitiesAccount:TestAccount2"].AccountType)
+	assert.Equal(t, "2024-01-02", actualData.Accounts["LiabilitiesAccount:TestAccount2"].OpenDate)
+
+	assert.Equal(t, 2, len(actualData.Transactions))
+
+	assert.Equal(t, "2024-01-05", actualData.Transactions[0].Date)
+	assert.Equal(t, "Payee Name", actualData.Transactions[0].Payee)
+	assert.Equal(t, "Foo Bar", actualData.Transactions[0].Narration)
+	assert.Equal(t, 2, len(actualData.Transactions[0].Postings))
+	assert.Equal(t, "IncomeAccount:TestCategory", actualData.Transactions[0].Postings[0].Account)
+	assert.Equal(t, "-123.45", actualData.Transactions[0].Postings[0].Amount)
+	assert.Equal(t, "CNY", actualData.Transactions[0].Postings[0].Commodity)
+	assert.Equal(t, "AssetsAccount:TestAccount", actualData.Transactions[0].Postings[1].Account)
+	assert.Equal(t, "123.45", actualData.Transactions[0].Postings[1].Amount)
+	assert.Equal(t, "CNY", actualData.Transactions[0].Postings[1].Commodity)
+
+	assert.Equal(t, 4, len(actualData.Transactions[0].Tags))
+	assert.Equal(t, actualData.Transactions[0].Tags[0], "tag1")
+	assert.Equal(t, actualData.Transactions[0].Tags[1], "tag2")
+	assert.Equal(t, actualData.Transactions[0].Tags[2], "tag3")
+	assert.Equal(t, actualData.Transactions[0].Tags[3], "tag4")
+
+	assert.Equal(t, 1, len(actualData.Transactions[0].Links))
+	assert.Equal(t, actualData.Transactions[0].Links[0], "test-link")
+
+	assert.Equal(t, "2024-01-06", actualData.Transactions[1].Date)
+	assert.Equal(t, "", actualData.Transactions[1].Payee)
+	assert.Equal(t, "test\n#test2", actualData.Transactions[1].Narration)
+	assert.Equal(t, 2, len(actualData.Transactions[1].Postings))
+	assert.Equal(t, "LiabilitiesAccount:TestAccount2", actualData.Transactions[1].Postings[0].Account)
+	assert.Equal(t, "-0.12", actualData.Transactions[1].Postings[0].Amount)
+	assert.Equal(t, "USD", actualData.Transactions[1].Postings[0].Commodity)
+	assert.Equal(t, "ExpensesAccount:TestCategory2", actualData.Transactions[1].Postings[1].Account)
+	assert.Equal(t, "0.12", actualData.Transactions[1].Postings[1].Amount)
+	assert.Equal(t, "USD", actualData.Transactions[1].Postings[1].Commodity)
+
+	assert.Equal(t, 3, len(actualData.Transactions[1].Tags))
+	assert.Equal(t, actualData.Transactions[1].Tags[0], "tag2")
+	assert.Equal(t, actualData.Transactions[1].Tags[1], "tag5")
+	assert.Equal(t, actualData.Transactions[1].Tags[2], "tag6")
+
+	assert.Equal(t, 1, len(actualData.Transactions[1].Links))
+	assert.Equal(t, actualData.Transactions[1].Links[0], "test-link2")
+}
+
+func TestBeancountDataReaderRead_EmptyContent(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+}
+
+func TestBeancountDataReaderRead_UnsupportedInclude(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte("include \"other.beancount\""))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrBeancountFileNotSupportInclude.Message)
+}
+
+func TestBeancountDataReaderRead_SkipUnsupportedDirective(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"plugin \"beancount.plugins.plugin_name\"\n"+
+		"unknown directive\n"+
+		"2024-01-01 commodity USD\n"+
+		"2024-01-01 price USD 1.08 CAD\n"+
+		"2024-01-01 note Assets:Test \"some text\"\n"+
+		"2024-01-01 document Assets:Test \"scheme://path\"\n"+
+		"2024-01-01 event \"location\" \"address\"\n"+
+		"2024-01-01 balance Assets:Test 100.00 USD\n"+
+		"2024-01-01 pad Assets:Test Equity:Opening-Balances\n"+
+		"2024-01-01 query \"Name\" \"\nSELECT FIELDS FROM TABLE\"\n"+
+		"2024-01-01 custom \"Type\" \"Value\"\n"+
+		"2024-01-01 unknown directive\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.Nil(t, err)
+}
+
+func TestBeancountDataReaderReadAndSetOption_AccountTypeName(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"option \"name_assets\" \"A\"\n"+
+		"option \"name_liabilities\" \"L\"\n"+
+		"option \"name_equity\" \"E\"\n"+
+		"\n"+
+		"2024-01-01 open A:TestAccount\n"+
+		"2024-01-02 open L:TestAccount2\n"+
+		"2024-01-03 open E:Opening-Balances\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 3, len(actualData.Accounts))
+
+	assert.Equal(t, "A:TestAccount", actualData.Accounts["A:TestAccount"].Name)
+	assert.Equal(t, beancountAssetsAccountType, actualData.Accounts["A:TestAccount"].AccountType)
+
+	assert.Equal(t, "L:TestAccount2", actualData.Accounts["L:TestAccount2"].Name)
+	assert.Equal(t, beancountLiabilitiesAccountType, actualData.Accounts["L:TestAccount2"].AccountType)
+
+	assert.Equal(t, "E:Opening-Balances", actualData.Accounts["E:Opening-Balances"].Name)
+	assert.Equal(t, beancountEquityAccountType, actualData.Accounts["E:Opening-Balances"].AccountType)
+	assert.True(t, actualData.Accounts["E:Opening-Balances"].isOpeningBalanceEquityAccount())
+}
+
+func TestBeancountDataReaderReadAndSetOption_InvalidLineOrUnsupportedOption(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"option \"test\" \"Test\" \"Test2\"\n"+
+		"option \"test\" \"Test\"\n"+
+		"option \"test\"\n"+
+		"option \n"+
+		"option\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.Nil(t, err)
+}
+
+func TestBeancountDataReaderReadAndSetTags(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"pushtag #tag1\n"+
+		"pushtag #tag2\n"+
+		"pushtag #tag2\n"+
+		"pushtag #tag1\n"+
+		"\n"+
+		"2024-01-01 * #tag3 #tag4\n"+
+		"poptag #tag1\n"+
+		"poptag #tag2\n"+
+		"pushtag\n"+
+		"pushtag    \n"+
+		"pushtag tag\n"+
+		"2024-01-02 * #tag5 #tag6\n"+
+		"poptag #tag1\n"+
+		"poptag #tag2\n"+
+		"poptag\n"+
+		"poptag \n"+
+		"2024-01-03 * #tag5 #tag6\n"+
+		"pushtag #tag3\n"+
+		"pushtag #tag6\n"+
+		"2024-01-04 * #tag5 #tag6\n"+
+		"2024-01-05 * #tag5 #tag6 #tag6 #tag5\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 5, len(actualData.Transactions))
+
+	assert.Equal(t, 4, len(actualData.Transactions[0].Tags))
+	assert.Equal(t, actualData.Transactions[0].Tags[0], "tag1")
+	assert.Equal(t, actualData.Transactions[0].Tags[1], "tag2")
+	assert.Equal(t, actualData.Transactions[0].Tags[2], "tag3")
+	assert.Equal(t, actualData.Transactions[0].Tags[3], "tag4")
+
+	assert.Equal(t, 2, len(actualData.Transactions[1].Tags))
+	assert.Equal(t, actualData.Transactions[1].Tags[0], "tag5")
+	assert.Equal(t, actualData.Transactions[1].Tags[1], "tag6")
+
+	assert.Equal(t, 2, len(actualData.Transactions[2].Tags))
+	assert.Equal(t, actualData.Transactions[2].Tags[0], "tag5")
+	assert.Equal(t, actualData.Transactions[2].Tags[1], "tag6")
+
+	assert.Equal(t, 3, len(actualData.Transactions[3].Tags))
+	assert.Equal(t, actualData.Transactions[3].Tags[0], "tag3")
+	assert.Equal(t, actualData.Transactions[3].Tags[1], "tag6")
+	assert.Equal(t, actualData.Transactions[3].Tags[2], "tag5")
+
+	assert.Equal(t, 3, len(actualData.Transactions[4].Tags))
+	assert.Equal(t, actualData.Transactions[4].Tags[0], "tag3")
+	assert.Equal(t, actualData.Transactions[4].Tags[1], "tag6")
+	assert.Equal(t, actualData.Transactions[4].Tags[2], "tag5")
+}
+
+func TestBeancountDataReaderReadAccountLine_InvalidLine(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 open\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+	assert.Equal(t, 0, len(actualData.Accounts))
+}
+
+func TestBeancountDataReaderReadAccountLine_InvalidAccountType(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 open Test:TestAccount\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+
+	reader, err = createNewBeancountDataReader(context, []byte(""+
+		"option \"name_assets\" \"A\"\n"+
+		"\n"+
+		"2024-01-01 open Assets:TestAccount\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+}
+
+func TestBeancountDataReaderReadTransactionLine(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"2024-01-02 * \"test\ttest2\ntest3\" ; some comment\n"+
+		"2024-01-03 ! \"test\" \"test2\"\n"+
+		"2024-01-04 P \"test\" #tag #tag2 ; some comment\n"+
+		"2024-01-05 txn \"test\" ^scheme://path/to/test/link ; some comment\n"+
+		"2024-01-06 txn ; \"test\" \"test2\" #tag ^link\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 6, len(actualData.Transactions))
+
+	assert.Equal(t, "2024-01-01", actualData.Transactions[0].Date)
+	assert.Equal(t, beancountDirectiveCompletedTransaction, actualData.Transactions[0].Directive)
+	assert.Equal(t, "", actualData.Transactions[0].Payee)
+	assert.Equal(t, "", actualData.Transactions[0].Narration)
+
+	assert.Equal(t, "2024-01-02", actualData.Transactions[1].Date)
+	assert.Equal(t, beancountDirectiveCompletedTransaction, actualData.Transactions[1].Directive)
+	assert.Equal(t, "", actualData.Transactions[1].Payee)
+	assert.Equal(t, "test\ttest2\ntest3", actualData.Transactions[1].Narration)
+
+	assert.Equal(t, "2024-01-03", actualData.Transactions[2].Date)
+	assert.Equal(t, beancountDirectiveInCompleteTransaction, actualData.Transactions[2].Directive)
+	assert.Equal(t, "test", actualData.Transactions[2].Payee)
+	assert.Equal(t, "test2", actualData.Transactions[2].Narration)
+
+	assert.Equal(t, "2024-01-04", actualData.Transactions[3].Date)
+	assert.Equal(t, beancountDirectivePaddingTransaction, actualData.Transactions[3].Directive)
+	assert.Equal(t, "", actualData.Transactions[3].Payee)
+	assert.Equal(t, "test", actualData.Transactions[3].Narration)
+
+	assert.Equal(t, 2, len(actualData.Transactions[3].Tags))
+	assert.Equal(t, actualData.Transactions[3].Tags[0], "tag")
+	assert.Equal(t, actualData.Transactions[3].Tags[1], "tag2")
+
+	assert.Equal(t, "2024-01-05", actualData.Transactions[4].Date)
+	assert.Equal(t, beancountDirectiveTransaction, actualData.Transactions[4].Directive)
+	assert.Equal(t, "", actualData.Transactions[4].Payee)
+	assert.Equal(t, "test", actualData.Transactions[4].Narration)
+
+	assert.Equal(t, 1, len(actualData.Transactions[4].Links))
+	assert.Equal(t, actualData.Transactions[4].Links[0], "scheme://path/to/test/link")
+
+	assert.Equal(t, "2024-01-06", actualData.Transactions[5].Date)
+	assert.Equal(t, beancountDirectiveTransaction, actualData.Transactions[5].Directive)
+	assert.Equal(t, "", actualData.Transactions[5].Payee)
+	assert.Equal(t, "", actualData.Transactions[5].Narration)
+}
+
+func TestBeancountDataReaderReadTransactionPostingLine(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Income:TestCategory -123.45 CNY ; some comment\n"+
+		"  Assets:TestAccount 123.45   CNY\n"+
+		"2024-01-02 *\n"+
+		"  Liabilities:TestAccount2 -0.23 USD ; some comment\n"+
+		"  Expenses:TestCategory2    0.12 USD @@ 0.84 CNY\n"+
+		"  Expenses:TestCategory3    0.11 USD @ 7.12 CNY\n"+
+		"  ! Expenses:TestCategory4  0.00 USD {0.00 CNY}\n"+
+		"  Expenses:TestCategory5 \n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, len(actualData.Transactions))
+
+	assert.Equal(t, "2024-01-01", actualData.Transactions[0].Date)
+	assert.Equal(t, 2, len(actualData.Transactions[0].Postings))
+	assert.Equal(t, "Income:TestCategory", actualData.Transactions[0].Postings[0].Account)
+	assert.Equal(t, "-123.45", actualData.Transactions[0].Postings[0].Amount)
+	assert.Equal(t, "CNY", actualData.Transactions[0].Postings[0].Commodity)
+
+	assert.Equal(t, "Assets:TestAccount", actualData.Transactions[0].Postings[1].Account)
+	assert.Equal(t, "123.45", actualData.Transactions[0].Postings[1].Amount)
+	assert.Equal(t, "CNY", actualData.Transactions[0].Postings[1].Commodity)
+
+	assert.Equal(t, "2024-01-02", actualData.Transactions[1].Date)
+	assert.Equal(t, 4, len(actualData.Transactions[1].Postings))
+
+	assert.Equal(t, "Liabilities:TestAccount2", actualData.Transactions[1].Postings[0].Account)
+	assert.Equal(t, "-0.23", actualData.Transactions[1].Postings[0].Amount)
+	assert.Equal(t, "USD", actualData.Transactions[1].Postings[0].Commodity)
+	assert.Equal(t, "Expenses:TestCategory2", actualData.Transactions[1].Postings[1].Account)
+
+	assert.Equal(t, "0.12", actualData.Transactions[1].Postings[1].Amount)
+	assert.Equal(t, "USD", actualData.Transactions[1].Postings[1].Commodity)
+	assert.Equal(t, "0.84", actualData.Transactions[1].Postings[1].TotalCost)
+	assert.Equal(t, "CNY", actualData.Transactions[1].Postings[1].TotalCostCommodity)
+	assert.Equal(t, "Expenses:TestCategory3", actualData.Transactions[1].Postings[2].Account)
+
+	assert.Equal(t, "0.11", actualData.Transactions[1].Postings[2].Amount)
+	assert.Equal(t, "USD", actualData.Transactions[1].Postings[2].Commodity)
+	assert.Equal(t, "7.12", actualData.Transactions[1].Postings[2].Price)
+	assert.Equal(t, "CNY", actualData.Transactions[1].Postings[2].PriceCommodity)
+
+	assert.Equal(t, "0.00", actualData.Transactions[1].Postings[3].Amount)
+	assert.Equal(t, "USD", actualData.Transactions[1].Postings[3].Commodity)
+}
+
+func TestBeancountDataReaderReadTransactionPostingLine_AmountExpression(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Income:TestCategory (1.2-3.4) * 5.6 / 7.8 CNY\n"+
+		"  Assets:TestAccount 1.2 * 3.4/-5.6 - 7.8 CNY\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(actualData.Transactions))
+
+	assert.Equal(t, "2024-01-01", actualData.Transactions[0].Date)
+	assert.Equal(t, 2, len(actualData.Transactions[0].Postings))
+	assert.Equal(t, "Income:TestCategory", actualData.Transactions[0].Postings[0].Account)
+	assert.Equal(t, "(1.2-3.4) * 5.6 / 7.8", actualData.Transactions[0].Postings[0].OriginalAmount)
+	assert.Equal(t, "-1.58", actualData.Transactions[0].Postings[0].Amount)
+	assert.Equal(t, "CNY", actualData.Transactions[0].Postings[0].Commodity)
+
+	assert.Equal(t, "Assets:TestAccount", actualData.Transactions[0].Postings[1].Account)
+	assert.Equal(t, "1.2 * 3.4/-5.6 - 7.8", actualData.Transactions[0].Postings[1].OriginalAmount)
+	assert.Equal(t, "-8.53", actualData.Transactions[0].Postings[1].Amount)
+	assert.Equal(t, "CNY", actualData.Transactions[0].Postings[1].Commodity)
+}
+
+func TestBeancountDataReaderReadTransactionPostingLine_InvalidAmountExpression(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Income:TestCategory (1.2-3.4)*5.6/0 CNY\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+
+	reader, err = createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Assets:TestAccount abc CNY\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+}
+
+func TestBeancountDataReaderReadTransactionPostingLine_InvalidAccountType(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Income:TestCategory -123.45 CNY\n"+
+		"  Test:TestAccount 123.45 CNY\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+}
+
+func TestBeancountDataReaderReadTransactionPostingLine_InvalidCommodity(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Income:TestCategory -123.45 cny\n"+
+		"  Assets:TestAccount 123.45 cny\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+}
+
+func TestBeancountDataReaderReadTransactionPostingLine_MissingAmount(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Assets:TestAccount\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(actualData.Transactions))
+	assert.Equal(t, 0, len(actualData.Transactions[0].Postings))
+
+	reader, err = createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Assets:TestAccount \n"))
+	assert.Nil(t, err)
+
+	actualData, err = reader.read(context)
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(actualData.Transactions))
+	assert.Equal(t, 0, len(actualData.Transactions[0].Postings))
+}
+
+func TestBeancountDataReaderReadTransactionPostingLine_MissingCommodity(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Assets:TestAccount 123.45\n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+
+	reader, err = createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  Assets:TestAccount 123.45 \n"))
+	assert.Nil(t, err)
+
+	_, err = reader.read(context)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+}
+
+func TestBeancountDataReaderReadTransactionMetadataLine(t *testing.T) {
+	context := core.NewNullContext()
+	reader, err := createNewBeancountDataReader(context, []byte(""+
+		"2024-01-01 *\n"+
+		"  key: value\n"+
+		"  key2: \"value 2\"\n"+
+		"  key3: \n"+
+		"  key4: \"\"\n"+
+		"  key5 : \"\"\n"+
+		"  key2: \"new value\"\n"+
+		"  Income:TestCategory -123.45 CNY\n"+
+		"  Assets:TestAccount 123.45 CNY\n"+
+		"2024-01-02 *\n"+
+		"  Liabilities:TestAccount2 -0.23 USD\n"+
+		"    key6: value6\n"+
+		"    key7: \"value 7\"\n"+
+		"    key8: \n"+
+		"    key9: \"\"\n"+
+		"    key0 : \"\"\n"+
+		"    key6: \"new value\"\n"+
+		"  Expenses:TestCategory2 0.12 USD\n"))
+	assert.Nil(t, err)
+
+	actualData, err := reader.read(context)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, len(actualData.Transactions))
+
+	assert.Equal(t, "2024-01-01", actualData.Transactions[0].Date)
+	assert.Equal(t, 2, len(actualData.Transactions[0].Postings))
+	assert.Equal(t, 2, len(actualData.Transactions[0].Metadata))
+	assert.Equal(t, "value", actualData.Transactions[0].Metadata["key"])
+	assert.Equal(t, "value 2", actualData.Transactions[0].Metadata["key2"])
+
+	assert.Equal(t, "2024-01-02", actualData.Transactions[1].Date)
+	assert.Equal(t, 2, len(actualData.Transactions[1].Postings))
+	assert.Equal(t, 2, len(actualData.Transactions[1].Postings[0].Metadata))
+	assert.Equal(t, "value6", actualData.Transactions[1].Postings[0].Metadata["key6"])
+	assert.Equal(t, "value 7", actualData.Transactions[1].Postings[0].Metadata["key7"])
+	assert.Equal(t, 0, len(actualData.Transactions[1].Postings[1].Metadata))
+}
@@ -0,0 +1,41 @@
+package beancount
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBeancountAccount_IsOpeningBalanceEquityAccount_True(t *testing.T) {
+	account := beancountAccount{
+		AccountType: beancountEquityAccountType,
+		Name:        "Equity:Opening-Balances",
+	}
+	assert.True(t, account.isOpeningBalanceEquityAccount())
+
+	account = beancountAccount{
+		AccountType: beancountEquityAccountType,
+		Name:        "E:Opening-Balances",
+	}
+	assert.True(t, account.isOpeningBalanceEquityAccount())
+}
+
+func TestBeancountAccount_IsOpeningBalanceEquityAccount_False(t *testing.T) {
+	account := beancountAccount{
+		AccountType: beancountAssetsAccountType,
+		Name:        "Equity:Opening-Balances",
+	}
+	assert.False(t, account.isOpeningBalanceEquityAccount())
+
+	account = beancountAccount{
+		AccountType: beancountEquityAccountType,
+		Name:        "Opening-Balances",
+	}
+	assert.False(t, account.isOpeningBalanceEquityAccount())
+
+	account = beancountAccount{
+		AccountType: beancountEquityAccountType,
+		Name:        "Equity:Other",
+	}
+	assert.False(t, account.isOpeningBalanceEquityAccount())
+}
@@ -0,0 +1,49 @@
+package beancount
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/converters/converter"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+var beancountTransactionTypeNameMapping = map[models.TransactionType]string{
+	models.TRANSACTION_TYPE_MODIFY_BALANCE: utils.IntToString(int(models.TRANSACTION_TYPE_MODIFY_BALANCE)),
+	models.TRANSACTION_TYPE_INCOME:         utils.IntToString(int(models.TRANSACTION_TYPE_INCOME)),
+	models.TRANSACTION_TYPE_EXPENSE:        utils.IntToString(int(models.TRANSACTION_TYPE_EXPENSE)),
+	models.TRANSACTION_TYPE_TRANSFER:       utils.IntToString(int(models.TRANSACTION_TYPE_TRANSFER)),
+}
+
+// beancountTransactionDataImporter defines the structure of Beancount importer for transaction data
+type beancountTransactionDataImporter struct {
+}
+
+// Initialize a beancount transaction data importer singleton instance
+var (
+	BeancountTransactionDataImporter = &beancountTransactionDataImporter{}
+)
+
+// ParseImportedData returns the imported data by parsing the Beancount transaction data
+func (c *beancountTransactionDataImporter) ParseImportedData(ctx core.Context, user *models.User, data []byte, defaultTimezoneOffset int16, accountMap map[string]*models.Account, expenseCategoryMap map[string]map[string]*models.TransactionCategory, incomeCategoryMap map[string]map[string]*models.TransactionCategory, transferCategoryMap map[string]map[string]*models.TransactionCategory, tagMap map[string]*models.TransactionTag) (models.ImportedTransactionSlice, []*models.Account, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionTag, error) {
+	beancountDataReader, err := createNewBeancountDataReader(ctx, data)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	beancountData, err := beancountDataReader.read(ctx)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	transactionDataTable, err := createNewBeancountTransactionDataTable(beancountData)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	dataTableImporter := converter.CreateNewImporterWithTypeNameMapping(beancountTransactionTypeNameMapping, "", "", BEANCOUNT_TRANSACTION_TAG_SEPARATOR)
+
+	return dataTableImporter.ParseImportedData(ctx, user, transactionDataTable, defaultTimezoneOffset, accountMap, expenseCategoryMap, incomeCategoryMap, transferCategoryMap, tagMap)
+}
@@ -0,0 +1,358 @@
+package beancount
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+func TestBeancountTransactionDataFileParseImportedData_MinimumValidData(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, allNewAccounts, allNewSubExpenseCategories, allNewSubIncomeCategories, allNewSubTransferCategories, allNewTags, err := converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 *\n"+
+			"  Equity:Opening-Balances -123.45 CNY\n"+
+			"  Assets:TestAccount 123.45 CNY\n"+
+			"2024-09-02 *\n"+
+			"  Income:TestCategory -0.12 CNY\n"+
+			"  Assets:TestAccount 0.12 CNY\n"+
+			"2024-09-03 *\n"+
+			"  Assets:TestAccount -1.00 CNY\n"+
+			"  Expenses:TestCategory2 1.00 CNY\n"+
+			"2024-09-04 *\n"+
+			"  Assets:TestAccount -0.05 CNY\n"+
+			"  Assets:TestAccount2 0.05 CNY\n"), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+
+	assert.Equal(t, 4, len(allNewTransactions))
+	assert.Equal(t, 2, len(allNewAccounts))
+	assert.Equal(t, 1, len(allNewSubExpenseCategories))
+	assert.Equal(t, 1, len(allNewSubIncomeCategories))
+	assert.Equal(t, 1, len(allNewSubTransferCategories))
+	assert.Equal(t, 0, len(allNewTags))
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_MODIFY_BALANCE, allNewTransactions[0].Type)
+	assert.Equal(t, int64(1725148800), utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime))
+	assert.Equal(t, int64(12345), allNewTransactions[0].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[1].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[1].Type)
+	assert.Equal(t, int64(1725235200), utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime))
+	assert.Equal(t, int64(12), allNewTransactions[1].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[1].OriginalSourceAccountName)
+	assert.Equal(t, "Income:TestCategory", allNewTransactions[1].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[2].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[2].Type)
+	assert.Equal(t, int64(1725321600), utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime))
+	assert.Equal(t, int64(100), allNewTransactions[2].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[2].OriginalSourceAccountName)
+	assert.Equal(t, "Expenses:TestCategory2", allNewTransactions[2].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[3].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[3].Type)
+	assert.Equal(t, int64(1725408000), utils.GetUnixTimeFromTransactionTime(allNewTransactions[3].TransactionTime))
+	assert.Equal(t, int64(5), allNewTransactions[3].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[3].OriginalSourceAccountName)
+	assert.Equal(t, "Assets:TestAccount2", allNewTransactions[3].OriginalDestinationAccountName)
+	assert.Equal(t, "", allNewTransactions[3].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
+	assert.Equal(t, "Assets:TestAccount", allNewAccounts[0].Name)
+	assert.Equal(t, "CNY", allNewAccounts[0].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[1].Uid)
+	assert.Equal(t, "Assets:TestAccount2", allNewAccounts[1].Name)
+	assert.Equal(t, "CNY", allNewAccounts[1].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewSubExpenseCategories[0].Uid)
+	assert.Equal(t, "Expenses:TestCategory2", allNewSubExpenseCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubIncomeCategories[0].Uid)
+	assert.Equal(t, "Income:TestCategory", allNewSubIncomeCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubTransferCategories[0].Uid)
+	assert.Equal(t, "", allNewSubTransferCategories[0].Name)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_MinimumValidData2(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, allNewAccounts, allNewSubExpenseCategories, allNewSubIncomeCategories, allNewSubTransferCategories, allNewTags, err := converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 *\n"+
+			"  Assets:TestAccount 123.45 CNY\n"+
+			"  Equity:Opening-Balances -123.45 CNY\n"+
+			"2024-09-02 *\n"+
+			"  Assets:TestAccount 0.12 CNY\n"+
+			"  Income:TestCategory -0.12 CNY\n"+
+			"2024-09-03 *\n"+
+			"  Expenses:TestCategory2 1.00 CNY\n"+
+			"  Assets:TestAccount -1.00 CNY\n"+
+			"2024-09-04 *\n"+
+			"  Assets:TestAccount2 0.05 CNY\n"+
+			"  Assets:TestAccount -0.05 CNY\n"), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+
+	assert.Equal(t, 4, len(allNewTransactions))
+	assert.Equal(t, 2, len(allNewAccounts))
+	assert.Equal(t, 1, len(allNewSubExpenseCategories))
+	assert.Equal(t, 1, len(allNewSubIncomeCategories))
+	assert.Equal(t, 1, len(allNewSubTransferCategories))
+	assert.Equal(t, 0, len(allNewTags))
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_MODIFY_BALANCE, allNewTransactions[0].Type)
+	assert.Equal(t, int64(1725148800), utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime))
+	assert.Equal(t, int64(12345), allNewTransactions[0].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[1].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[1].Type)
+	assert.Equal(t, int64(1725235200), utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime))
+	assert.Equal(t, int64(12), allNewTransactions[1].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[1].OriginalSourceAccountName)
+	assert.Equal(t, "Income:TestCategory", allNewTransactions[1].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[2].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[2].Type)
+	assert.Equal(t, int64(1725321600), utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime))
+	assert.Equal(t, int64(100), allNewTransactions[2].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[2].OriginalSourceAccountName)
+	assert.Equal(t, "Expenses:TestCategory2", allNewTransactions[2].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[3].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[3].Type)
+	assert.Equal(t, int64(1725408000), utils.GetUnixTimeFromTransactionTime(allNewTransactions[3].TransactionTime))
+	assert.Equal(t, int64(5), allNewTransactions[3].Amount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[3].OriginalSourceAccountName)
+	assert.Equal(t, "Assets:TestAccount2", allNewTransactions[3].OriginalDestinationAccountName)
+	assert.Equal(t, "", allNewTransactions[3].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
+	assert.Equal(t, "Assets:TestAccount", allNewAccounts[0].Name)
+	assert.Equal(t, "CNY", allNewAccounts[0].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[1].Uid)
+	assert.Equal(t, "Assets:TestAccount2", allNewAccounts[1].Name)
+	assert.Equal(t, "CNY", allNewAccounts[1].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewSubExpenseCategories[0].Uid)
+	assert.Equal(t, "Expenses:TestCategory2", allNewSubExpenseCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubIncomeCategories[0].Uid)
+	assert.Equal(t, "Income:TestCategory", allNewSubIncomeCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubTransferCategories[0].Uid)
+	assert.Equal(t, "", allNewSubTransferCategories[0].Name)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_ParseInvalidTime(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		"2024/09/01 *\n"+
+			"  Equity:Opening-Balances -123.45 CNY\n"+
+			"  Assets:TestAccount 123.45 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_ParseValidCurrency(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, allNewAccounts, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 * \"Payee Name\" \"Hello\nWorld\"\n"+
+			"  Assets:TestAccount -0.12 USD\n"+
+			"  Assets:TestAccount2 0.84 CNY\n"), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, 2, len(allNewAccounts))
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, int64(12), allNewTransactions[0].Amount)
+	assert.Equal(t, int64(84), allNewTransactions[0].RelatedAccountAmount)
+	assert.Equal(t, "Assets:TestAccount", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "USD", allNewTransactions[0].OriginalSourceAccountCurrency)
+	assert.Equal(t, "Assets:TestAccount2", allNewTransactions[0].OriginalDestinationAccountName)
+	assert.Equal(t, "CNY", allNewTransactions[0].OriginalDestinationAccountCurrency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
+	assert.Equal(t, "Assets:TestAccount", allNewAccounts[0].Name)
+	assert.Equal(t, "USD", allNewAccounts[0].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[1].Uid)
+	assert.Equal(t, "Assets:TestAccount2", allNewAccounts[1].Name)
+	assert.Equal(t, "CNY", allNewAccounts[1].Currency)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_ParseInvalidAmount(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 *\n"+
+			"  Equity:Opening-Balances -abc CNY\n"+
+			"  Assets:TestAccount abc CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 *\n"+
+			"  Equity:Opening-Balances -1/0 CNY\n"+
+			"  Assets:TestAccount 1/0 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_ParseDescription(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 * \"foo    bar\t#test\n\"\n"+
+			"  Equity:Opening-Balances -123.45 CNY\n"+
+			"  Assets:TestAccount 123.45 CNY\n"+
+			"2024-09-02 * \"Payee Name\" \"Hello\nWorld\"\n"+
+			"  Income:TestCategory -0.12 CNY\n"+
+			"  Assets:TestAccount 0.12 CNY\n"), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, len(allNewTransactions))
+
+	assert.Equal(t, "foo    bar\t#test\n", allNewTransactions[0].Comment)
+	assert.Equal(t, "Hello\nWorld", allNewTransactions[1].Comment)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_InvalidTransaction(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		"2024-09-02 * \"Payee Name\" \"Hello\nWorld\"\n"+
+			"  Assets:TestAccount 0.11 CNY\n"+
+			"  Assets:TestAccount2 0.11 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		"2024-09-02 * \"Payee Name\" \"Hello\nWorld\"\n"+
+			"  Expenses:TestCategory -0.11 CNY\n"+
+			"  Expenses:TestCategory2 0.11 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrThereAreNotSupportedTransactionType.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		"2024-09-02 * \"Payee Name\" \"Hello\nWorld\"\n"+
+			"  Income:TestCategory -0.11 CNY\n"+
+			"  Income:TestCategory2 0.11 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrThereAreNotSupportedTransactionType.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		"2024-09-02 * \"Payee Name\" \"Hello\nWorld\"\n"+
+			"  Equity:TestCategory -0.11 CNY\n"+
+			"  Equity:TestCategory2 0.11 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrThereAreNotSupportedTransactionType.Message)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_NotSupportedToParseSplitTransaction(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		"2024-09-02 * \"Payee Name\" \"Hello\nWorld\"\n"+
+			"  Assets:TestAccount -0.23 CNY\n"+
+			"  Assets:TestAccount2 0.11 CNY\n"+
+			"  Assets:TestAccount3 0.12 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotSupportedSplitTransactions.Message)
+}
+
+func TestBeancountTransactionDataFileParseImportedData_MissingTransactionRequiredData(t *testing.T) {
+	converter := BeancountTransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	// Missing Transaction Time
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		"* \"narration\"\n"+
+			"  Equity:Opening-Balances -123.45 CNY\n"+
+			"  Assets:TestAccount 123.45 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrNotFoundTransactionDataInFile.Message)
+
+	// Missing Account Name
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 * \"narration\"\n"+
+			"  Equity:Opening-Balances -123.45 CNY\n"+
+			"   123.45 CNY\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+
+	// Missing Amount
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 * \"narration\"\n"+
+			"  Equity:Opening-Balances\n"+
+			"  Assets:TestAccount\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+
+	// Missing Commodity
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		"2024-09-01 * \"narration\"\n"+
+			"  Equity:Opening-Balances -123.45\n"+
+			"  Assets:TestAccount 123.45\n"), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrInvalidBeancountFile.Message)
+}
@@ -0,0 +1,248 @@
+package beancount
+
+import (
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+var beancountTransactionSupportedColumns = map[datatable.TransactionDataTableColumn]bool{
+	datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME:         true,
+	datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE:         true,
+	datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY:             true,
+	datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME:             true,
+	datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY:         true,
+	datatable.TRANSACTION_DATA_TABLE_AMOUNT:                   true,
+	datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME:     true,
+	datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY: true,
+	datatable.TRANSACTION_DATA_TABLE_RELATED_AMOUNT:           true,
+	datatable.TRANSACTION_DATA_TABLE_DESCRIPTION:              true,
+}
+
+var BEANCOUNT_TRANSACTION_TAG_SEPARATOR = "#"
+
+// beancountTransactionDataTable defines the structure of Beancount transaction data table
+type beancountTransactionDataTable struct {
+	allData    []*beancountTransactionEntry
+	accountMap map[string]*beancountAccount
+}
+
+// beancountTransactionDataRow defines the structure of Beancount transaction data row
+type beancountTransactionDataRow struct {
+	dataTable  *beancountTransactionDataTable
+	data       *beancountTransactionEntry
+	finalItems map[datatable.TransactionDataTableColumn]string
+}
+
+// beancountTransactionDataRowIterator defines the structure of Beancount transaction data row iterator
+type beancountTransactionDataRowIterator struct {
+	dataTable    *beancountTransactionDataTable
+	currentIndex int
+}
+
+// HasColumn returns whether the transaction data table has specified column
+func (t *beancountTransactionDataTable) HasColumn(column datatable.TransactionDataTableColumn) bool {
+	_, exists := beancountTransactionSupportedColumns[column]
+	return exists
+}
+
+// TransactionRowCount returns the total count of transaction data row
+func (t *beancountTransactionDataTable) TransactionRowCount() int {
+	return len(t.allData)
+}
+
+// TransactionRowIterator returns the iterator of transaction data row
+func (t *beancountTransactionDataTable) TransactionRowIterator() datatable.TransactionDataRowIterator {
+	return &beancountTransactionDataRowIterator{
+		dataTable:    t,
+		currentIndex: -1,
+	}
+}
+
+// IsValid returns whether this row is valid data for importing
+func (r *beancountTransactionDataRow) IsValid() bool {
+	return true
+}
+
+// GetData returns the data in the specified column type
+func (r *beancountTransactionDataRow) GetData(column datatable.TransactionDataTableColumn) string {
+	_, exists := beancountTransactionSupportedColumns[column]
+
+	if exists {
+		return r.finalItems[column]
+	}
+
+	return ""
+}
+
+// HasNext returns whether the iterator does not reach the end
+func (t *beancountTransactionDataRowIterator) HasNext() bool {
+	return t.currentIndex+1 < len(t.dataTable.allData)
+}
+
+// Next returns the next transaction data row
+func (t *beancountTransactionDataRowIterator) Next(ctx core.Context, user *models.User) (daraRow datatable.TransactionDataRow, err error) {
+	if t.currentIndex+1 >= len(t.dataTable.allData) {
+		return nil, nil
+	}
+
+	t.currentIndex++
+
+	data := t.dataTable.allData[t.currentIndex]
+	rowItems, err := t.parseTransaction(ctx, user, data)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &beancountTransactionDataRow{
+		dataTable:  t.dataTable,
+		data:       data,
+		finalItems: rowItems,
+	}, nil
+}
+
+func (t *beancountTransactionDataRowIterator) parseTransaction(ctx core.Context, user *models.User, beancountEntry *beancountTransactionEntry) (map[datatable.TransactionDataTableColumn]string, error) {
+	data := make(map[datatable.TransactionDataTableColumn]string, len(beancountTransactionSupportedColumns))
+
+	if beancountEntry.Date == "" {
+		return nil, errs.ErrMissingTransactionTime
+	}
+
+	// Beancount supports the international ISO 8601 standard format for dates, with dashes or the same ordering with slashes
+	data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME] = strings.ReplaceAll(beancountEntry.Date, "/", "-") + " 00:00:00"
+
+	if len(beancountEntry.Postings) == 2 {
+		splitData1 := beancountEntry.Postings[0]
+		splitData2 := beancountEntry.Postings[1]
+
+		account1 := t.dataTable.accountMap[splitData1.Account]
+		account2 := t.dataTable.accountMap[splitData2.Account]
+
+		if account1 == nil || account2 == nil {
+			return nil, errs.ErrMissingAccountData
+		}
+
+		amount1, err := utils.ParseAmount(splitData1.Amount)
+
+		if err != nil {
+			log.Errorf(ctx, "[beancount_transaction_data_table.parseTransaction] cannot parse amount \"%s\", because %s", splitData1.Amount, err.Error())
+			return nil, errs.ErrAmountInvalid
+		}
+
+		amount2, err := utils.ParseAmount(splitData2.Amount)
+
+		if err != nil {
+			log.Errorf(ctx, "[beancount_transaction_data_table.parseTransaction] cannot parse amount \"%s\", because %s", splitData2.Amount, err.Error())
+			return nil, errs.ErrAmountInvalid
+		}
+
+		if ((account1.AccountType == beancountEquityAccountType || account1.AccountType == beancountIncomeAccountType) && (account2.AccountType == beancountAssetsAccountType || account2.AccountType == beancountLiabilitiesAccountType)) ||
+			((account2.AccountType == beancountEquityAccountType || account2.AccountType == beancountIncomeAccountType) && (account1.AccountType == beancountAssetsAccountType || account1.AccountType == beancountLiabilitiesAccountType)) { // income
+			fromAccount := account1
+			toAccount := account2
+			toCurrency := splitData2.Commodity
+			toAmount := amount2
+
+			if (account2.AccountType == beancountEquityAccountType || account2.AccountType == beancountIncomeAccountType) && (account1.AccountType == beancountAssetsAccountType || account1.AccountType == beancountLiabilitiesAccountType) {
+				fromAccount = account2
+				toAccount = account1
+				toCurrency = splitData1.Commodity
+				toAmount = amount1
+			}
+
+			if fromAccount.isOpeningBalanceEquityAccount() {
+				data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = utils.IntToString(int(models.TRANSACTION_TYPE_MODIFY_BALANCE))
+			} else {
+				data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = utils.IntToString(int(models.TRANSACTION_TYPE_INCOME))
+			}
+
+			data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = fromAccount.Name
+			data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = toAccount.Name
+			data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY] = toCurrency
+			data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = utils.FormatAmount(toAmount)
+		} else if account1.AccountType == beancountExpensesAccountType && (account2.AccountType == beancountAssetsAccountType || account2.AccountType == beancountLiabilitiesAccountType) ||
+			(account2.AccountType == beancountExpensesAccountType && (account1.AccountType == beancountAssetsAccountType || account1.AccountType == beancountLiabilitiesAccountType)) { // expense
+			fromAccount := account1
+			fromCurrency := splitData1.Commodity
+			fromAmount := amount1
+			toAccount := account2
+
+			if account1.AccountType == beancountExpensesAccountType && (account2.AccountType == beancountAssetsAccountType || account2.AccountType == beancountLiabilitiesAccountType) {
+				fromAccount = account2
+				fromCurrency = splitData2.Commodity
+				fromAmount = amount2
+				toAccount = account1
+			}
+
+			data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = utils.IntToString(int(models.TRANSACTION_TYPE_EXPENSE))
+			data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = toAccount.Name
+			data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = fromAccount.Name
+			data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY] = fromCurrency
+			data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = utils.FormatAmount(-fromAmount)
+		} else if (account1.AccountType == beancountAssetsAccountType || account1.AccountType == beancountLiabilitiesAccountType) &&
+			(account2.AccountType == beancountAssetsAccountType || account2.AccountType == beancountLiabilitiesAccountType) {
+			var fromAccount, toAccount *beancountAccount
+			var fromAmount, toAmount int64
+			var fromCurrency, toCurrency string
+
+			if amount1 < 0 {
+				fromAccount = account1
+				fromCurrency = splitData1.Commodity
+				fromAmount = -amount1
+				toAccount = account2
+				toCurrency = splitData2.Commodity
+				toAmount = amount2
+			} else if amount2 < 0 {
+				fromAccount = account2
+				fromCurrency = splitData2.Commodity
+				fromAmount = -amount2
+				toAccount = account1
+				toCurrency = splitData1.Commodity
+				toAmount = amount1
+			} else {
+				log.Errorf(ctx, "[beancount_transaction_data_table.parseTransaction] cannot parse transfer transaction, because unexcepted account amounts \"%d\" and \"%d\"", amount1, amount2)
+				return nil, errs.ErrInvalidBeancountFile
+			}
+
+			data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = utils.IntToString(int(models.TRANSACTION_TYPE_TRANSFER))
+			data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = ""
+			data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = fromAccount.Name
+			data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY] = fromCurrency
+			data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = utils.FormatAmount(fromAmount)
+			data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = toAccount.Name
+			data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY] = toCurrency
+			data[datatable.TRANSACTION_DATA_TABLE_RELATED_AMOUNT] = utils.FormatAmount(toAmount)
+		} else {
+			log.Errorf(ctx, "[beancount_transaction_data_table.parseTransaction] cannot parse transaction, because unexcepted account types \"%d\" and \"%d\"", account1.AccountType, account2.AccountType)
+			return nil, errs.ErrThereAreNotSupportedTransactionType
+		}
+	} else if len(beancountEntry.Postings) <= 1 {
+		log.Errorf(ctx, "[beancount_transaction_data_table.parseTransaction] cannot parse transaction, because postings count is %d", len(beancountEntry.Postings))
+		return nil, errs.ErrInvalidBeancountFile
+	} else {
+		log.Errorf(ctx, "[beancount_transaction_data_table.parseTransaction] cannot parse split transaction, because postings count is %d", len(beancountEntry.Postings))
+		return nil, errs.ErrNotSupportedSplitTransactions
+	}
+
+	data[datatable.TRANSACTION_DATA_TABLE_TAGS] = strings.Join(beancountEntry.Tags, BEANCOUNT_TRANSACTION_TAG_SEPARATOR)
+	data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = beancountEntry.Narration
+
+	return data, nil
+}
+
+func createNewBeancountTransactionDataTable(beancountData *beancountData) (*beancountTransactionDataTable, error) {
+	if beancountData == nil {
+		return nil, errs.ErrNotFoundTransactionDataInFile
+	}
+
+	return &beancountTransactionDataTable{
+		allData:    beancountData.Transactions,
+		accountMap: beancountData.Accounts,
+	}, nil
+}
@@ -0,0 +1,67 @@
+package camt
+
+import "encoding/xml"
+
+type camtCreditDebitIndicator string
+
+const (
+	CAMT_INDICATOR_CREDIT camtCreditDebitIndicator = "CRDT"
+	CAMT_INDICATOR_DEBIT  camtCreditDebitIndicator = "DBIT"
+)
+
+type camt053File struct {
+	XMLName                 xml.Name                     `xml:"Document"`
+	BankToCustomerStatement *camtBankToCustomerStatement `xml:"BkToCstmrStmt"`
+}
+
+type camtBankToCustomerStatement struct {
+	Statements []*camtStatement `xml:"Stmt"`
+}
+
+type camtStatement struct {
+	Account *camtAccount `xml:"Acct"`
+	Entries []*camtEntry `xml:"Ntry"`
+}
+
+type camtAccount struct {
+	IBAN                string `xml:"Id>IBAN"`
+	OtherIdentification string `xml:"Id>Othr>Id"`
+	Currency            string `xml:"Ccy"`
+}
+
+type camtEntry struct {
+	Amount                     *camtAmount              `xml:"Amt"`
+	CreditDebitIndicator       camtCreditDebitIndicator `xml:"CdtDbtInd"`
+	BookingDate                *camtDate                `xml:"BookgDt"`
+	EntryDetails               *camtEntryDetails        `xml:"NtryDtls"`
+	AdditionalEntryInformation string                   `xml:"AddtlNtryInf"`
+}
+
+type camtAmount struct {
+	Value    string `xml:",chardata"`
+	Currency string `xml:"Ccy,attr"`
+}
+
+type camtDate struct {
+	Date     string `xml:"Dt"`
+	DateTime string `xml:"DtTm"`
+}
+
+type camtEntryDetails struct {
+	TransactionDetails []*camtTransactionDetails `xml:"TxDtls"`
+}
+
+type camtTransactionDetails struct {
+	AmountDetails                    *camtAmountDetails         `xml:"AmtDtls"`
+	RemittanceInformation            *camtRemittanceInformation `xml:"RmtInf"`
+	AdditionalTransactionInformation string                     `xml:"AddtlTxInf"`
+}
+
+type camtAmountDetails struct {
+	InstructedAmount  *camtAmount `xml:"InstdAmt>Amt"`
+	TransactionAmount *camtAmount `xml:"TxAmt>Amt"`
+}
+
+type camtRemittanceInformation struct {
+	Unstructured []string `xml:"Ustrd"`
+}
@@ -0,0 +1,43 @@
+package camt
+
+import (
+	"bytes"
+	"encoding/xml"
+
+	"golang.org/x/net/html/charset"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+)
+
+// camt053FileReader defines the structure of camt.053 file reader
+type camt053FileReader struct {
+	xmlDecoder *xml.Decoder
+}
+
+// read returns the imported camt.053 data
+// Reference: https://www.iso20022.org/message-set/1196/download
+func (r *camt053FileReader) read(ctx core.Context) (*camt053File, error) {
+	file := &camt053File{}
+
+	err := r.xmlDecoder.Decode(&file)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return file, nil
+}
+
+func createNewCamt053FileReader(data []byte) (*camt053FileReader, error) {
+	if len(data) > 5 && data[0] == 0x3C && data[1] == 0x3F && data[2] == 0x78 && data[3] == 0x6D && data[4] == 0x6C { // <?xml
+		xmlDecoder := xml.NewDecoder(bytes.NewReader(data))
+		xmlDecoder.CharsetReader = charset.NewReaderLabel
+
+		return &camt053FileReader{
+			xmlDecoder: xmlDecoder,
+		}, nil
+	}
+
+	return nil, errs.ErrInvalidXmlFile
+}
@@ -0,0 +1,314 @@
+package camt
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+var camtTransactionSupportedColumns = map[datatable.TransactionDataTableColumn]bool{
+	datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME:     true,
+	datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE: true,
+	datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE:     true,
+	datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY:         true,
+	datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME:         true,
+	datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY:     true,
+	datatable.TRANSACTION_DATA_TABLE_AMOUNT:               true,
+	datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME: true,
+	datatable.TRANSACTION_DATA_TABLE_DESCRIPTION:          true,
+}
+
+// camtStatementTransactionDataTable defines the structure of camt statement transaction data table
+type camtStatementTransactionDataTable struct {
+	allStatements []*camtStatement
+}
+
+// camtStatementTransactionDataRow defines the structure of camt statement transaction data row
+type camtStatementTransactionDataRow struct {
+	dataTable          *camtStatementTransactionDataTable
+	account            *camtAccount
+	entry              *camtEntry
+	transactionDetails *camtTransactionDetails
+	finalItems         map[datatable.TransactionDataTableColumn]string
+}
+
+// camtStatementTransactionDataRowIterator defines the structure of camt statement transaction data row iterator
+type camtStatementTransactionDataRowIterator struct {
+	dataTable                      *camtStatementTransactionDataTable
+	currentStatementIndex          int
+	currentEntryIndex              int
+	currentTransactionDetailsIndex int
+}
+
+// HasColumn returns whether the transaction data table has specified column
+func (t *camtStatementTransactionDataTable) HasColumn(column datatable.TransactionDataTableColumn) bool {
+	_, exists := camtTransactionSupportedColumns[column]
+	return exists
+}
+
+// TransactionRowCount returns the total count of transaction data row
+func (t *camtStatementTransactionDataTable) TransactionRowCount() int {
+	totalDataRowCount := 0
+
+	for i := 0; i < len(t.allStatements); i++ {
+		statement := t.allStatements[i]
+
+		for j := 0; j < len(statement.Entries); j++ {
+			entry := statement.Entries[j]
+
+			if entry.EntryDetails != nil {
+				totalDataRowCount += len(entry.EntryDetails.TransactionDetails)
+			} else {
+				totalDataRowCount++
+			}
+		}
+	}
+
+	return totalDataRowCount
+}
+
+// TransactionRowIterator returns the iterator of transaction data row
+func (t *camtStatementTransactionDataTable) TransactionRowIterator() datatable.TransactionDataRowIterator {
+	return &camtStatementTransactionDataRowIterator{
+		dataTable:                      t,
+		currentStatementIndex:          0,
+		currentEntryIndex:              0,
+		currentTransactionDetailsIndex: -1,
+	}
+}
+
+// IsValid returns whether this row is valid data for importing
+func (r *camtStatementTransactionDataRow) IsValid() bool {
+	return true
+}
+
+// GetData returns the data in the specified column type
+func (r *camtStatementTransactionDataRow) GetData(column datatable.TransactionDataTableColumn) string {
+	_, exists := camtTransactionSupportedColumns[column]
+
+	if exists {
+		return r.finalItems[column]
+	}
+
+	return ""
+}
+
+// HasNext returns whether the iterator does not reach the end
+func (t *camtStatementTransactionDataRowIterator) HasNext() bool {
+	allStatements := t.dataTable.allStatements
+
+	if t.currentStatementIndex >= len(allStatements) {
+		return false
+	}
+
+	currentStatement := allStatements[t.currentStatementIndex]
+
+	if t.currentEntryIndex+1 < len(currentStatement.Entries) {
+		return true
+	} else if t.currentEntryIndex < len(currentStatement.Entries) {
+		currencyEntry := currentStatement.Entries[t.currentEntryIndex]
+
+		if currencyEntry.EntryDetails != nil {
+			if t.currentTransactionDetailsIndex+1 < len(currencyEntry.EntryDetails.TransactionDetails) {
+				return true
+			}
+		} else {
+			if t.currentTransactionDetailsIndex < 0 {
+				return true
+			}
+		}
+	}
+
+	for i := t.currentStatementIndex + 1; i < len(allStatements); i++ {
+		statement := allStatements[i]
+
+		if len(statement.Entries) < 1 {
+			continue
+		}
+
+		return true
+	}
+
+	return false
+}
+
+// Next returns the next transaction data row
+func (t *camtStatementTransactionDataRowIterator) Next(ctx core.Context, user *models.User) (daraRow datatable.TransactionDataRow, err error) {
+	allStatements := t.dataTable.allStatements
+
+	for i := t.currentStatementIndex; i < len(allStatements); i++ {
+		foundNextRow := false
+		statement := allStatements[i]
+
+		for j := t.currentEntryIndex; j < len(statement.Entries); j++ {
+			if statement.Entries[j].EntryDetails != nil {
+				if t.currentTransactionDetailsIndex+1 < len(statement.Entries[j].EntryDetails.TransactionDetails) {
+					t.currentTransactionDetailsIndex++
+					foundNextRow = true
+					break
+				}
+			} else {
+				if t.currentTransactionDetailsIndex < 0 {
+					t.currentTransactionDetailsIndex++
+					foundNextRow = true
+					break
+				}
+			}
+
+			t.currentEntryIndex++
+			t.currentTransactionDetailsIndex = -1
+		}
+
+		if foundNextRow {
+			break
+		}
+
+		t.currentStatementIndex++
+		t.currentEntryIndex = 0
+		t.currentTransactionDetailsIndex = -1
+	}
+
+	if t.currentStatementIndex >= len(allStatements) {
+		return nil, nil
+	}
+
+	currentStatement := allStatements[t.currentStatementIndex]
+
+	if t.currentEntryIndex >= len(currentStatement.Entries) {
+		return nil, nil
+	}
+
+	account := currentStatement.Account
+	entry := currentStatement.Entries[t.currentEntryIndex]
+	var transactionDetails *camtTransactionDetails
+
+	if entry.EntryDetails != nil {
+		if t.currentTransactionDetailsIndex >= len(entry.EntryDetails.TransactionDetails) {
+			return nil, nil
+		} else {
+			transactionDetails = entry.EntryDetails.TransactionDetails[t.currentTransactionDetailsIndex]
+		}
+	} else {
+		if t.currentTransactionDetailsIndex >= 1 {
+			return nil, nil
+		}
+	}
+
+	rowItems, err := t.parseTransaction(ctx, user, account, entry, transactionDetails)
+
+	if err != nil {
+		log.Errorf(ctx, "[camt_statement_transaction_data_table.Next] cannot parsing transaction in entry#%d-transaction_detail#%d (statement#%d), because %s", t.currentEntryIndex, t.currentTransactionDetailsIndex, t.currentStatementIndex, err.Error())
+		return nil, err
+	}
+
+	return &camtStatementTransactionDataRow{
+		dataTable:          t.dataTable,
+		account:            account,
+		entry:              entry,
+		transactionDetails: transactionDetails,
+		finalItems:         rowItems,
+	}, nil
+}
+
+func (t *camtStatementTransactionDataRowIterator) parseTransaction(ctx core.Context, user *models.User, account *camtAccount, entry *camtEntry, transactionDetails *camtTransactionDetails) (map[datatable.TransactionDataTableColumn]string, error) {
+	data := make(map[datatable.TransactionDataTableColumn]string, len(camtTransactionSupportedColumns))
+
+	if account == nil {
+		return nil, errs.ErrMissingAccountData
+	}
+
+	if entry.BookingDate != nil && entry.BookingDate.DateTime != "" {
+		dateTime, err := utils.ParseFromLongDateTimeWithTimezoneRFC3339Format(entry.BookingDate.DateTime)
+
+		if err != nil {
+			return nil, errs.ErrTransactionTimeInvalid
+		}
+
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME] = utils.FormatUnixTimeToLongDateTime(dateTime.Unix(), dateTime.Location())
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE] = utils.FormatTimezoneOffset(dateTime.Location())
+	} else if entry.BookingDate != nil && entry.BookingDate.Date != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME] = fmt.Sprintf("%s 00:00:00", entry.BookingDate.Date)
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE] = datatable.TRANSACTION_DATA_TABLE_TIMEZONE_NOT_AVAILABLE
+	} else {
+		return nil, errs.ErrMissingTransactionTime
+	}
+
+	if account.IBAN != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = account.IBAN
+	} else if account.OtherIdentification != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = account.OtherIdentification
+	}
+
+	if transactionDetails != nil && transactionDetails.AmountDetails != nil && transactionDetails.AmountDetails.TransactionAmount != nil && transactionDetails.AmountDetails.TransactionAmount.Currency != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY] = transactionDetails.AmountDetails.TransactionAmount.Currency
+	} else if entry.Amount != nil && entry.Amount.Currency != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY] = entry.Amount.Currency
+	} else if account.Currency != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY] = account.Currency
+	} else {
+		return nil, errs.ErrAccountCurrencyInvalid
+	}
+
+	amountValue := ""
+
+	if entry.EntryDetails != nil && len(entry.EntryDetails.TransactionDetails) > 1 && transactionDetails != nil { // when there are multiple transaction details in one entry, only use the amount in the transaction details
+		if transactionDetails.AmountDetails != nil && transactionDetails.AmountDetails.InstructedAmount != nil && transactionDetails.AmountDetails.InstructedAmount.Value != "" {
+			amountValue = transactionDetails.AmountDetails.InstructedAmount.Value
+		} else if transactionDetails.AmountDetails != nil && transactionDetails.AmountDetails.TransactionAmount != nil && transactionDetails.AmountDetails.TransactionAmount.Value != "" {
+			amountValue = transactionDetails.AmountDetails.TransactionAmount.Value
+		} else {
+			return nil, errs.ErrAmountInvalid
+		}
+	} else if entry.Amount != nil && entry.Amount.Value != "" {
+		amountValue = entry.Amount.Value
+	}
+
+	if amountValue == "" {
+		return nil, errs.ErrAmountInvalid
+	}
+
+	amount, err := utils.ParseAmount(amountValue)
+
+	if err != nil {
+		log.Errorf(ctx, "[camt_statement_transaction_data_table.parseTransaction] cannot parsing transaction amount \"%s\", because %s", amountValue, err.Error())
+		return nil, errs.ErrAmountInvalid
+	}
+
+	data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = utils.FormatAmount(amount)
+
+	if entry.CreditDebitIndicator == CAMT_INDICATOR_CREDIT {
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = utils.IntToString(int(models.TRANSACTION_TYPE_INCOME))
+	} else if entry.CreditDebitIndicator == CAMT_INDICATOR_DEBIT {
+		data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = utils.IntToString(int(models.TRANSACTION_TYPE_EXPENSE))
+	} else {
+		return nil, errs.ErrTransactionTypeInvalid
+	}
+
+	if transactionDetails != nil && transactionDetails.AdditionalTransactionInformation != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = transactionDetails.AdditionalTransactionInformation
+	} else if transactionDetails != nil && transactionDetails.RemittanceInformation != nil && len(transactionDetails.RemittanceInformation.Unstructured) > 0 {
+		data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = strings.Join(transactionDetails.RemittanceInformation.Unstructured, "\n")
+	} else if entry.AdditionalEntryInformation != "" {
+		data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = entry.AdditionalEntryInformation
+	} else {
+		data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = ""
+	}
+
+	return data, nil
+}
+
+func createNewCamtStatementTransactionDataTable(file *camt053File) (*camtStatementTransactionDataTable, error) {
+	if file == nil || file.BankToCustomerStatement == nil || len(file.BankToCustomerStatement.Statements) == 0 {
+		return nil, errs.ErrNotFoundTransactionDataInFile
+	}
+
+	return &camtStatementTransactionDataTable{
+		allStatements: file.BankToCustomerStatement.Statements,
+	}, nil
+}
@@ -0,0 +1,48 @@
+package camt
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/converters/converter"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+var camtTransactionTypeNameMapping = map[models.TransactionType]string{
+	models.TRANSACTION_TYPE_INCOME:   utils.IntToString(int(models.TRANSACTION_TYPE_INCOME)),
+	models.TRANSACTION_TYPE_EXPENSE:  utils.IntToString(int(models.TRANSACTION_TYPE_EXPENSE)),
+	models.TRANSACTION_TYPE_TRANSFER: utils.IntToString(int(models.TRANSACTION_TYPE_TRANSFER)),
+}
+
+// camt053TransactionDataImporter defines the structure of camt.053 file importer for transaction data
+type camt053TransactionDataImporter struct {
+}
+
+// Initialize a camt.053 transaction data importer singleton instance
+var (
+	Camt053TransactionDataImporter = &camt053TransactionDataImporter{}
+)
+
+// ParseImportedData returns the imported data by parsing the camt.053 file transaction data
+func (c *camt053TransactionDataImporter) ParseImportedData(ctx core.Context, user *models.User, data []byte, defaultTimezoneOffset int16, accountMap map[string]*models.Account, expenseCategoryMap map[string]map[string]*models.TransactionCategory, incomeCategoryMap map[string]map[string]*models.TransactionCategory, transferCategoryMap map[string]map[string]*models.TransactionCategory, tagMap map[string]*models.TransactionTag) (models.ImportedTransactionSlice, []*models.Account, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionTag, error) {
+	camt053DataReader, err := createNewCamt053FileReader(data)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	camt053Data, err := camt053DataReader.read(ctx)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	transactionDataTable, err := createNewCamtStatementTransactionDataTable(camt053Data)
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	dataTableImporter := converter.CreateNewSimpleImporterWithTypeNameMapping(camtTransactionTypeNameMapping)
+
+	return dataTableImporter.ParseImportedData(ctx, user, transactionDataTable, defaultTimezoneOffset, accountMap, expenseCategoryMap, incomeCategoryMap, transferCategoryMap, tagMap)
+}
@@ -0,0 +1,765 @@
+package camt
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+func TestCamt053TransactionDataFileParseImportedData_MinimumValidData(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, allNewAccounts, allNewSubExpenseCategories, allNewSubIncomeCategories, allNewSubTransferCategories, allNewTags, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T01:23:45+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>DBIT</CdtDbtInd>
+						<Amt Ccy="CNY">0.12</Amt>
+					</Ntry>
+				</Stmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<Othr>
+								<Id>456</Id>
+							</Othr>
+						</Id>
+						<Ccy>USD</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T23:59:59+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="USD">1.23</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+
+	assert.Equal(t, 3, len(allNewTransactions))
+	assert.Equal(t, 2, len(allNewAccounts))
+	assert.Equal(t, 1, len(allNewSubExpenseCategories))
+	assert.Equal(t, 1, len(allNewSubIncomeCategories))
+	assert.Equal(t, 0, len(allNewSubTransferCategories))
+	assert.Equal(t, 0, len(allNewTags))
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[0].Type)
+	assert.Equal(t, int64(1725125025), utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime))
+	assert.Equal(t, int64(12345), allNewTransactions[0].Amount)
+	assert.Equal(t, "123", allNewTransactions[0].OriginalSourceAccountName)
+	assert.Equal(t, "CNY", allNewTransactions[0].OriginalSourceAccountCurrency)
+	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[1].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[1].Type)
+	assert.Equal(t, int64(1725165296), utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime))
+	assert.Equal(t, int64(12), allNewTransactions[1].Amount)
+	assert.Equal(t, "123", allNewTransactions[1].OriginalSourceAccountName)
+	assert.Equal(t, "CNY", allNewTransactions[1].OriginalSourceAccountCurrency)
+	assert.Equal(t, "", allNewTransactions[1].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[2].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[2].Type)
+	assert.Equal(t, int64(1725206399), utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime))
+	assert.Equal(t, int64(123), allNewTransactions[2].Amount)
+	assert.Equal(t, "456", allNewTransactions[2].OriginalSourceAccountName)
+	assert.Equal(t, "USD", allNewTransactions[2].OriginalSourceAccountCurrency)
+	assert.Equal(t, "", allNewTransactions[2].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
+	assert.Equal(t, "123", allNewAccounts[0].Name)
+	assert.Equal(t, "CNY", allNewAccounts[0].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewAccounts[1].Uid)
+	assert.Equal(t, "456", allNewAccounts[1].Name)
+	assert.Equal(t, "USD", allNewAccounts[1].Currency)
+
+	assert.Equal(t, int64(1234567890), allNewSubExpenseCategories[0].Uid)
+	assert.Equal(t, "", allNewSubExpenseCategories[0].Name)
+
+	assert.Equal(t, int64(1234567890), allNewSubIncomeCategories[0].Uid)
+	assert.Equal(t, "", allNewSubIncomeCategories[0].Name)
+}
+
+func TestCamt053TransactionDataFileParseImportedData_ParseValidTransactionTime(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<Dt>2024-09-01</Dt>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-02T03:04:05Z</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 3, len(allNewTransactions))
+
+	assert.Equal(t, int64(1725148800), utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime))
+	assert.Equal(t, int64(1725165296), utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime))
+	assert.Equal(t, int64(1725246245), utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime))
+}
+
+func TestCamt053TransactionDataFileParseImportedData_ParseInvalidTransactionTime(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrTransactionTimeInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024T1</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrTransactionTimeInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01 12:34:56</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrTransactionTimeInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<Dt>2024/09/01</Dt>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrTransactionTimeInvalid.Message)
+}
+
+func TestCamt053TransactionDataFileParseImportedData_ParseTransactionValidAmountAndCurrency(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="USD">123.45</Amt>
+						<NtryDtls>
+							<TxDtls>
+								<AmtDtls>
+									<TxAmt>
+										<Amt Ccy="USD">100.23</Amt>
+									</TxAmt>
+								</AmtDtls>
+							</TxDtls>
+							<TxDtls>
+								<AmtDtls>
+									<TxAmt>
+										<Amt Ccy="USD">23.22</Amt>
+									</TxAmt>
+								</AmtDtls>
+							</TxDtls>
+						</NtryDtls>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 2, len(allNewTransactions))
+	assert.Equal(t, "USD", allNewTransactions[0].OriginalSourceAccountCurrency)
+	assert.Equal(t, int64(2322), allNewTransactions[0].Amount)
+	assert.Equal(t, "USD", allNewTransactions[1].OriginalSourceAccountCurrency)
+	assert.Equal(t, int64(10023), allNewTransactions[1].Amount)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="USD">123.45</Amt>
+						<NtryDtls>
+							<TxDtls>
+								<AmtDtls>
+									<InstdAmt>
+										<Amt Ccy="USD">99.99</Amt>
+									</InstdAmt>
+									<TxAmt>
+										<Amt Ccy="USD">100.23</Amt>
+									</TxAmt>
+								</AmtDtls>
+							</TxDtls>
+							<TxDtls>
+								<AmtDtls>
+									<InstdAmt>
+										<Amt Ccy="USD">23.46</Amt>
+									</InstdAmt>
+									<TxAmt>
+										<Amt Ccy="USD">23.22</Amt>
+									</TxAmt>
+								</AmtDtls>
+							</TxDtls>
+						</NtryDtls>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 2, len(allNewTransactions))
+	assert.Equal(t, "USD", allNewTransactions[0].OriginalSourceAccountCurrency)
+	assert.Equal(t, int64(2346), allNewTransactions[0].Amount)
+	assert.Equal(t, "USD", allNewTransactions[1].OriginalSourceAccountCurrency)
+	assert.Equal(t, int64(9999), allNewTransactions[1].Amount)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="USD">123.45</Amt>
+						<NtryDtls>
+							<TxDtls>
+								<AmtDtls>
+									<TxAmt>
+										<Amt Ccy="USD">123.45</Amt>
+									</TxAmt>
+								</AmtDtls>
+							</TxDtls>
+						</NtryDtls>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "USD", allNewTransactions[0].OriginalSourceAccountCurrency)
+	assert.Equal(t, int64(12345), allNewTransactions[0].Amount)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt>123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "CNY", allNewTransactions[0].OriginalSourceAccountCurrency)
+	assert.Equal(t, int64(12345), allNewTransactions[0].Amount)
+}
+
+func TestCamt053TransactionDataFileParseImportedData_ParseTransactionInvalidAmountAndCurrency(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt>123 45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="USD">123.45</Amt>
+						<NtryDtls>
+							<TxDtls>
+								<AmtDtls>
+								</AmtDtls>
+							</TxDtls>
+							<TxDtls>
+							</TxDtls>
+						</NtryDtls>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="USD">123.45</Amt>
+						<NtryDtls>
+							<TxDtls>
+							</TxDtls>
+							<TxDtls>
+								<AmtDtls>
+								</AmtDtls>
+							</TxDtls>
+						</NtryDtls>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+}
+
+func TestCamt053TransactionDataFileParseImportedData_ParseDescription(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+						<AddtlNtryInf>Test Entry</AddtlNtryInf>
+						<NtryDtls>
+							<TxDtls>
+								<AddtlTxInf>Test Transaction</AddtlTxInf>
+								<RmtInf>
+									<Ustrd>Test Line 1</Ustrd>
+									<Ustrd>Test Line 2</Ustrd>
+								</RmtInf>
+							</TxDtls>
+						</NtryDtls>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "Test Transaction", allNewTransactions[0].Comment)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+						<AddtlNtryInf>Test Entry</AddtlNtryInf>
+						<NtryDtls>
+							<TxDtls>
+								<RmtInf>
+									<Ustrd>Test Line 1</Ustrd>
+									<Ustrd>Test Line 2</Ustrd>
+								</RmtInf>
+							</TxDtls>
+						</NtryDtls>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "Test Line 1\nTest Line 2", allNewTransactions[0].Comment)
+
+	allNewTransactions, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+						<AddtlNtryInf>Test Entry</AddtlNtryInf>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, "Test Entry", allNewTransactions[0].Comment)
+}
+
+func TestCamt053TransactionDataFileParseImportedData_MissingAccountNode(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrMissingAccountData.Message)
+}
+
+func TestCamt053TransactionDataFileParseImportedData_MissingTransactionRequiredNode(t *testing.T) {
+	converter := Camt053TransactionDataImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	_, _, _, _, _, _, err := converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrMissingTransactionTime.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<Amt Ccy="CNY">123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrTransactionTypeInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+						<Ccy>CNY</Ccy>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrAmountInvalid.Message)
+
+	_, _, _, _, _, _, err = converter.ParseImportedData(context, user, []byte(
+		`<?xml version="1.0" encoding="UTF-8"?>
+		<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02">
+			<BkToCstmrStmt>
+				<Stmt>
+					<Acct>
+						<Id>
+							<IBAN>123</IBAN>
+						</Id>
+					</Acct>
+					<Ntry>
+						<BookgDt>
+							<DtTm>2024-09-01T12:34:56+08:00</DtTm>
+						</BookgDt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Amt>123.45</Amt>
+					</Ntry>
+				</Stmt>
+			</BkToCstmrStmt>
+		</Document>`), 0, nil, nil, nil, nil, nil)
+	assert.EqualError(t, err, errs.ErrAccountCurrencyInvalid.Message)
+}
@@ -0,0 +1,166 @@
+package converter
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+)
+
+// DataTableTransactionDataExporter defines the structure of plain text data table exporter for transaction data
+type DataTableTransactionDataExporter struct {
+	transactionTypeMapping  map[models.TransactionType]string
+	geoLocationSeparator    string
+	transactionTagSeparator string
+}
+
+// BuildExportedContent writes the exported transaction data to the data table builder
+func (c *DataTableTransactionDataExporter) BuildExportedContent(ctx core.Context, dataTableBuilder datatable.TransactionDataTableBuilder, uid int64, transactions []*models.Transaction, accountMap map[int64]*models.Account, categoryMap map[int64]*models.TransactionCategory, tagMap map[int64]*models.TransactionTag, allTagIndexes map[int64][]int64) error {
+	for i := 0; i < len(transactions); i++ {
+		transaction := transactions[i]
+
+		if transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_IN {
+			continue
+		}
+
+		dataRowMap := make(map[datatable.TransactionDataTableColumn]string, 15)
+		transactionTimeZone := time.FixedZone("Transaction Timezone", int(transaction.TimezoneUtcOffset)*60)
+
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME] = utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(transaction.TransactionTime), transactionTimeZone)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE] = utils.FormatTimezoneOffset(transactionTimeZone)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = dataTableBuilder.ReplaceDelimiters(c.getDisplayTransactionTypeName(transaction.Type))
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_CATEGORY] = c.getExportedTransactionCategoryName(dataTableBuilder, transaction.CategoryId, categoryMap)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = c.getExportedTransactionSubCategoryName(dataTableBuilder, transaction.CategoryId, categoryMap)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = c.getExportedAccountName(dataTableBuilder, transaction.AccountId, accountMap)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY] = c.getAccountCurrency(dataTableBuilder, transaction.AccountId, accountMap)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = utils.FormatAmount(transaction.Amount)
+
+		if transaction.Type == models.TRANSACTION_DB_TYPE_TRANSFER_OUT {
+			dataRowMap[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = c.getExportedAccountName(dataTableBuilder, transaction.RelatedAccountId, accountMap)
+			dataRowMap[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY] = c.getAccountCurrency(dataTableBuilder, transaction.RelatedAccountId, accountMap)
+			dataRowMap[datatable.TRANSACTION_DATA_TABLE_RELATED_AMOUNT] = utils.FormatAmount(transaction.RelatedAccountAmount)
+		}
+
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_GEOGRAPHIC_LOCATION] = c.getExportedGeographicLocation(transaction)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_TAGS] = c.getExportedTags(dataTableBuilder, transaction.TransactionId, allTagIndexes, tagMap)
+		dataRowMap[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = dataTableBuilder.ReplaceDelimiters(transaction.Comment)
+
+		dataTableBuilder.AppendTransaction(dataRowMap)
+	}
+
+	return nil
+}
+
+func (c *DataTableTransactionDataExporter) getDisplayTransactionTypeName(transactionDbType models.TransactionDbType) string {
+	transactionType, err := transactionDbType.ToTransactionType()
+
+	if err != nil {
+		return ""
+	}
+
+	transactionTypeName, exists := c.transactionTypeMapping[transactionType]
+
+	if !exists {
+		return ""
+	}
+
+	return transactionTypeName
+}
+
+func (c *DataTableTransactionDataExporter) getExportedTransactionCategoryName(dataTableBuilder datatable.TransactionDataTableBuilder, categoryId int64, categoryMap map[int64]*models.TransactionCategory) string {
+	category, exists := categoryMap[categoryId]
+
+	if !exists {
+		return ""
+	}
+
+	if category.ParentCategoryId == models.LevelOneTransactionCategoryParentId {
+		return dataTableBuilder.ReplaceDelimiters(category.Name)
+	}
+
+	parentCategory, exists := categoryMap[category.ParentCategoryId]
+
+	if !exists {
+		return ""
+	}
+
+	return dataTableBuilder.ReplaceDelimiters(parentCategory.Name)
+}
+
+func (c *DataTableTransactionDataExporter) getExportedTransactionSubCategoryName(dataTableBuilder datatable.TransactionDataTableBuilder, categoryId int64, categoryMap map[int64]*models.TransactionCategory) string {
+	category, exists := categoryMap[categoryId]
+
+	if exists {
+		return dataTableBuilder.ReplaceDelimiters(category.Name)
+	} else {
+		return ""
+	}
+}
+
+func (c *DataTableTransactionDataExporter) getExportedAccountName(dataTableBuilder datatable.TransactionDataTableBuilder, accountId int64, accountMap map[int64]*models.Account) string {
+	account, exists := accountMap[accountId]
+
+	if exists {
+		return dataTableBuilder.ReplaceDelimiters(account.Name)
+	} else {
+		return ""
+	}
+}
+
+func (c *DataTableTransactionDataExporter) getAccountCurrency(dataTableBuilder datatable.TransactionDataTableBuilder, accountId int64, accountMap map[int64]*models.Account) string {
+	account, exists := accountMap[accountId]
+
+	if exists {
+		return dataTableBuilder.ReplaceDelimiters(account.Currency)
+	} else {
+		return ""
+	}
+}
+
+func (c *DataTableTransactionDataExporter) getExportedGeographicLocation(transaction *models.Transaction) string {
+	if transaction.GeoLongitude != 0 || transaction.GeoLatitude != 0 {
+		return fmt.Sprintf("%f%s%f", transaction.GeoLongitude, c.geoLocationSeparator, transaction.GeoLatitude)
+	}
+
+	return ""
+}
+
+func (c *DataTableTransactionDataExporter) getExportedTags(dataTableBuilder datatable.TransactionDataTableBuilder, transactionId int64, allTagIndexes map[int64][]int64, tagMap map[int64]*models.TransactionTag) string {
+	tagIndexes, exists := allTagIndexes[transactionId]
+
+	if !exists {
+		return ""
+	}
+
+	var ret strings.Builder
+
+	for i := 0; i < len(tagIndexes); i++ {
+		tagIndex := tagIndexes[i]
+		tag, exists := tagMap[tagIndex]
+
+		if !exists {
+			continue
+		}
+
+		if ret.Len() > 0 {
+			ret.WriteString(c.transactionTagSeparator)
+		}
+
+		ret.WriteString(strings.Replace(tag.Name, c.transactionTagSeparator, " ", -1))
+	}
+
+	return dataTableBuilder.ReplaceDelimiters(ret.String())
+}
+
+// CreateNewExporter returns a new data table transaction data exporter according to the specified arguments
+func CreateNewExporter(transactionTypeMapping map[models.TransactionType]string, geoLocationSeparator string, transactionTagSeparator string) *DataTableTransactionDataExporter {
+	return &DataTableTransactionDataExporter{
+		transactionTypeMapping:  transactionTypeMapping,
+		geoLocationSeparator:    geoLocationSeparator,
+		transactionTagSeparator: transactionTagSeparator,
+	}
+}
@@ -0,0 +1,521 @@
+package converter
+
+import (
+	"sort"
+	"strings"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+	"github.com/mayswind/ezbookkeeping/pkg/utils"
+	"github.com/mayswind/ezbookkeeping/pkg/validators"
+)
+
+type TransactionGeoLocationOrder string
+
+const (
+	TRANSACTION_GEO_LOCATION_ORDER_LONGITUDE_LATITUDE TransactionGeoLocationOrder = "lonlat" // longitude first, then latitude
+	TRANSACTION_GEO_LOCATION_ORDER_LATITUDE_LONGITUDE TransactionGeoLocationOrder = "latlon" // latitude first, then longitude
+)
+
+// DataTableTransactionDataImporter defines the structure of plain text data table importer for transaction data
+type DataTableTransactionDataImporter struct {
+	transactionTypeMapping  map[string]models.TransactionType
+	geoLocationSeparator    string
+	geoLocationOrder        TransactionGeoLocationOrder
+	transactionTagSeparator string
+}
+
+// ParseImportedData returns the imported transaction data
+func (c *DataTableTransactionDataImporter) ParseImportedData(ctx core.Context, user *models.User, dataTable datatable.TransactionDataTable, defaultTimezoneOffset int16, accountMap map[string]*models.Account, expenseCategoryMap map[string]map[string]*models.TransactionCategory, incomeCategoryMap map[string]map[string]*models.TransactionCategory, transferCategoryMap map[string]map[string]*models.TransactionCategory, tagMap map[string]*models.TransactionTag) (models.ImportedTransactionSlice, []*models.Account, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionTag, error) {
+	if dataTable.TransactionRowCount() < 1 {
+		log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse import data for user \"uid:%d\", because data table row count is less 1", user.Uid)
+		return nil, nil, nil, nil, nil, nil, errs.ErrNotFoundTransactionDataInFile
+	}
+
+	nameDbTypeMap, err := c.buildTransactionTypeNameDbTypeMap()
+
+	if err != nil {
+		return nil, nil, nil, nil, nil, nil, err
+	}
+
+	if !dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME) ||
+		!dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE) ||
+		!dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY) ||
+		!dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME) ||
+		!dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_AMOUNT) ||
+		!dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME) {
+		log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse import data for user \"uid:%d\", because missing essential columns in header row", user.Uid)
+		return nil, nil, nil, nil, nil, nil, errs.ErrMissingRequiredFieldInHeaderRow
+	}
+
+	if accountMap == nil {
+		accountMap = make(map[string]*models.Account)
+	}
+
+	if expenseCategoryMap == nil {
+		expenseCategoryMap = make(map[string]map[string]*models.TransactionCategory)
+	}
+
+	if incomeCategoryMap == nil {
+		incomeCategoryMap = make(map[string]map[string]*models.TransactionCategory)
+	}
+
+	if transferCategoryMap == nil {
+		transferCategoryMap = make(map[string]map[string]*models.TransactionCategory)
+	}
+
+	if tagMap == nil {
+		tagMap = make(map[string]*models.TransactionTag)
+	}
+
+	allNewTransactions := make(models.ImportedTransactionSlice, 0, dataTable.TransactionRowCount())
+	allNewAccounts := make([]*models.Account, 0)
+	allNewSubExpenseCategories := make([]*models.TransactionCategory, 0)
+	allNewSubIncomeCategories := make([]*models.TransactionCategory, 0)
+	allNewSubTransferCategories := make([]*models.TransactionCategory, 0)
+	allNewTags := make([]*models.TransactionTag, 0)
+
+	dataRowIterator := dataTable.TransactionRowIterator()
+	dataRowIndex := 0
+
+	for dataRowIterator.HasNext() {
+		dataRowIndex++
+		dataRow, err := dataRowIterator.Next(ctx, user)
+
+		if err != nil {
+			log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse data row \"index:%d\" for user \"uid:%d\", because %s", dataRowIndex, user.Uid, err.Error())
+			return nil, nil, nil, nil, nil, nil, err
+		}
+
+		if !dataRow.IsValid() {
+			continue
+		}
+
+		timezoneOffset := defaultTimezoneOffset
+
+		if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE) &&
+			dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE) != datatable.TRANSACTION_DATA_TABLE_TIMEZONE_NOT_AVAILABLE {
+			transactionTimezone, err := utils.ParseFromTimezoneOffset(dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE))
+
+			if err != nil {
+				log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse time zone \"%s\" in data row \"index:%d\" for user \"uid:%d\", because %s", dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIMEZONE), dataRowIndex, user.Uid, err.Error())
+				return nil, nil, nil, nil, nil, nil, errs.ErrTransactionTimeZoneInvalid
+			}
+
+			timezoneOffset = utils.GetTimezoneOffsetMinutes(transactionTimezone)
+		}
+
+		transactionTime, err := utils.ParseFromLongDateTime(dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME), timezoneOffset)
+
+		if err != nil {
+			log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse time \"%s\" in data row \"index:%d\" for user \"uid:%d\", because %s", dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME), dataRowIndex, user.Uid, err.Error())
+			return nil, nil, nil, nil, nil, nil, errs.ErrTransactionTimeInvalid
+		}
+
+		transactionDbType, err := c.getTransactionDbType(nameDbTypeMap, dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE))
+
+		if err != nil {
+			log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse transaction type \"%s\" in data row \"index:%d\" for user \"uid:%d\", because %s", dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE), dataRowIndex, user.Uid, err.Error())
+			return nil, nil, nil, nil, nil, nil, errs.Or(err, errs.ErrTransactionTypeInvalid)
+		}
+
+		categoryId := int64(0)
+		categoryName := ""
+		subCategoryName := ""
+
+		if transactionDbType != models.TRANSACTION_DB_TYPE_MODIFY_BALANCE {
+			transactionCategoryType, err := c.getTransactionCategoryType(transactionDbType)
+
+			if err != nil {
+				log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse transaction category type in data row \"index:%d\" for user \"uid:%d\", because %s", dataRowIndex, user.Uid, err.Error())
+				return nil, nil, nil, nil, nil, nil, errs.Or(err, errs.ErrTransactionTypeInvalid)
+			}
+
+			categoryName = dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_CATEGORY)
+			subCategoryName = dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY)
+
+			if transactionDbType == models.TRANSACTION_DB_TYPE_EXPENSE {
+				subCategory, exists := c.getTransactionCategory(expenseCategoryMap, categoryName, subCategoryName)
+
+				if !exists {
+					subCategory = c.createNewTransactionCategoryModel(user.Uid, subCategoryName, transactionCategoryType)
+					allNewSubExpenseCategories = append(allNewSubExpenseCategories, subCategory)
+
+					if _, exists = expenseCategoryMap[subCategoryName]; !exists {
+						expenseCategoryMap[subCategoryName] = make(map[string]*models.TransactionCategory)
+					}
+
+					expenseCategoryMap[subCategoryName][categoryName] = subCategory
+				}
+
+				categoryId = subCategory.CategoryId
+			} else if transactionDbType == models.TRANSACTION_DB_TYPE_INCOME {
+				subCategory, exists := c.getTransactionCategory(incomeCategoryMap, categoryName, subCategoryName)
+
+				if !exists {
+					subCategory = c.createNewTransactionCategoryModel(user.Uid, subCategoryName, transactionCategoryType)
+					allNewSubIncomeCategories = append(allNewSubIncomeCategories, subCategory)
+
+					if _, exists = incomeCategoryMap[subCategoryName]; !exists {
+						incomeCategoryMap[subCategoryName] = make(map[string]*models.TransactionCategory)
+					}
+
+					incomeCategoryMap[subCategoryName][categoryName] = subCategory
+				}
+
+				categoryId = subCategory.CategoryId
+			} else if transactionDbType == models.TRANSACTION_DB_TYPE_TRANSFER_OUT {
+				subCategory, exists := c.getTransactionCategory(transferCategoryMap, categoryName, subCategoryName)
+
+				if !exists {
+					subCategory = c.createNewTransactionCategoryModel(user.Uid, subCategoryName, transactionCategoryType)
+					allNewSubTransferCategories = append(allNewSubTransferCategories, subCategory)
+
+					if _, exists = transferCategoryMap[subCategoryName]; !exists {
+						transferCategoryMap[subCategoryName] = make(map[string]*models.TransactionCategory)
+					}
+
+					transferCategoryMap[subCategoryName][categoryName] = subCategory
+				}
+
+				categoryId = subCategory.CategoryId
+			}
+		}
+
+		accountName := dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME)
+		accountCurrency := user.DefaultCurrency
+
+		if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY) && dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY) != "" {
+			accountCurrency = dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY)
+
+			if _, ok := validators.AllCurrencyNames[accountCurrency]; !ok {
+				log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] account currency \"%s\" is not supported in data row \"index:%d\" for user \"uid:%d\"", accountCurrency, dataRowIndex, user.Uid)
+				return nil, nil, nil, nil, nil, nil, errs.ErrAccountCurrencyInvalid
+			}
+		}
+
+		account, exists := accountMap[accountName]
+
+		if !exists {
+			account = c.createNewAccountModel(user.Uid, accountName, accountCurrency)
+			allNewAccounts = append(allNewAccounts, account)
+			accountMap[accountName] = account
+		}
+
+		if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY) && dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY) != "" {
+			if account.Name != "" && account.Currency != accountCurrency {
+				log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] currency \"%s\" in data row \"index:%d\" not equals currency \"%s\" of the account for user \"uid:%d\"", accountCurrency, dataRowIndex, account.Currency, user.Uid)
+				return nil, nil, nil, nil, nil, nil, errs.ErrAccountCurrencyInvalid
+			}
+		} else if exists {
+			accountCurrency = account.Currency
+		}
+
+		amount, err := utils.ParseAmount(dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_AMOUNT))
+
+		if err != nil {
+			log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse acmount \"%s\" in data row \"index:%d\" for user \"uid:%d\", because %s", dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_AMOUNT), dataRowIndex, user.Uid, err.Error())
+			return nil, nil, nil, nil, nil, nil, errs.ErrAmountInvalid
+		}
+
+		relatedAccountId := int64(0)
+		relatedAccountAmount := int64(0)
+		account2Name := ""
+		account2Currency := ""
+
+		if transactionDbType == models.TRANSACTION_DB_TYPE_TRANSFER_OUT {
+			account2Name = dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME)
+			account2Currency = user.DefaultCurrency
+
+			if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY) && dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY) != "" {
+				account2Currency = dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY)
+
+				if _, ok := validators.AllCurrencyNames[account2Currency]; !ok {
+					log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] account2 currency \"%s\" is not supported in data row \"index:%d\" for user \"uid:%d\"", account2Currency, dataRowIndex, user.Uid)
+					return nil, nil, nil, nil, nil, nil, errs.ErrAccountCurrencyInvalid
+				}
+			}
+
+			account2, exists := accountMap[account2Name]
+
+			if !exists {
+				account2 = c.createNewAccountModel(user.Uid, account2Name, account2Currency)
+				allNewAccounts = append(allNewAccounts, account2)
+				accountMap[account2Name] = account2
+			}
+
+			if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY) && dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_CURRENCY) != "" {
+				if account2.Name != "" && account2.Currency != account2Currency {
+					log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] currency \"%s\" in data row \"index:%d\" not equals currency \"%s\" of the account2 for user \"uid:%d\"", account2Currency, dataRowIndex, account2.Currency, user.Uid)
+					return nil, nil, nil, nil, nil, nil, errs.ErrAccountCurrencyInvalid
+				}
+			} else if exists {
+				account2Currency = account2.Currency
+			}
+
+			relatedAccountId = account2.AccountId
+
+			if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_RELATED_AMOUNT) {
+				relatedAccountAmount, err = utils.ParseAmount(dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_RELATED_AMOUNT))
+
+				if err != nil {
+					log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse acmount2 \"%s\" in data row \"index:%d\" for user \"uid:%d\", because %s", dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_RELATED_AMOUNT), dataRowIndex, user.Uid, err.Error())
+					return nil, nil, nil, nil, nil, nil, errs.ErrAmountInvalid
+				}
+			} else if transactionDbType == models.TRANSACTION_DB_TYPE_TRANSFER_OUT {
+				relatedAccountAmount = amount
+			}
+		}
+
+		geoLongitude := float64(0)
+		geoLatitude := float64(0)
+
+		if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_GEOGRAPHIC_LOCATION) && c.geoLocationSeparator != "" {
+			geoLocationItems := strings.Split(dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_GEOGRAPHIC_LOCATION), c.geoLocationSeparator)
+
+			if len(geoLocationItems) == 2 {
+				geoLocationFirstItem, err := utils.StringToFloat64(geoLocationItems[0])
+
+				if err != nil {
+					log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse geographic location \"%s\" in data row \"index:%d\" for user \"uid:%d\", because %s", dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_GEOGRAPHIC_LOCATION), dataRowIndex, user.Uid, err.Error())
+					return nil, nil, nil, nil, nil, nil, errs.ErrGeographicLocationInvalid
+				}
+
+				geoLocationSecondItem, err := utils.StringToFloat64(geoLocationItems[1])
+
+				if err != nil {
+					log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] cannot parse geographic location \"%s\" in data row \"index:%d\" for user \"uid:%d\", because %s", dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_GEOGRAPHIC_LOCATION), dataRowIndex, user.Uid, err.Error())
+					return nil, nil, nil, nil, nil, nil, errs.ErrGeographicLocationInvalid
+				}
+
+				if c.geoLocationOrder == TRANSACTION_GEO_LOCATION_ORDER_LONGITUDE_LATITUDE {
+					geoLongitude = geoLocationFirstItem
+					geoLatitude = geoLocationSecondItem
+				} else if c.geoLocationOrder == TRANSACTION_GEO_LOCATION_ORDER_LATITUDE_LONGITUDE {
+					geoLatitude = geoLocationFirstItem
+					geoLongitude = geoLocationSecondItem
+				}
+			}
+		}
+
+		var tagIds []string
+		var tagNames []string
+
+		if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_TAGS) {
+			var tagNameItems []string
+
+			if c.transactionTagSeparator != "" {
+				tagNameItems = strings.Split(dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TAGS), c.transactionTagSeparator)
+			} else {
+				tagNameItems = append(tagNameItems, dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_TAGS))
+			}
+
+			for i := 0; i < len(tagNameItems); i++ {
+				tagName := tagNameItems[i]
+
+				if tagName == "" {
+					continue
+				}
+
+				tag, exists := tagMap[tagName]
+
+				if !exists {
+					tag = c.createNewTransactionTagModel(user.Uid, tagName)
+					allNewTags = append(allNewTags, tag)
+					tagMap[tagName] = tag
+				}
+
+				if tag != nil {
+					tagIds = append(tagIds, utils.Int64ToString(tag.TagId))
+				}
+
+				tagNames = append(tagNames, tagName)
+			}
+		}
+
+		description := ""
+
+		if dataTable.HasColumn(datatable.TRANSACTION_DATA_TABLE_DESCRIPTION) {
+			description = dataRow.GetData(datatable.TRANSACTION_DATA_TABLE_DESCRIPTION)
+		}
+
+		transaction := &models.ImportTransaction{
+			Transaction: &models.Transaction{
+				Uid:                  user.Uid,
+				Type:                 transactionDbType,
+				CategoryId:           categoryId,
+				TransactionTime:      utils.GetMinTransactionTimeFromUnixTime(transactionTime.Unix()),
+				TimezoneUtcOffset:    timezoneOffset,
+				AccountId:            account.AccountId,
+				Amount:               amount,
+				HideAmount:           false,
+				RelatedAccountId:     relatedAccountId,
+				RelatedAccountAmount: relatedAccountAmount,
+				Comment:              description,
+				GeoLongitude:         geoLongitude,
+				GeoLatitude:          geoLatitude,
+				CreatedIp:            "127.0.0.1",
+			},
+			TagIds:                             tagIds,
+			OriginalCategoryName:               subCategoryName,
+			OriginalSourceAccountName:          accountName,
+			OriginalSourceAccountCurrency:      accountCurrency,
+			OriginalDestinationAccountName:     account2Name,
+			OriginalDestinationAccountCurrency: account2Currency,
+			OriginalTagNames:                   tagNames,
+		}
+
+		allNewTransactions = append(allNewTransactions, transaction)
+	}
+
+	if len(allNewTransactions) < 1 {
+		log.Errorf(ctx, "[data_table_transaction_data_importer.ParseImportedData] no transaction data parsed for \"uid:%d\"", user.Uid)
+		return nil, nil, nil, nil, nil, nil, errs.ErrNotFoundTransactionDataInFile
+	}
+
+	sort.Sort(allNewTransactions)
+
+	return allNewTransactions, allNewAccounts, allNewSubExpenseCategories, allNewSubIncomeCategories, allNewSubTransferCategories, allNewTags, nil
+}
+
+func (c *DataTableTransactionDataImporter) buildTransactionTypeNameDbTypeMap() (map[string]models.TransactionDbType, error) {
+	if c.transactionTypeMapping == nil {
+		return nil, errs.ErrTransactionTypeInvalid
+	}
+
+	nameDbTypeMap := make(map[string]models.TransactionDbType, len(c.transactionTypeMapping))
+
+	for name, transactionType := range c.transactionTypeMapping {
+		if transactionType == models.TRANSACTION_TYPE_MODIFY_BALANCE {
+			nameDbTypeMap[name] = models.TRANSACTION_DB_TYPE_MODIFY_BALANCE
+		} else if transactionType == models.TRANSACTION_TYPE_INCOME {
+			nameDbTypeMap[name] = models.TRANSACTION_DB_TYPE_INCOME
+		} else if transactionType == models.TRANSACTION_TYPE_EXPENSE {
+			nameDbTypeMap[name] = models.TRANSACTION_DB_TYPE_EXPENSE
+		} else if transactionType == models.TRANSACTION_TYPE_TRANSFER {
+			nameDbTypeMap[name] = models.TRANSACTION_DB_TYPE_TRANSFER_OUT
+		} else {
+			return nil, errs.ErrTransactionTypeInvalid
+		}
+	}
+
+	return nameDbTypeMap, nil
+}
+
+func (c *DataTableTransactionDataImporter) getTransactionDbType(nameDbTypeMap map[string]models.TransactionDbType, transactionTypeName string) (models.TransactionDbType, error) {
+	transactionType, exists := nameDbTypeMap[transactionTypeName]
+
+	if !exists {
+		return 0, errs.ErrTransactionTypeInvalid
+	}
+
+	return transactionType, nil
+}
+
+func (c *DataTableTransactionDataImporter) getTransactionCategoryType(transactionType models.TransactionDbType) (models.TransactionCategoryType, error) {
+	if transactionType == models.TRANSACTION_DB_TYPE_INCOME {
+		return models.CATEGORY_TYPE_INCOME, nil
+	} else if transactionType == models.TRANSACTION_DB_TYPE_EXPENSE {
+		return models.CATEGORY_TYPE_EXPENSE, nil
+	} else if transactionType == models.TRANSACTION_DB_TYPE_TRANSFER_OUT {
+		return models.CATEGORY_TYPE_TRANSFER, nil
+	} else {
+		return 0, errs.ErrTransactionTypeInvalid
+	}
+}
+
+func (c *DataTableTransactionDataImporter) getTransactionCategory(categories map[string]map[string]*models.TransactionCategory, categoryName string, subCategoryName string) (*models.TransactionCategory, bool) {
+	if len(categories) < 1 {
+		return nil, false
+	}
+
+	subCategories, exists := categories[subCategoryName]
+
+	if !exists || len(subCategories) < 1 {
+		return nil, false
+	}
+
+	if categoryName == "" {
+		for _, subCategory := range subCategories {
+			if subCategory != nil {
+				return subCategory, true
+			}
+		}
+	}
+
+	subCategory, exists := subCategories[categoryName]
+
+	if !exists {
+		for _, subCategory := range subCategories {
+			if subCategory != nil {
+				return subCategory, true
+			}
+		}
+	}
+
+	return subCategory, exists
+}
+
+func (c *DataTableTransactionDataImporter) createNewAccountModel(uid int64, accountName string, currency string) *models.Account {
+	return &models.Account{
+		Uid:      uid,
+		Name:     accountName,
+		Currency: currency,
+	}
+}
+
+func (c *DataTableTransactionDataImporter) createNewTransactionCategoryModel(uid int64, categoryName string, transactionCategoryType models.TransactionCategoryType) *models.TransactionCategory {
+	return &models.TransactionCategory{
+		Uid:  uid,
+		Name: categoryName,
+		Type: transactionCategoryType,
+	}
+}
+
+func (c *DataTableTransactionDataImporter) createNewTransactionTagModel(uid int64, tagName string) *models.TransactionTag {
+	return &models.TransactionTag{
+		Uid:  uid,
+		Name: tagName,
+	}
+}
+
+// CreateNewImporterWithTypeNameMapping returns a new data table transaction data importer according to the specified arguments
+func CreateNewImporterWithTypeNameMapping(transactionTypeMapping map[models.TransactionType]string, geoLocationSeparator string, geoLocationOrder TransactionGeoLocationOrder, transactionTagSeparator string) *DataTableTransactionDataImporter {
+	return &DataTableTransactionDataImporter{
+		transactionTypeMapping:  buildTransactionNameTypeMap(transactionTypeMapping),
+		geoLocationSeparator:    geoLocationSeparator,
+		geoLocationOrder:        geoLocationOrder,
+		transactionTagSeparator: transactionTagSeparator,
+	}
+}
+
+// CreateNewSimpleImporter returns a new data table transaction data importer according to the specified arguments
+func CreateNewSimpleImporter(transactionTypeMapping map[string]models.TransactionType) *DataTableTransactionDataImporter {
+	return &DataTableTransactionDataImporter{
+		transactionTypeMapping: transactionTypeMapping,
+	}
+}
+
+// CreateNewSimpleImporterWithTypeNameMapping returns a new data table transaction data importer according to the specified arguments
+func CreateNewSimpleImporterWithTypeNameMapping(transactionTypeMapping map[models.TransactionType]string) *DataTableTransactionDataImporter {
+	return &DataTableTransactionDataImporter{
+		transactionTypeMapping: buildTransactionNameTypeMap(transactionTypeMapping),
+	}
+}
+
+func buildTransactionNameTypeMap(transactionTypeMapping map[models.TransactionType]string) map[string]models.TransactionType {
+	if transactionTypeMapping == nil {
+		return nil
+	}
+
+	typeNameMap := make(map[string]models.TransactionType, len(transactionTypeMapping))
+
+	for transactionType, name := range transactionTypeMapping {
+		typeNameMap[name] = transactionType
+	}
+
+	return typeNameMap
+}
@@ -0,0 +1,24 @@
+package converter
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+// TransactionDataExporter defines the structure of transaction data exporter
+type TransactionDataExporter interface {
+	// ToExportedContent returns the exported data
+	ToExportedContent(ctx core.Context, uid int64, transactions []*models.Transaction, accountMap map[int64]*models.Account, categoryMap map[int64]*models.TransactionCategory, tagMap map[int64]*models.TransactionTag, allTagIndexes map[int64][]int64) ([]byte, error)
+}
+
+// TransactionDataImporter defines the structure of transaction data importer
+type TransactionDataImporter interface {
+	// ParseImportedData returns the imported data
+	ParseImportedData(ctx core.Context, user *models.User, data []byte, defaultTimezoneOffset int16, accountMap map[string]*models.Account, expenseCategoryMap map[string]map[string]*models.TransactionCategory, incomeCategoryMap map[string]map[string]*models.TransactionCategory, transferCategoryMap map[string]map[string]*models.TransactionCategory, tagMap map[string]*models.TransactionTag) (models.ImportedTransactionSlice, []*models.Account, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionTag, error)
+}
+
+// TransactionDataConverter defines the structure of transaction data converter
+type TransactionDataConverter interface {
+	TransactionDataExporter
+	TransactionDataImporter
+}
@@ -0,0 +1,155 @@
+package csv
+
+import (
+	"encoding/csv"
+	"fmt"
+	"io"
+
+	"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+)
+
+// CsvFileBasicDataTable defines the structure of csv data table
+type CsvFileBasicDataTable struct {
+	allLines     [][]string
+	hasTitleLine bool
+}
+
+// CsvFileBasicDataTableRow defines the structure of csv data table row
+type CsvFileBasicDataTableRow struct {
+	dataTable *CsvFileBasicDataTable
+	allItems  []string
+}
+
+// CsvFileBasicDataTableRowIterator defines the structure of csv data table row iterator
+type CsvFileBasicDataTableRowIterator struct {
+	dataTable    *CsvFileBasicDataTable
+	currentIndex int
+}
+
+// DataRowCount returns the total count of data row
+func (t *CsvFileBasicDataTable) DataRowCount() int {
+	if len(t.allLines) < 1 {
+		return 0
+	}
+
+	if t.hasTitleLine {
+		return len(t.allLines) - 1
+	} else {
+		return len(t.allLines)
+	}
+}
+
+// HeaderColumnNames returns the header column name list
+func (t *CsvFileBasicDataTable) HeaderColumnNames() []string {
+	if len(t.allLines) < 1 {
+		return nil
+	}
+
+	if t.hasTitleLine {
+		return t.allLines[0]
+	} else {
+		return nil
+	}
+}
+
+// DataRowIterator returns the iterator of data row
+func (t *CsvFileBasicDataTable) DataRowIterator() datatable.BasicDataTableRowIterator {
+	startIndex := -1
+
+	if t.hasTitleLine {
+		startIndex = 0
+	}
+
+	return &CsvFileBasicDataTableRowIterator{
+		dataTable:    t,
+		currentIndex: startIndex,
+	}
+}
+
+// ColumnCount returns the total count of column in this data row
+func (r *CsvFileBasicDataTableRow) ColumnCount() int {
+	return len(r.allItems)
+}
+
+// GetData returns the data in the specified column index
+func (r *CsvFileBasicDataTableRow) GetData(columnIndex int) string {
+	if columnIndex >= len(r.allItems) {
+		return ""
+	}
+
+	return r.allItems[columnIndex]
+}
+
+// HasNext returns whether the iterator does not reach the end
+func (t *CsvFileBasicDataTableRowIterator) HasNext() bool {
+	return t.currentIndex+1 < len(t.dataTable.allLines)
+}
+
+// CurrentRowId returns current index
+func (t *CsvFileBasicDataTableRowIterator) CurrentRowId() string {
+	return fmt.Sprintf("line#%d", t.currentIndex)
+}
+
+// Next returns the next basic data row
+func (t *CsvFileBasicDataTableRowIterator) Next() datatable.BasicDataTableRow {
+	if t.currentIndex+1 >= len(t.dataTable.allLines) {
+		return nil
+	}
+
+	t.currentIndex++
+
+	rowItems := t.dataTable.allLines[t.currentIndex]
+
+	return &CsvFileBasicDataTableRow{
+		dataTable: t.dataTable,
+		allItems:  rowItems,
+	}
+}
+
+// CreateNewCsvBasicDataTable returns comma separated values data table by io readers
+func CreateNewCsvBasicDataTable(ctx core.Context, reader io.Reader, hasTitleLine bool) (datatable.BasicDataTable, error) {
+	return createNewCsvFileBasicDataTable(ctx, reader, ',', hasTitleLine)
+}
+
+// CreateNewCustomCsvBasicDataTable returns character separated values data table by io readers
+func CreateNewCustomCsvBasicDataTable(allLines [][]string, hasTitleLine bool) datatable.BasicDataTable {
+	return &CsvFileBasicDataTable{
+		allLines:     allLines,
+		hasTitleLine: hasTitleLine,
+	}
+}
+
+func createNewCsvFileBasicDataTable(ctx core.Context, reader io.Reader, separator rune, hasTitleLine bool) (*CsvFileBasicDataTable, error) {
+	csvReader := csv.NewReader(reader)
+	csvReader.Comma = separator
+	csvReader.FieldsPerRecord = -1
+
+	allLines := make([][]string, 0)
+
+	for {
+		items, err := csvReader.Read()
+
+		if err == io.EOF {
+			break
+		}
+
+		if err != nil {
+			log.Errorf(ctx, "[csv_file_basic_data_table.createNewCsvFileDataTable] cannot parse csv data, because %s", err.Error())
+			return nil, errs.ErrInvalidCSVFile
+		}
+
+		if len(items) == 1 && items[0] == "" {
+			continue
+		}
+
+		allLines = append(allLines, items)
+	}
+
+	return &CsvFileBasicDataTable{
+		allLines:     allLines,
+		hasTitleLine: hasTitleLine,
+	}, nil
+}
@@ -0,0 +1,250 @@
+package csv
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+)
+
+func TestCsvFileBasicDataTableDataRowCount(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, false)
+
+	assert.Equal(t, 3, datatable.DataRowCount())
+}
+
+func TestCsvFileBasicDataTableDataRowCount_HasTitleLine(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, true)
+
+	assert.Equal(t, 2, datatable.DataRowCount())
+}
+
+func TestCsvFileBasicDataTableDataRowCount_OnlyHeaderLine(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+	}, true)
+
+	assert.Equal(t, 0, datatable.DataRowCount())
+}
+
+func TestCsvFileBasicDataTableDataRowCount_EmptyContent(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{}, false)
+	assert.Equal(t, 0, datatable.DataRowCount())
+
+	datatable = CreateNewCustomCsvBasicDataTable([][]string{}, true)
+	assert.Equal(t, 0, datatable.DataRowCount())
+}
+
+func TestCsvFileBasicDataTableHeaderColumnNames(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, true)
+
+	assert.EqualValues(t, []string{"A1", "B1", "C1"}, datatable.HeaderColumnNames())
+}
+
+func TestCsvFileBasicDataTableHeaderColumnNames_EmptyContent(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{}, false)
+	assert.Nil(t, datatable.HeaderColumnNames())
+
+	datatable = CreateNewCustomCsvBasicDataTable([][]string{}, true)
+	assert.Nil(t, datatable.HeaderColumnNames())
+}
+
+func TestCsvFileBasicDataTableRowIterator(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, false)
+
+	iterator := datatable.DataRowIterator()
+	assert.True(t, iterator.HasNext())
+
+	// data row 1
+	assert.NotNil(t, iterator.Next())
+	assert.True(t, iterator.HasNext())
+
+	// data row 2
+	assert.NotNil(t, iterator.Next())
+	assert.True(t, iterator.HasNext())
+
+	// data row 3
+	assert.NotNil(t, iterator.Next())
+	assert.False(t, iterator.HasNext())
+
+	// not existed data row 4
+	assert.Nil(t, iterator.Next())
+	assert.False(t, iterator.HasNext())
+}
+
+func TestCsvFileBasicDataTableRowIterator_HasTitleLine(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, true)
+
+	iterator := datatable.DataRowIterator()
+	assert.True(t, iterator.HasNext())
+
+	// data row 1
+	assert.NotNil(t, iterator.Next())
+	assert.True(t, iterator.HasNext())
+
+	// data row 2
+	assert.NotNil(t, iterator.Next())
+	assert.False(t, iterator.HasNext())
+
+	// not existed data row 3
+	assert.Nil(t, iterator.Next())
+	assert.False(t, iterator.HasNext())
+
+	// not existed data row 4
+	assert.Nil(t, iterator.Next())
+	assert.False(t, iterator.HasNext())
+}
+
+func TestCsvFileBasicDataTableRowColumnCount(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, true)
+
+	iterator := datatable.DataRowIterator()
+
+	row1 := iterator.Next()
+	assert.EqualValues(t, 3, row1.ColumnCount())
+
+	row2 := iterator.Next()
+	assert.EqualValues(t, 3, row2.ColumnCount())
+}
+
+func TestCsvFileBasicDataTableRowGetData(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, false)
+
+	iterator := datatable.DataRowIterator()
+
+	row1 := iterator.Next()
+	assert.Equal(t, "A1", row1.GetData(0))
+	assert.Equal(t, "B1", row1.GetData(1))
+	assert.Equal(t, "C1", row1.GetData(2))
+
+	row2 := iterator.Next()
+	assert.Equal(t, "A2", row2.GetData(0))
+	assert.Equal(t, "B2", row2.GetData(1))
+	assert.Equal(t, "C2", row2.GetData(2))
+
+	row3 := iterator.Next()
+	assert.Equal(t, "A3", row3.GetData(0))
+	assert.Equal(t, "B3", row3.GetData(1))
+	assert.Equal(t, "C3", row3.GetData(2))
+}
+
+func TestCsvFileBasicDataTableRowGetData_HasTitleLine(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, true)
+
+	iterator := datatable.DataRowIterator()
+
+	row1 := iterator.Next()
+	assert.Equal(t, "A2", row1.GetData(0))
+	assert.Equal(t, "B2", row1.GetData(1))
+	assert.Equal(t, "C2", row1.GetData(2))
+
+	row2 := iterator.Next()
+	assert.Equal(t, "A3", row2.GetData(0))
+	assert.Equal(t, "B3", row2.GetData(1))
+	assert.Equal(t, "C3", row2.GetData(2))
+}
+
+func TestCsvFileBasicDataTableRowGetData_GetNotExistedColumnData(t *testing.T) {
+	datatable := CreateNewCustomCsvBasicDataTable([][]string{
+		{"A1", "B1", "C1"},
+		{"A2", "B2", "C2"},
+		{"A3", "B3", "C3"},
+	}, true)
+
+	iterator := datatable.DataRowIterator()
+
+	row1 := iterator.Next()
+	assert.Equal(t, "", row1.GetData(3))
+}
+
+func TestCreateNewCsvBasicDataTable(t *testing.T) {
+	context := core.NewNullContext()
+	reader := bytes.NewReader([]byte("A1,B1,C1\n" +
+		"A2,B2,C2\n" +
+		"A3,B3,C3\n"))
+	datatable, err := CreateNewCsvBasicDataTable(context, reader, true)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, datatable.DataRowCount())
+
+	iterator := datatable.DataRowIterator()
+	assert.True(t, iterator.HasNext())
+
+	row1 := iterator.Next()
+	assert.EqualValues(t, 3, row1.ColumnCount())
+	assert.Equal(t, "A2", row1.GetData(0))
+	assert.Equal(t, "B2", row1.GetData(1))
+	assert.Equal(t, "C2", row1.GetData(2))
+	assert.True(t, iterator.HasNext())
+
+	row2 := iterator.Next()
+	assert.EqualValues(t, 3, row2.ColumnCount())
+	assert.Equal(t, "A3", row2.GetData(0))
+	assert.Equal(t, "B3", row2.GetData(1))
+	assert.Equal(t, "C3", row2.GetData(2))
+	assert.False(t, iterator.HasNext())
+}
+
+func TestCreateNewCsvBasicDataTable_SkipBlankLine(t *testing.T) {
+	context := core.NewNullContext()
+	reader := bytes.NewReader([]byte("\n" +
+		"A1,B1,C1\n" +
+		"A2,B2,C2\n" +
+		"\n" +
+		"A3,B3,C3\n"))
+	datatable, err := CreateNewCsvBasicDataTable(context, reader, true)
+	assert.Nil(t, err)
+
+	assert.Equal(t, 2, datatable.DataRowCount())
+
+	iterator := datatable.DataRowIterator()
+	assert.True(t, iterator.HasNext())
+
+	row1 := iterator.Next()
+	assert.EqualValues(t, 3, row1.ColumnCount())
+	assert.Equal(t, "A2", row1.GetData(0))
+	assert.Equal(t, "B2", row1.GetData(1))
+	assert.Equal(t, "C2", row1.GetData(2))
+	assert.True(t, iterator.HasNext())
+
+	row2 := iterator.Next()
+	assert.EqualValues(t, 3, row2.ColumnCount())
+	assert.Equal(t, "A3", row2.GetData(0))
+	assert.Equal(t, "B3", row2.GetData(1))
+	assert.Equal(t, "C3", row2.GetData(2))
+	assert.False(t, iterator.HasNext())
+}
@@ -1,11 +0,0 @@
-package converters
-
-import (
-	"github.com/mayswind/ezbookkeeping/pkg/models"
-)
-
-// DataConverter defines the structure of data exporter
-type DataConverter interface {
-	// ToExportedContent returns the exported data
-	ToExportedContent(uid int64, transactions []*models.Transaction, accountMap map[int64]*models.Account, categoryMap map[int64]*models.TransactionCategory, tagMap map[int64]*models.TransactionTag, allTagIndexes map[int64][]int64) ([]byte, error)
-}
@@ -0,0 +1,34 @@
+package datatable
+
+// BasicDataTable defines the structure of basic data table
+type BasicDataTable interface {
+	// DataRowCount returns the total count of data row
+	DataRowCount() int
+
+	// HeaderColumnNames returns the header column name list
+	HeaderColumnNames() []string
+
+	// DataRowIterator returns the iterator of data row
+	DataRowIterator() BasicDataTableRowIterator
+}
+
+// BasicDataTableRow defines the structure of basic data row
+type BasicDataTableRow interface {
+	// ColumnCount returns the total count of column in this data row
+	ColumnCount() int
+
+	// GetData returns the data in the specified column index
+	GetData(columnIndex int) string
+}
+
+// BasicDataTableRowIterator defines the structure of basic data row iterator
+type BasicDataTableRowIterator interface {
+	// HasNext returns whether the iterator does not reach the end
+	HasNext() bool
+
+	// CurrentRowId returns current row id
+	CurrentRowId() string
+
+	// Next returns the next basic data row
+	Next() BasicDataTableRow
+}
@@ -0,0 +1,65 @@
+package datatable
+
+type testBasicDataTable struct {
+	headerColumns []string
+	rows          []*testBasicDataTableRow
+}
+
+type testBasicDataTableRow struct {
+	rowId      string
+	rowColumns []string
+}
+
+type testBasicDataTableRowIterator struct {
+	rows         []*testBasicDataTableRow
+	currentIndex int
+}
+
+func (t *testBasicDataTable) HeaderColumnNames() []string {
+	return t.headerColumns
+}
+
+func (t *testBasicDataTable) DataRowCount() int {
+	return len(t.rows)
+}
+
+func (t *testBasicDataTable) DataRowIterator() BasicDataTableRowIterator {
+	return &testBasicDataTableRowIterator{
+		rows:         t.rows,
+		currentIndex: -1,
+	}
+}
+
+func (r *testBasicDataTableRow) ColumnCount() int {
+	return len(r.rowColumns)
+}
+
+func (r *testBasicDataTableRow) GetData(columnIndex int) string {
+	if columnIndex < 0 || columnIndex >= len(r.rowColumns) {
+		return ""
+	}
+
+	return r.rowColumns[columnIndex]
+}
+
+func (t *testBasicDataTableRowIterator) HasNext() bool {
+	return t.currentIndex+1 < len(t.rows)
+}
+
+func (t *testBasicDataTableRowIterator) CurrentRowId() string {
+	if t.currentIndex >= len(t.rows) {
+		return ""
+	}
+
+	return t.rows[t.currentIndex].rowId
+}
+
+func (t *testBasicDataTableRowIterator) Next() BasicDataTableRow {
+	if t.currentIndex+1 >= len(t.rows) {
+		return nil
+	}
+
+	t.currentIndex++
+	row := t.rows[t.currentIndex]
+	return row
+}
@@ -0,0 +1,107 @@
+package datatable
+
+// basicDataTableToCommonDataTableWrapper defines the structure of basic data table to common data table wrapper
+type basicDataTableToCommonDataTableWrapper struct {
+	innerDataTable    BasicDataTable
+	dataColumnIndexes map[string]int
+}
+
+// basicDataTableToCommonDataTableWrapperRow defines the data row structure of basic data table to common data table wrapper
+type basicDataTableToCommonDataTableWrapperRow struct {
+	rowData map[string]string
+}
+
+// basicDataTableToCommonDataTableWrapperRowIterator defines the data row iterator structure of basic data table to common data table wrapper
+type basicDataTableToCommonDataTableWrapperRowIterator struct {
+	commonDataTable *basicDataTableToCommonDataTableWrapper
+	innerIterator   BasicDataTableRowIterator
+}
+
+// HeaderColumnCount returns the total count of column in header row
+func (t *basicDataTableToCommonDataTableWrapper) HeaderColumnCount() int {
+	return len(t.innerDataTable.HeaderColumnNames())
+}
+
+// HasColumn returns whether the data table has specified column name
+func (t *basicDataTableToCommonDataTableWrapper) HasColumn(columnName string) bool {
+	index, exists := t.dataColumnIndexes[columnName]
+	return exists && index >= 0
+}
+
+// DataRowCount returns the total count of common data row
+func (t *basicDataTableToCommonDataTableWrapper) DataRowCount() int {
+	return t.innerDataTable.DataRowCount()
+}
+
+// DataRowIterator returns the iterator of common data row
+func (t *basicDataTableToCommonDataTableWrapper) DataRowIterator() CommonDataTableRowIterator {
+	return &basicDataTableToCommonDataTableWrapperRowIterator{
+		commonDataTable: t,
+		innerIterator:   t.innerDataTable.DataRowIterator(),
+	}
+}
+
+// HasData returns whether the common data row has specified column data
+func (r *basicDataTableToCommonDataTableWrapperRow) HasData(columnName string) bool {
+	_, exists := r.rowData[columnName]
+	return exists
+}
+
+// ColumnCount returns the total count of column in this data row
+func (r *basicDataTableToCommonDataTableWrapperRow) ColumnCount() int {
+	return len(r.rowData)
+}
+
+// GetData returns the data in the specified column name
+func (r *basicDataTableToCommonDataTableWrapperRow) GetData(columnName string) string {
+	return r.rowData[columnName]
+}
+
+// HasNext returns whether the iterator does not reach the end
+func (t *basicDataTableToCommonDataTableWrapperRowIterator) HasNext() bool {
+	return t.innerIterator.HasNext()
+}
+
+// CurrentRowId returns current row id
+func (t *basicDataTableToCommonDataTableWrapperRowIterator) CurrentRowId() string {
+	return t.innerIterator.CurrentRowId()
+}
+
+// Next returns the next common data row
+func (t *basicDataTableToCommonDataTableWrapperRowIterator) Next() CommonDataTableRow {
+	basicDataRow := t.innerIterator.Next()
+
+	if basicDataRow == nil {
+		return nil
+	}
+
+	rowData := make(map[string]string, len(t.commonDataTable.dataColumnIndexes))
+
+	for column, columnIndex := range t.commonDataTable.dataColumnIndexes {
+		if columnIndex < 0 || columnIndex >= basicDataRow.ColumnCount() {
+			continue
+		}
+
+		value := basicDataRow.GetData(columnIndex)
+		rowData[column] = value
+	}
+
+	return &basicDataTableToCommonDataTableWrapperRow{
+		rowData: rowData,
+	}
+}
+
+// CreateNewCommonDataTableFromBasicDataTable returns common data table from basic data table
+func CreateNewCommonDataTableFromBasicDataTable(dataTable BasicDataTable) CommonDataTable {
+	headerLineItems := dataTable.HeaderColumnNames()
+	dataColumnIndexes := make(map[string]int, len(headerLineItems))
+
+	for i := 0; i < len(headerLineItems); i++ {
+		dataColumnIndexes[headerLineItems[i]] = i
+	}
+
+	return &basicDataTableToCommonDataTableWrapper{
+		innerDataTable:    dataTable,
+		dataColumnIndexes: dataColumnIndexes,
+	}
+}
@@ -0,0 +1,108 @@
+package datatable
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBasicDataTableToCommonDataTableWrapper_HeaderColumnCount(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          []*testBasicDataTableRow{},
+	}
+
+	commonDataTable := CreateNewCommonDataTableFromBasicDataTable(basicDataTable)
+	assert.Equal(t, len(columns), commonDataTable.HeaderColumnCount())
+}
+
+func TestBasicDataTableToCommonDataTableWrapper_HasColumn(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          []*testBasicDataTableRow{},
+	}
+
+	commonDataTable := CreateNewCommonDataTableFromBasicDataTable(basicDataTable)
+
+	assert.True(t, commonDataTable.HasColumn("Col1"))
+	assert.True(t, commonDataTable.HasColumn("Col2"))
+	assert.True(t, commonDataTable.HasColumn("Col3"))
+
+	assert.False(t, commonDataTable.HasColumn("Col4"))
+	assert.False(t, commonDataTable.HasColumn(""))
+}
+
+func TestBasicDataTableToCommonDataTableWrapper_DataRowCount(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"A1", "B1", "C1"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"A2", "B2", "C2"},
+		},
+		{
+			rowId:      "3",
+			rowColumns: []string{"A3", "B3", "C3"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	commonDataTable := CreateNewCommonDataTableFromBasicDataTable(basicDataTable)
+	assert.Equal(t, len(rows), commonDataTable.DataRowCount())
+}
+
+func TestBasicDataTableToCommonDataTableWrapper_DataRowIterator(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"A1", "B1", "C1"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"A2", "B2", "C2"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	commonDataTable := CreateNewCommonDataTableFromBasicDataTable(basicDataTable)
+	iterator := commonDataTable.DataRowIterator()
+
+	assert.True(t, iterator.HasNext())
+	firstRow := iterator.Next()
+	assert.NotNil(t, firstRow)
+	assert.Equal(t, len(columns), firstRow.ColumnCount())
+	assert.True(t, firstRow.HasData("Col1"))
+	assert.True(t, firstRow.HasData("Col2"))
+	assert.True(t, firstRow.HasData("Col3"))
+	assert.Equal(t, "A1", firstRow.GetData("Col1"))
+	assert.Equal(t, "B1", firstRow.GetData("Col2"))
+	assert.Equal(t, "C1", firstRow.GetData("Col3"))
+
+	assert.True(t, iterator.HasNext())
+	secondRow := iterator.Next()
+	assert.NotNil(t, secondRow)
+	assert.Equal(t, len(columns), secondRow.ColumnCount())
+	assert.True(t, secondRow.HasData("Col1"))
+	assert.True(t, secondRow.HasData("Col2"))
+	assert.True(t, secondRow.HasData("Col3"))
+	assert.Equal(t, "A2", secondRow.GetData("Col1"))
+	assert.Equal(t, "B2", secondRow.GetData("Col2"))
+	assert.Equal(t, "C2", secondRow.GetData("Col3"))
+
+	assert.False(t, iterator.HasNext())
+	assert.Nil(t, iterator.Next())
+}
@@ -0,0 +1,188 @@
+package datatable
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+// basicDataTableToTransactionDataTableWrapper defines the structure of basic data table to transaction data table wrapper
+type basicDataTableToTransactionDataTableWrapper struct {
+	innerDataTable    BasicDataTable
+	dataColumnMapping map[TransactionDataTableColumn]string
+	dataColumnIndexes map[TransactionDataTableColumn]int
+	rowParser         TransactionDataRowParser
+	addedColumns      map[TransactionDataTableColumn]bool
+}
+
+// basicDataTableToTransactionDataTableWrapperRow defines the data row structure of basic data table to transaction data table wrapper
+type basicDataTableToTransactionDataTableWrapperRow struct {
+	transactionDataTable *basicDataTableToTransactionDataTableWrapper
+	rowData              map[TransactionDataTableColumn]string
+	rowDataValid         bool
+}
+
+// basicDataTableToTransactionDataTableWrapperRowIterator defines the data row iterator structure of basic data table to transaction data table wrapper
+type basicDataTableToTransactionDataTableWrapperRowIterator struct {
+	transactionDataTable *basicDataTableToTransactionDataTableWrapper
+	innerIterator        BasicDataTableRowIterator
+}
+
+// HasColumn returns whether the data table has specified column
+func (t *basicDataTableToTransactionDataTableWrapper) HasColumn(column TransactionDataTableColumn) bool {
+	index, exists := t.dataColumnIndexes[column]
+
+	if exists && index >= 0 {
+		return exists
+	}
+
+	if t.addedColumns != nil {
+		_, exists = t.addedColumns[column]
+
+		if exists {
+			return exists
+		}
+	}
+
+	return false
+}
+
+// TransactionRowCount returns the total count of transaction data row
+func (t *basicDataTableToTransactionDataTableWrapper) TransactionRowCount() int {
+	return t.innerDataTable.DataRowCount()
+}
+
+// TransactionRowIterator returns the iterator of transaction data row
+func (t *basicDataTableToTransactionDataTableWrapper) TransactionRowIterator() TransactionDataRowIterator {
+	return &basicDataTableToTransactionDataTableWrapperRowIterator{
+		transactionDataTable: t,
+		innerIterator:        t.innerDataTable.DataRowIterator(),
+	}
+}
+
+// IsValid returns whether this row is valid data for importing
+func (r *basicDataTableToTransactionDataTableWrapperRow) IsValid() bool {
+	return r.rowDataValid
+}
+
+// GetData returns the data in the specified column type
+func (r *basicDataTableToTransactionDataTableWrapperRow) GetData(column TransactionDataTableColumn) string {
+	if !r.rowDataValid {
+		return ""
+	}
+
+	_, exists := r.transactionDataTable.dataColumnIndexes[column]
+
+	if exists {
+		return r.rowData[column]
+	}
+
+	if r.transactionDataTable.addedColumns != nil {
+		_, exists = r.transactionDataTable.addedColumns[column]
+
+		if exists {
+			return r.rowData[column]
+		}
+	}
+
+	return ""
+}
+
+// HasNext returns whether the iterator does not reach the end
+func (t *basicDataTableToTransactionDataTableWrapperRowIterator) HasNext() bool {
+	return t.innerIterator.HasNext()
+}
+
+// Next returns the next transaction data row
+func (t *basicDataTableToTransactionDataTableWrapperRowIterator) Next(ctx core.Context, user *models.User) (daraRow TransactionDataRow, err error) {
+	basicDataRow := t.innerIterator.Next()
+
+	if basicDataRow == nil {
+		return nil, nil
+	}
+
+	if basicDataRow.ColumnCount() == 1 && basicDataRow.GetData(0) == "" {
+		return &basicDataTableToTransactionDataTableWrapperRow{
+			transactionDataTable: t.transactionDataTable,
+			rowData:              nil,
+			rowDataValid:         false,
+		}, nil
+	}
+
+	if basicDataRow.ColumnCount() < len(t.transactionDataTable.dataColumnIndexes) {
+		log.Errorf(ctx, "[basic_data_table_to_transaction_data_table_wrapper.Next] cannot parse data row, because may missing some columns (column count %d in data row is less than header column count %d)", basicDataRow.ColumnCount(), len(t.transactionDataTable.dataColumnIndexes))
+		return nil, errs.ErrFewerFieldsInDataRowThanInHeaderRow
+	}
+
+	rowData := make(map[TransactionDataTableColumn]string, len(t.transactionDataTable.dataColumnIndexes))
+	rowDataValid := true
+
+	for column, columnIndex := range t.transactionDataTable.dataColumnIndexes {
+		if columnIndex < 0 || columnIndex >= basicDataRow.ColumnCount() {
+			continue
+		}
+
+		value := basicDataRow.GetData(columnIndex)
+		rowData[column] = value
+	}
+
+	if t.transactionDataTable.rowParser != nil {
+		rowData, rowDataValid, err = t.transactionDataTable.rowParser.Parse(rowData)
+
+		if err != nil {
+			log.Errorf(ctx, "[basic_data_table_to_transaction_data_table_wrapper.Next] cannot parse data row, because %s", err.Error())
+			return nil, err
+		}
+	}
+
+	return &basicDataTableToTransactionDataTableWrapperRow{
+		transactionDataTable: t.transactionDataTable,
+		rowData:              rowData,
+		rowDataValid:         rowDataValid,
+	}, nil
+}
+
+// CreateNewTransactionDataTableFromBasicDataTable returns transaction data table from basic data table
+func CreateNewTransactionDataTableFromBasicDataTable(dataTable BasicDataTable, dataColumnMapping map[TransactionDataTableColumn]string) TransactionDataTable {
+	return CreateNewTransactionDataTableFromBasicDataTableWithRowParser(dataTable, dataColumnMapping, nil)
+}
+
+// CreateNewTransactionDataTableFromBasicDataTableWithRowParser returns transaction data table from basic data table
+func CreateNewTransactionDataTableFromBasicDataTableWithRowParser(dataTable BasicDataTable, dataColumnMapping map[TransactionDataTableColumn]string, rowParser TransactionDataRowParser) TransactionDataTable {
+	headerLineItems := dataTable.HeaderColumnNames()
+	headerItemMap := make(map[string]int, len(headerLineItems))
+
+	for i := 0; i < len(headerLineItems); i++ {
+		headerItemMap[headerLineItems[i]] = i
+	}
+
+	dataColumnIndexes := make(map[TransactionDataTableColumn]int, len(headerLineItems))
+
+	for column, columnName := range dataColumnMapping {
+		columnIndex, exists := headerItemMap[columnName]
+
+		if exists {
+			dataColumnIndexes[column] = columnIndex
+		}
+	}
+
+	var addedColumns map[TransactionDataTableColumn]bool
+
+	if rowParser != nil {
+		addedColumnsByParser := rowParser.GetAddedColumns()
+		addedColumns = make(map[TransactionDataTableColumn]bool, len(addedColumnsByParser))
+
+		for i := 0; i < len(addedColumnsByParser); i++ {
+			addedColumns[addedColumnsByParser[i]] = true
+		}
+	}
+
+	return &basicDataTableToTransactionDataTableWrapper{
+		innerDataTable:    dataTable,
+		dataColumnMapping: dataColumnMapping,
+		dataColumnIndexes: dataColumnIndexes,
+		rowParser:         rowParser,
+		addedColumns:      addedColumns,
+	}
+}
@@ -0,0 +1,220 @@
+package datatable
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+)
+
+type testTransactionDataRowParser struct {
+}
+
+func (p *testTransactionDataRowParser) Parse(rowData map[TransactionDataTableColumn]string) (map[TransactionDataTableColumn]string, bool, error) {
+	rowData[TRANSACTION_DATA_TABLE_DESCRIPTION] = "Test Description"
+	return rowData, true, nil
+}
+
+func (p *testTransactionDataRowParser) GetAddedColumns() []TransactionDataTableColumn {
+	return []TransactionDataTableColumn{TRANSACTION_DATA_TABLE_DESCRIPTION}
+}
+
+func TestBasicDataTableToTransactionDataTableWrapper_HasColumn(t *testing.T) {
+	columns := []string{"TransactionTime", "TransactionType", "Amount"}
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          []*testBasicDataTableRow{},
+	}
+
+	columnMapping := map[TransactionDataTableColumn]string{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: "TransactionTime",
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: "TransactionType",
+		TRANSACTION_DATA_TABLE_AMOUNT:           "Amount",
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromBasicDataTable(basicDataTable, columnMapping)
+
+	assert.True(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_TRANSACTION_TIME))
+	assert.True(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_TRANSACTION_TYPE))
+	assert.True(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_AMOUNT))
+
+	assert.False(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_DESCRIPTION))
+	assert.False(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_CATEGORY))
+}
+
+func TestBasicDataTableToTransactionDataTableWrapper_TransactionRowCount(t *testing.T) {
+	columns := []string{"TransactionTime", "TransactionType", "Amount"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"2024-01-01", "1", "100"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"2024-01-02", "2", "200"},
+		},
+		{
+			rowId:      "3",
+			rowColumns: []string{"2024-01-03", "1", "300"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	columnMapping := map[TransactionDataTableColumn]string{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: "TransactionTime",
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: "TransactionType",
+		TRANSACTION_DATA_TABLE_AMOUNT:           "Amount",
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromBasicDataTable(basicDataTable, columnMapping)
+	assert.Equal(t, len(rows), transactionDataTable.TransactionRowCount())
+}
+
+func TestBasicDataTableToTransactionDataTableWrapper_TransactionRowIterator(t *testing.T) {
+	columns := []string{"TransactionTime", "TransactionType", "Amount"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"2024-01-01", "1", "100"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"2024-01-02", "2", "200"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	columnMapping := map[TransactionDataTableColumn]string{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: "TransactionTime",
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: "TransactionType",
+		TRANSACTION_DATA_TABLE_AMOUNT:           "Amount",
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromBasicDataTable(basicDataTable, columnMapping)
+	iterator := transactionDataTable.TransactionRowIterator()
+
+	assert.True(t, iterator.HasNext())
+	firstRow, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.NotNil(t, firstRow)
+	assert.True(t, firstRow.IsValid())
+	assert.Equal(t, "2024-01-01", firstRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TIME))
+	assert.Equal(t, "1", firstRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TYPE))
+	assert.Equal(t, "100", firstRow.GetData(TRANSACTION_DATA_TABLE_AMOUNT))
+
+	assert.True(t, iterator.HasNext())
+	secondRow, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.NotNil(t, secondRow)
+	assert.True(t, secondRow.IsValid())
+	assert.Equal(t, "2024-01-02", secondRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TIME))
+	assert.Equal(t, "2", secondRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TYPE))
+	assert.Equal(t, "200", secondRow.GetData(TRANSACTION_DATA_TABLE_AMOUNT))
+
+	assert.False(t, iterator.HasNext())
+	emptyRow, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.Nil(t, emptyRow)
+}
+
+func TestBasicDataTableToTransactionDataTableWrapper_TransactionRowIterator_EmptyRow(t *testing.T) {
+	columns := []string{"TransactionTime", "TransactionType", "Amount"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{""},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	columnMapping := map[TransactionDataTableColumn]string{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: "TransactionTime",
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: "TransactionType",
+		TRANSACTION_DATA_TABLE_AMOUNT:           "Amount",
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromBasicDataTable(basicDataTable, columnMapping)
+	iterator := transactionDataTable.TransactionRowIterator()
+
+	assert.True(t, iterator.HasNext())
+	row, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.NotNil(t, row)
+	assert.False(t, row.IsValid())
+}
+
+func TestBasicDataTableToTransactionDataTableWrapper_TransactionRowIterator_InvalidRow(t *testing.T) {
+	columns := []string{"TransactionTime", "TransactionType", "Amount"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"2024-01-01", "1"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	columnMapping := map[TransactionDataTableColumn]string{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: "TransactionTime",
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: "TransactionType",
+		TRANSACTION_DATA_TABLE_AMOUNT:           "Amount",
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromBasicDataTable(basicDataTable, columnMapping)
+	iterator := transactionDataTable.TransactionRowIterator()
+
+	assert.True(t, iterator.HasNext())
+	row, err := iterator.Next(nil, nil)
+	assert.NotNil(t, err)
+	assert.Equal(t, errs.ErrFewerFieldsInDataRowThanInHeaderRow, err)
+	assert.Nil(t, row)
+}
+
+func TestBasicDataTableToTransactionDataTableWrapper_TransactionRowIterator_WithRowParserAddedColumn(t *testing.T) {
+	columns := []string{"TransactionTime", "TransactionType", "Amount"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"2024-01-01", "1", "100"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	columnMapping := map[TransactionDataTableColumn]string{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: "TransactionTime",
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: "TransactionType",
+		TRANSACTION_DATA_TABLE_AMOUNT:           "Amount",
+		TRANSACTION_DATA_TABLE_DESCRIPTION:      "Description",
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromBasicDataTableWithRowParser(basicDataTable, columnMapping, &testTransactionDataRowParser{})
+	assert.True(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_DESCRIPTION))
+
+	iterator := transactionDataTable.TransactionRowIterator()
+	assert.True(t, iterator.HasNext())
+	row, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.NotNil(t, row)
+	assert.True(t, row.IsValid())
+	assert.Equal(t, "Test Description", row.GetData(TRANSACTION_DATA_TABLE_DESCRIPTION))
+}
@@ -0,0 +1,40 @@
+package datatable
+
+// CommonDataTable defines the structure of common data table
+type CommonDataTable interface {
+	// HeaderColumnCount returns the total count of column in header row
+	HeaderColumnCount() int
+
+	// HasColumn returns whether the common data table has specified column name
+	HasColumn(columnName string) bool
+
+	// DataRowCount returns the total count of common data row
+	DataRowCount() int
+
+	// DataRowIterator returns the iterator of common data row
+	DataRowIterator() CommonDataTableRowIterator
+}
+
+// CommonDataTableRow defines the structure of common data row
+type CommonDataTableRow interface {
+	// ColumnCount returns the total count of column in this data row
+	ColumnCount() int
+
+	// HasData returns whether the common data row has specified column data
+	HasData(columnName string) bool
+
+	// GetData returns the data in the specified column name
+	GetData(columnName string) string
+}
+
+// CommonDataTableRowIterator defines the structure of common data row iterator
+type CommonDataTableRowIterator interface {
+	// HasNext returns whether the iterator does not reach the end
+	HasNext() bool
+
+	// CurrentRowId returns current row id
+	CurrentRowId() string
+
+	// Next returns the next common data row
+	Next() CommonDataTableRow
+}
@@ -0,0 +1,109 @@
+package datatable
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/log"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+// CommonTransactionDataRowParser defines the structure of common transaction data row parser
+type CommonTransactionDataRowParser interface {
+	// Parse returns the converted transaction data row
+	Parse(ctx core.Context, user *models.User, dataRow CommonDataTableRow, rowId string) (rowData map[TransactionDataTableColumn]string, rowDataValid bool, err error)
+}
+
+// commonDataTableToTransactionDataTableWrapper defines the structure of common data table to transaction data table wrapper
+type commonDataTableToTransactionDataTableWrapper struct {
+	innerDataTable       CommonDataTable
+	supportedDataColumns map[TransactionDataTableColumn]bool
+	rowParser            CommonTransactionDataRowParser
+}
+
+// commonDataTableToTransactionDataTableWrapperRow defines the data row structure of common data table to transaction data table wrapper
+type commonDataTableToTransactionDataTableWrapperRow struct {
+	transactionDataTable *commonDataTableToTransactionDataTableWrapper
+	rowData              map[TransactionDataTableColumn]string
+	rowDataValid         bool
+}
+
+// commonDataTableToTransactionDataTableWrapperRowIterator defines the data row iterator structure of common data table to transaction data table wrapper
+type commonDataTableToTransactionDataTableWrapperRowIterator struct {
+	transactionDataTable *commonDataTableToTransactionDataTableWrapper
+	innerIterator        CommonDataTableRowIterator
+}
+
+// HasColumn returns whether the data table has specified column
+func (t *commonDataTableToTransactionDataTableWrapper) HasColumn(column TransactionDataTableColumn) bool {
+	_, exists := t.supportedDataColumns[column]
+	return exists
+}
+
+// TransactionRowCount returns the total count of transaction data row
+func (t *commonDataTableToTransactionDataTableWrapper) TransactionRowCount() int {
+	return t.innerDataTable.DataRowCount()
+}
+
+// TransactionRowIterator returns the iterator of transaction data row
+func (t *commonDataTableToTransactionDataTableWrapper) TransactionRowIterator() TransactionDataRowIterator {
+	return &commonDataTableToTransactionDataTableWrapperRowIterator{
+		transactionDataTable: t,
+		innerIterator:        t.innerDataTable.DataRowIterator(),
+	}
+}
+
+// IsValid returns whether this row is valid data for importing
+func (r *commonDataTableToTransactionDataTableWrapperRow) IsValid() bool {
+	return r.rowDataValid
+}
+
+// GetData returns the data in the specified column type
+func (r *commonDataTableToTransactionDataTableWrapperRow) GetData(column TransactionDataTableColumn) string {
+	if !r.rowDataValid {
+		return ""
+	}
+
+	_, exists := r.transactionDataTable.supportedDataColumns[column]
+
+	if !exists {
+		return ""
+	}
+
+	return r.rowData[column]
+}
+
+// HasNext returns whether the iterator does not reach the end
+func (t *commonDataTableToTransactionDataTableWrapperRowIterator) HasNext() bool {
+	return t.innerIterator.HasNext()
+}
+
+// Next returns the next transaction data row
+func (t *commonDataTableToTransactionDataTableWrapperRowIterator) Next(ctx core.Context, user *models.User) (daraRow TransactionDataRow, err error) {
+	commonDataRow := t.innerIterator.Next()
+
+	if commonDataRow == nil {
+		return nil, nil
+	}
+
+	rowId := t.innerIterator.CurrentRowId()
+	rowData, rowDataValid, err := t.transactionDataTable.rowParser.Parse(ctx, user, commonDataRow, rowId)
+
+	if err != nil {
+		log.Errorf(ctx, "[common_data_table_to_transaction_data_table_wrapper.Next] cannot parse data row, because %s", err.Error())
+		return nil, err
+	}
+
+	return &commonDataTableToTransactionDataTableWrapperRow{
+		transactionDataTable: t.transactionDataTable,
+		rowData:              rowData,
+		rowDataValid:         rowDataValid,
+	}, nil
+}
+
+// CreateNewTransactionDataTableFromCommonDataTable returns transaction data table from Common data table
+func CreateNewTransactionDataTableFromCommonDataTable(dataTable CommonDataTable, supportedDataColumns map[TransactionDataTableColumn]bool, rowParser CommonTransactionDataRowParser) TransactionDataTable {
+	return &commonDataTableToTransactionDataTableWrapper{
+		innerDataTable:       dataTable,
+		supportedDataColumns: supportedDataColumns,
+		rowParser:            rowParser,
+	}
+}
@@ -0,0 +1,258 @@
+package datatable
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/errs"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+type testCommonDataTable struct {
+	headerColumns []string
+	dataRows      []*testCommonDataTableRow
+}
+
+type testCommonDataTableRow struct {
+	rowId   string
+	rowData map[string]string
+}
+
+type testCommonDataTableRowIterator struct {
+	dataTable    *testCommonDataTable
+	currentIndex int
+}
+
+func (t *testCommonDataTable) DataRowCount() int {
+	return len(t.dataRows)
+}
+
+func (t *testCommonDataTable) HeaderColumnCount() int {
+	return len(t.headerColumns)
+}
+
+func (t *testCommonDataTable) HasColumn(columnName string) bool {
+	for _, header := range t.headerColumns {
+		if header == columnName {
+			return true
+		}
+	}
+	return false
+}
+
+func (t *testCommonDataTable) DataRowIterator() CommonDataTableRowIterator {
+	return &testCommonDataTableRowIterator{
+		dataTable:    t,
+		currentIndex: -1,
+	}
+}
+
+func (t *testCommonDataTableRow) GetData(dataKey string) string {
+	return t.rowData[dataKey]
+}
+
+func (t *testCommonDataTableRow) HasData(dataKey string) bool {
+	_, exists := t.rowData[dataKey]
+	return exists
+}
+
+func (t *testCommonDataTableRow) ColumnCount() int {
+	return len(t.rowData)
+}
+
+func (t *testCommonDataTableRowIterator) HasNext() bool {
+	return t.currentIndex+1 < len(t.dataTable.dataRows)
+}
+
+func (t *testCommonDataTableRowIterator) Next() CommonDataTableRow {
+	if !t.HasNext() {
+		return nil
+	}
+
+	t.currentIndex++
+	return t.dataTable.dataRows[t.currentIndex]
+}
+
+func (t *testCommonDataTableRowIterator) CurrentRowId() string {
+	if t.currentIndex < 0 || t.currentIndex >= len(t.dataTable.dataRows) {
+		return ""
+	}
+
+	return t.dataTable.dataRows[t.currentIndex].rowId
+}
+
+type testCommonTransactionDataRowParser struct {
+	returnError bool
+}
+
+func (p *testCommonTransactionDataRowParser) Parse(ctx core.Context, user *models.User, dataRow CommonDataTableRow, rowId string) (map[TransactionDataTableColumn]string, bool, error) {
+	if p.returnError {
+		return nil, false, errs.ErrOperationFailed
+	}
+
+	rowData := make(map[TransactionDataTableColumn]string)
+	rowData[TRANSACTION_DATA_TABLE_TRANSACTION_TIME] = dataRow.GetData("TransactionTime")
+	rowData[TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = dataRow.GetData("TransactionType")
+	rowData[TRANSACTION_DATA_TABLE_AMOUNT] = dataRow.GetData("Amount")
+	rowData[TRANSACTION_DATA_TABLE_DESCRIPTION] = "Test Description"
+	return rowData, true, nil
+}
+
+func TestCommonDataTableToTransactionDataTableWrapper_HasColumn(t *testing.T) {
+	basicDataTable := &testCommonDataTable{
+		headerColumns: []string{"TransactionTime", "TransactionType", "Amount"},
+		dataRows:      []*testCommonDataTableRow{},
+	}
+
+	supportedColumns := map[TransactionDataTableColumn]bool{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: true,
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: true,
+		TRANSACTION_DATA_TABLE_AMOUNT:           true,
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromCommonDataTable(basicDataTable, supportedColumns, &testCommonTransactionDataRowParser{})
+
+	assert.True(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_TRANSACTION_TIME))
+	assert.True(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_TRANSACTION_TYPE))
+	assert.True(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_AMOUNT))
+
+	assert.False(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_CATEGORY))
+	assert.False(t, transactionDataTable.HasColumn(TRANSACTION_DATA_TABLE_DESCRIPTION))
+}
+
+func TestCommonDataTableToTransactionDataTableWrapper_TransactionRowCount(t *testing.T) {
+	rows := []*testCommonDataTableRow{
+		{
+			rowId: "1",
+			rowData: map[string]string{
+				"TransactionTime": "2024-01-01",
+				"TransactionType": "1",
+				"Amount":          "100",
+			},
+		},
+		{
+			rowId: "2",
+			rowData: map[string]string{
+				"TransactionTime": "2024-01-02",
+				"TransactionType": "2",
+				"Amount":          "200",
+			},
+		},
+		{
+			rowId: "3",
+			rowData: map[string]string{
+				"TransactionTime": "2024-01-03",
+				"TransactionType": "1",
+				"Amount":          "300",
+			},
+		},
+	}
+
+	basicDataTable := &testCommonDataTable{
+		headerColumns: []string{"TransactionTime", "TransactionType", "Amount"},
+		dataRows:      rows,
+	}
+
+	supportedColumns := map[TransactionDataTableColumn]bool{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: true,
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: true,
+		TRANSACTION_DATA_TABLE_AMOUNT:           true,
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromCommonDataTable(basicDataTable, supportedColumns, &testCommonTransactionDataRowParser{})
+	assert.Equal(t, len(rows), transactionDataTable.TransactionRowCount())
+}
+
+func TestCommonDataTableToTransactionDataTableWrapper_TransactionRowIterator(t *testing.T) {
+	rows := []*testCommonDataTableRow{
+		{
+			rowId: "1",
+			rowData: map[string]string{
+				"TransactionTime": "2024-01-01",
+				"TransactionType": "1",
+				"Amount":          "100",
+			},
+		},
+		{
+			rowId: "2",
+			rowData: map[string]string{
+				"TransactionTime": "2024-01-02",
+				"TransactionType": "2",
+				"Amount":          "200",
+			},
+		},
+	}
+
+	basicDataTable := &testCommonDataTable{
+		headerColumns: []string{"TransactionTime", "TransactionType", "Amount"},
+		dataRows:      rows,
+	}
+
+	supportedColumns := map[TransactionDataTableColumn]bool{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: true,
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: true,
+		TRANSACTION_DATA_TABLE_AMOUNT:           true,
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromCommonDataTable(basicDataTable, supportedColumns, &testCommonTransactionDataRowParser{})
+	iterator := transactionDataTable.TransactionRowIterator()
+
+	assert.True(t, iterator.HasNext())
+	firstRow, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.NotNil(t, firstRow)
+	assert.True(t, firstRow.IsValid())
+	assert.Equal(t, "2024-01-01", firstRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TIME))
+	assert.Equal(t, "1", firstRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TYPE))
+	assert.Equal(t, "100", firstRow.GetData(TRANSACTION_DATA_TABLE_AMOUNT))
+	assert.Equal(t, "", firstRow.GetData(TRANSACTION_DATA_TABLE_DESCRIPTION))
+
+	assert.True(t, iterator.HasNext())
+	secondRow, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.NotNil(t, secondRow)
+	assert.True(t, secondRow.IsValid())
+	assert.Equal(t, "2024-01-02", secondRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TIME))
+	assert.Equal(t, "2", secondRow.GetData(TRANSACTION_DATA_TABLE_TRANSACTION_TYPE))
+	assert.Equal(t, "200", secondRow.GetData(TRANSACTION_DATA_TABLE_AMOUNT))
+	assert.Equal(t, "", secondRow.GetData(TRANSACTION_DATA_TABLE_DESCRIPTION))
+
+	assert.False(t, iterator.HasNext())
+	emptyRow, err := iterator.Next(nil, nil)
+	assert.Nil(t, err)
+	assert.Nil(t, emptyRow)
+}
+
+func TestCommonDataTableToTransactionDataTableWrapper_TransactionRowIterator_EOF(t *testing.T) {
+	rows := []*testCommonDataTableRow{
+		{
+			rowId: "1",
+			rowData: map[string]string{
+				"TransactionTime": "2024-01-01",
+				"TransactionType": "1",
+				"Amount":          "100",
+			},
+		},
+	}
+
+	basicDataTable := &testCommonDataTable{
+		headerColumns: []string{"TransactionTime", "TransactionType", "Amount"},
+		dataRows:      rows,
+	}
+
+	supportedColumns := map[TransactionDataTableColumn]bool{
+		TRANSACTION_DATA_TABLE_TRANSACTION_TIME: true,
+		TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: true,
+		TRANSACTION_DATA_TABLE_AMOUNT:           true,
+	}
+
+	transactionDataTable := CreateNewTransactionDataTableFromCommonDataTable(basicDataTable, supportedColumns, &testCommonTransactionDataRowParser{returnError: true})
+	iterator := transactionDataTable.TransactionRowIterator()
+
+	assert.True(t, iterator.HasNext())
+	row, err := iterator.Next(nil, nil)
+	assert.EqualError(t, err, errs.ErrOperationFailed.Message)
+	assert.Nil(t, row)
+}
@@ -0,0 +1,87 @@
+package datatable
+
+// SubBasicDataTable defines the structure of sub basic data table
+type SubBasicDataTable struct {
+	baseTable BasicDataTable
+	fromIndex int
+	toIndex   int
+}
+
+// SubBasicDataTableRowIterator defines the structure of sub basic data table row iterator
+type SubBasicDataTableRowIterator struct {
+	dataTable     *SubBasicDataTable
+	innerIterator BasicDataTableRowIterator
+	currentIndex  int
+}
+
+// DataRowCount returns the total count of data row
+func (t *SubBasicDataTable) DataRowCount() int {
+	return t.toIndex - t.fromIndex
+}
+
+// HeaderColumnNames returns the header column name list
+func (t *SubBasicDataTable) HeaderColumnNames() []string {
+	return t.baseTable.HeaderColumnNames()
+}
+
+// DataRowIterator returns the iterator of data row
+func (t *SubBasicDataTable) DataRowIterator() BasicDataTableRowIterator {
+	innerIterator := t.baseTable.DataRowIterator()
+	currentIndex := -1
+
+	// skip rows until reaching the fromIndex
+	for currentIndex = -1; currentIndex < t.fromIndex-1 && innerIterator.HasNext(); currentIndex++ {
+		innerIterator.Next()
+	}
+
+	return &SubBasicDataTableRowIterator{
+		dataTable:     t,
+		innerIterator: innerIterator,
+		currentIndex:  currentIndex,
+	}
+}
+
+// HasNext returns whether the iterator does not reach the end
+func (t *SubBasicDataTableRowIterator) HasNext() bool {
+	return t.currentIndex+1 < t.dataTable.toIndex && t.innerIterator.HasNext()
+}
+
+// CurrentRowId returns current row id
+func (t *SubBasicDataTableRowIterator) CurrentRowId() string {
+	return t.innerIterator.CurrentRowId()
+}
+
+// Next returns the next basic data row
+func (t *SubBasicDataTableRowIterator) Next() BasicDataTableRow {
+	if t.currentIndex+1 >= t.dataTable.toIndex {
+		return nil
+	}
+
+	t.currentIndex++
+	return t.innerIterator.Next()
+}
+
+// CreateSubBasicTable returns a sub basic data table that references a portion of the original table
+func CreateSubBasicTable(dataTable BasicDataTable, fromIndex, toIndex int) *SubBasicDataTable {
+	if fromIndex < 0 {
+		fromIndex = 0
+	}
+
+	if fromIndex > dataTable.DataRowCount() {
+		fromIndex = dataTable.DataRowCount()
+	}
+
+	if toIndex > dataTable.DataRowCount() {
+		toIndex = dataTable.DataRowCount()
+	}
+
+	if toIndex < fromIndex {
+		toIndex = fromIndex
+	}
+
+	return &SubBasicDataTable{
+		baseTable: dataTable,
+		fromIndex: fromIndex,
+		toIndex:   toIndex,
+	}
+}
@@ -0,0 +1,140 @@
+package datatable
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestCreateSubBasicTable_WithValidInput(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"A1", "B1", "C1"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"A2", "B2", "C2"},
+		},
+		{
+			rowId:      "3",
+			rowColumns: []string{"A3", "B3", "C3"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	subTable := CreateSubBasicTable(basicDataTable, 1, 2)
+	assert.Equal(t, 1, subTable.DataRowCount())
+	assert.Equal(t, columns, subTable.HeaderColumnNames())
+}
+
+func TestCreateSubBasicTable_WithInvalidInput(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"A1", "B1", "C1"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"A2", "B2", "C2"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	subTable := CreateSubBasicTable(basicDataTable, -1, 2)
+	assert.Equal(t, 0, subTable.fromIndex)
+	assert.Equal(t, 2, subTable.toIndex)
+
+	subTable = CreateSubBasicTable(basicDataTable, 5, 2)
+	assert.Equal(t, 2, subTable.fromIndex)
+	assert.Equal(t, 2, subTable.toIndex)
+
+	subTable = CreateSubBasicTable(basicDataTable, 0, 5)
+	assert.Equal(t, 0, subTable.fromIndex)
+	assert.Equal(t, 2, subTable.toIndex)
+
+	subTable = CreateSubBasicTable(basicDataTable, 2, 1)
+	assert.Equal(t, 2, subTable.fromIndex)
+	assert.Equal(t, 2, subTable.toIndex)
+}
+
+func TestSubBasicDataTable_DataRowIterator(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"A1", "B1", "C1"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"A2", "B2", "C2"},
+		},
+		{
+			rowId:      "3",
+			rowColumns: []string{"A3", "B3", "C3"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	subTable := CreateSubBasicTable(basicDataTable, 1, 3)
+	iterator := subTable.DataRowIterator()
+
+	assert.True(t, iterator.HasNext())
+	firstRow := iterator.Next()
+	assert.NotNil(t, firstRow)
+	assert.Equal(t, "2", iterator.CurrentRowId())
+	assert.Equal(t, "A2", firstRow.GetData(0))
+	assert.Equal(t, "B2", firstRow.GetData(1))
+	assert.Equal(t, "C2", firstRow.GetData(2))
+
+	assert.True(t, iterator.HasNext())
+	secondRow := iterator.Next()
+	assert.NotNil(t, secondRow)
+	assert.Equal(t, "3", iterator.CurrentRowId())
+	assert.Equal(t, "A3", secondRow.GetData(0))
+	assert.Equal(t, "B3", secondRow.GetData(1))
+	assert.Equal(t, "C3", secondRow.GetData(2))
+
+	assert.False(t, iterator.HasNext())
+	assert.Nil(t, iterator.Next())
+}
+
+func TestSubBasicDataTable_EmptyDataRange(t *testing.T) {
+	columns := []string{"Col1", "Col2", "Col3"}
+	rows := []*testBasicDataTableRow{
+		{
+			rowId:      "1",
+			rowColumns: []string{"A1", "B1", "C1"},
+		},
+		{
+			rowId:      "2",
+			rowColumns: []string{"A2", "B2", "C2"},
+		},
+	}
+
+	basicDataTable := &testBasicDataTable{
+		headerColumns: columns,
+		rows:          rows,
+	}
+
+	subTable := CreateSubBasicTable(basicDataTable, 1, 1)
+	assert.Equal(t, 0, subTable.DataRowCount())
+
+	iterator := subTable.DataRowIterator()
+	assert.False(t, iterator.HasNext())
+	assert.Nil(t, iterator.Next())
+}
--- a/Show More
+++ b/Show More