From 399c6c91917455006c848fe9bb717ee11444bc32 Mon Sep 17 00:00:00 2001
From: ivis-kosaka <nobuyoshi.kosaka@ivis.co.jp>
Date: Wed, 4 Mar 2026 11:21:51 +0000
Subject: [PATCH 1/4] fix: history module and bulks module

---
 src/app/components/bulk/BulkResultStep.vue    |  77 ++++-
 src/app/components/bulk/BulkUploadStep.vue    |  27 +-
 src/app/components/bulk/BulkUserTable.vue     |  13 +-
 .../components/bulk/BulkValidationStep.vue    | 173 +++++++---
 src/app/components/history/HistoryFilter.vue  |   5 -
 src/app/components/history/HistoryTable.vue   |  16 +
 src/app/composables/useBulk.ts                | 251 ++++-----------
 src/app/composables/useHistory.ts             | 162 ++++------
 src/app/i18n/locales/en.json                  |  20 +-
 src/app/i18n/locales/ja.json                  |  20 +-
 src/app/pages/bulk/index.vue                  |   7 +-
 src/app/pages/history/index.vue               |  74 ++---
 src/app/types/bulks.ts                        |  26 +-
 src/app/types/history.ts                      |  12 +-
 src/server/api/bulk.py                        | 133 +++++---
 src/server/entities/bulk.py                   |  18 +-
 src/server/entities/history_detail.py         |   3 +
 src/server/exc.py                             |  14 +
 src/server/services/bulks.py                  | 304 +++++++++++++-----
 src/server/services/history.py                |  11 +-
 20 files changed, 785 insertions(+), 581 deletions(-)

diff --git a/src/app/components/bulk/BulkResultStep.vue b/src/app/components/bulk/BulkResultStep.vue
index af7ea7b5..7f28da0a 100644
--- a/src/app/components/bulk/BulkResultStep.vue
+++ b/src/app/components/bulk/BulkResultStep.vue
@@ -4,18 +4,29 @@ const properties = defineProps<{
   taskId: string
 }>()
 
-const {
-  uploadResult,
-  useBulkIndicators,
-  fetchUploadResult,
-} = useExecuteUpload()
-const { makePageInfo } = useBulk()
+const { query, makePageInfo, makeIndicators } = useBulk()
 
 const toast = useToast()
-const url = `/api/bulk/result/${properties.historyId}`
 
+const { handleFetchError } = useErrorHandling()
 const { data: status, execute: executeStatus }
-  = await useFetch<BulkProcessingStatus>(`/api/bulk/execute/status/${properties.taskId}`)
+  = await useFetch<BulkProcessingStatus>(`/api/bulk/execute/status/${properties.taskId}`,
+    {
+      method: 'GET',
+      lazy: true,
+      onResponseError({ response }) {
+        switch (response.status) {
+          case 404: {
+            break
+          }
+          default:{
+            handleFetchError({ response })
+            break
+          }
+        }
+      },
+      server: false })
+
 const { polling: { interval, maxAttempts } } = useAppConfig()
 const pollExecuteStatus = async () => {
   for (let index = 0; index < maxAttempts; index++) {
@@ -31,8 +42,6 @@ const pollExecuteStatus = async () => {
       })
       return
     }
-    const { uploadResult: result } = await fetchUploadResult(url)
-    uploadResult.value = result.value
     await new Promise(r => setTimeout(r, interval))
   }
   toast.add({
@@ -42,13 +51,47 @@ const pollExecuteStatus = async () => {
     icon: 'i-lucide-circle-x',
   })
 }
+
+const { data: executeResult, execute: fetchExecuteResult }
+  = await useFetch<ExecuteResults>(`/api/bulk/result/${properties.historyId}`, {
+    method: 'GET',
+    query,
+    lazy: true,
+    server: false,
+    onResponseError({ response }) {
+      switch (response.status) {
+        case 403: {
+          showError({
+            status: 403,
+            statusText: 'Forbidden',
+            message: $t('error-page.forbidden.bulk-result'),
+          })
+          break
+        }
+        case 404: {
+          showError({
+            status: 404,
+            statusText: 'Not Found',
+            message: $t('error-page.not-found.bulk-result'),
+          })
+          break
+        }
+        default: {
+          handleFetchError({ response })
+          break
+        }
+      }
+    },
+  })
 onMounted(async () => {
-  await pollExecuteStatus()
+  if (properties.taskId)
+    await pollExecuteStatus()
+  await fetchExecuteResult()
 })
 
-const indicators = useBulkIndicators
-const fileInfo = computed(() => uploadResult.value!.fileInfo)
-const pageInfo = makePageInfo(uploadResult)
+const indicators = computed(() => makeIndicators(executeResult.value))
+const fileInfo = computed(() => executeResult.value!.fileInfo)
+const pageInfo = makePageInfo(executeResult)
 </script>
 
 <template>
@@ -95,10 +138,10 @@ const pageInfo = makePageInfo(uploadResult)
     </div>
 
     <BulkUserTable
-      :data="uploadResult!.results"
-      :total-count="uploadResult!.total"
+      :data="executeResult!.results"
+      :total-count="executeResult!.total"
       :page-info="pageInfo"
-      :offset="uploadResult!.offset"
+      :offset="executeResult!.offset"
       :title="$t('bulk.import-results')"
     />
   </div>
diff --git a/src/app/components/bulk/BulkUploadStep.vue b/src/app/components/bulk/BulkUploadStep.vue
index 71eaac7b..87c9551e 100644
--- a/src/app/components/bulk/BulkUploadStep.vue
+++ b/src/app/components/bulk/BulkUploadStep.vue
@@ -2,7 +2,7 @@
 import type { FormError, FormSubmitEvent } from '@nuxt/ui'
 
 const emit = defineEmits<{
-  next: [taskId: string]
+  next: [data: BulkProcessingStatus]
 }>()
 
 const { isProcessing } = useUserUpload()
@@ -62,13 +62,32 @@ const handleNext = async (event: FormSubmitEvent<Schema>) => {
     method: 'POST',
     body: formData,
     onResponseError({ response }) {
-      handleFetchError({ response })
+      switch (response.status) {
+        case 403: {
+          showError({
+            status: 403,
+            statusText: 'Forbidden',
+            message: $t('error-page.forbidden.bulk-edit'),
+          })
+          break }
+        case 404: {
+          showError({
+            status: 404,
+            statusText: 'Not Found',
+            message: $t('error-page.not-found.repository'),
+          })
+          break
+        }
+        default: {
+          handleFetchError({ response })
+        }
+      }
     },
     server: false,
   })
 
-  if (data.value?.taskId) {
-    emit('next', data.value.taskId)
+  if (data.value) {
+    emit('next', data.value)
   }
 }
 
diff --git a/src/app/components/bulk/BulkUserTable.vue b/src/app/components/bulk/BulkUserTable.vue
index e339efef..a6e556c0 100644
--- a/src/app/components/bulk/BulkUserTable.vue
+++ b/src/app/components/bulk/BulkUserTable.vue
@@ -1,6 +1,6 @@
-<script setup lang="ts" generic="T extends UploadResult | ValidationResult">
+<script setup lang="ts">
 defineProps<{
-  data: T[]
+  data: EachResult[]
   totalCount: number
   title?: string
   pageInfo?: string
@@ -44,7 +44,14 @@ const filterSelects = makeStatusFilters()
     :data="data"
     :columns="columns"
     sticky
-  />
+  >
+    <template #empty>
+      <UEmpty
+        icon="i-lucide-search-x"
+        :title="$t('bulk.no-results')"
+      />
+    </template>
+  </UTable>
 
   <div class="flex items-center">
     <div class="flex items-center gap-4 flex-1">
diff --git a/src/app/components/bulk/BulkValidationStep.vue b/src/app/components/bulk/BulkValidationStep.vue
index 7e48c197..e392f9e6 100644
--- a/src/app/components/bulk/BulkValidationStep.vue
+++ b/src/app/components/bulk/BulkValidationStep.vue
@@ -1,44 +1,50 @@
 <script setup lang="ts">
 import { UCheckbox, UIcon } from '#components'
 
-const emit = defineEmits<{
-  next: [ExcuteResponse]
-  prev: []
-}>()
-
+const properties = defineProps<{ onPrevious?: () => void
+  onNext?: (data: ExcuteResponse) => void }>()
 const toast = useToast()
 
 const taskId = inject<Ref<string | undefined>>('taskId', ref(undefined))
+const temporaryFileId = inject<Ref<string | undefined>>('temporaryFileId', ref(undefined))
 const selectedRepository = inject<Ref<string | undefined>>('selectedRepository', ref(undefined))
 const {
-  validationResults,
-  missingUsers,
+  query,
   selectedMissingUsers,
   selectedCount,
-  summary,
-  executeBulkUpdate,
   toggleSelection,
-  useBulkIndicators,
-  fetchValidationResults,
 } = useValidation({ taskId, selectedRepository })
 
-const { makePageInfo } = useBulk()
+const { makePageInfo, makeIndicators } = useBulk()
 const { polling: { interval, maxAttempts } } = useAppConfig()
-const isProcessing = ref<boolean>(false)
 const { handleFetchError } = useErrorHandling()
-const { data: status, execute }
+const { data: status, execute: getValidateStatus }
   = await useFetch<BulkProcessingStatus>(`/api/bulk/validate/status/${taskId.value}`,
     {
       method: 'GET',
       lazy: true,
       server: false,
-      onResponseError({ response }) { handleFetchError({ response }) },
-    },
-  )
+      onResponseError({ response }) {
+        switch (response.status) {
+          case 404: {
+            showError({
+              status: 404,
+              statusText: 'Not Found',
+              message: $t('error-page.not-found.bulk-validation'),
+            })
+            break
+          }
+          default:{
+            handleFetchError({ response })
+            break
+          }
+        }
+      },
+    })
 
 const pollValidationStatus = async () => {
   for (let index = 0; index < maxAttempts; index++) {
-    await execute()
+    await getValidateStatus()
     const st = (status.value?.status)
     if (st === 'SUCCESS') return
     if (st === 'FAILURE') {
@@ -60,63 +66,128 @@ const pollValidationStatus = async () => {
     icon: 'i-lucide-circle-x',
   })
 }
-const data = ref()
-const pageInfo = ref()
+
+const { data: validationResults, execute: getValidateResult }
+  = await useFetch<ValidationResults>(`/api/bulk/validate/result/${taskId.value}`, {
+    method: 'GET',
+    query,
+    lazy: true,
+    server: false,
+    onResponseError({ response }) {
+      switch (response.status) {
+        case 400: {
+          showError({
+            status: 400,
+            statusText: 'Bad Request',
+            message: $t('error-page.failed.bulk-validation'),
+          })
+          break
+        }
+        case 403: {
+          showError({
+            status: 403,
+            statusText: 'Forbidden',
+            message: $t('error-page.forbidden.bulk-edit'),
+          })
+          break
+        }
+        case 404: {
+          showError({
+            status: 404,
+            statusText: 'Not Found',
+            message: $t('error-page.not-found.bulk-validation'),
+          })
+          break
+        }
+        default:{
+          handleFetchError({ response })
+          break
+        }
+      }
+    },
+  })
+
 onMounted(async () => {
   await pollValidationStatus()
-  data.value = await fetchValidationResults(`/api/bulk/validate/result/${taskId.value}`)
-  pageInfo.value = makePageInfo(data)
+  getValidateResult()
 })
 
-const offset = computed(() => (data.value?.offset ?? 1))
-const canProceed = computed(() => summary.value.error === 0)
+const offset = computed(() => (validationResults.value?.offset ?? 1))
+const canProceed = computed(() => validationResults.value?.summary.error === 0)
+const totalCount = computed(() => validationResults.value?.total)
+const indicators = makeIndicators(validationResults.value)
+const pageInfo = computed(() => makePageInfo(validationResults))
 
 const handleNext = async () => {
   if (!canProceed.value) return
 
-  isProcessing.value = true
-
+  if (!taskId || !selectedRepository.value) {
+    throw new Error('Missing required data')
+  }
   try {
-    const { taskId, historyId } = await executeBulkUpdate(`/api/bulk/execute`)
-    if (historyId) {
-      emit('next', { taskId, historyId })
+    const { taskId, historyId } = await $fetch<BulkProcessingStatus>(`/api/bulk/execute`, {
+      method: 'POST',
+      body: {
+        tempFileId: temporaryFileId.value,
+        repositoryId: selectedRepository.value,
+        deleteUsers:
+          Object.keys(selectedMissingUsers.value).filter(key => selectedMissingUsers.value[key]),
+      } as ExcuteRequest,
+      onResponseError({ response }) {
+        switch (response.status) {
+          case 400: {
+            toast.add({
+              title: $t('bulk.status.error'),
+              description: $t('bulk.execute.failed'),
+              color: 'error',
+              icon: 'i-lucide-circle-x',
+            })
+            break
+          }
+          case 403: {
+            showError({
+              status: 403,
+              statusText: 'Forbidden',
+              message: $t('error-page.forbidden.bulk-edit'),
+            })
+            break
+          }
+          default:{
+            handleFetchError({ response })
+            break
+          }
+        }
+      },
+    })
+    if (historyId && taskId) {
+      properties.onNext?.({ taskId, historyId })
     }
   }
   catch {
-    useToast().add({
-      title: $t('bulk.status.error'),
-      description: $t('bulk.execute.failed'),
-      color: 'error',
-      icon: 'i-lucide-circle-x',
-    })
-  }
-  finally {
-    isProcessing.value = false
+    // Already handled in onResponseError
   }
 }
 
 const handlePrevious = () => {
-  emit('prev')
+  properties.onPrevious?.()
 }
 
 const selectAllMissingUsers = () => {
   selectedMissingUsers.value = Object.fromEntries(
-    missingUsers.value.map(user => [user.id, true]),
+    validationResults.value?.missingUsers.map(user => [user.id, true]) ?? [],
   )
 }
 
 const deselectAllMissingUsers = () => {
   selectedMissingUsers.value = {}
 }
-
-const totalCount = computed(() => data.value.total)
-const indicators = useBulkIndicators
 </script>
 
 <template>
   <div class="space-y-6">
     <UAlert
-      v-if="summary.error > 0" color="error" icon="i-lucide-alert-circle"
+      v-if="validationResults?.summary && validationResults.summary.error > 0"
+      color="error" icon="i-lucide-alert-circle"
       :as="$t('bulk.validation.error')" :description="$t('bulk.validation.error-detail')"
     />
 
@@ -132,16 +203,16 @@ const indicators = useBulkIndicators
     </div>
 
     <BulkUserTable
-      :data="validationResults" :total-count="totalCount"
+      :data="validationResults?.results ?? []" :total-count="totalCount ?? 0"
       :page-info="pageInfo" :offset="offset"
       :title="$t('bulk.validation.results')"
     />
 
-    <div v-if="missingUsers.length > 0" variant="outline">
+    <div v-if="validationResults?.missingUsers.length ?? 0 > 0" variant="outline">
       <div class="flex items-center justify-between">
         <div class="flex items-center gap-2">
           <h3 class="font-semibold">
-            {{ $t('bulk.missing_user') }} ({{ missingUsers.length }})
+            {{ $t('bulk.missing_user') }} ({{ validationResults?.missingUsers.length ?? 0 }})
           </h3>
         </div>
         <div class="flex items-center gap-2">
@@ -170,7 +241,8 @@ const indicators = useBulkIndicators
 
       <div class="space-y-2">
         <div
-          v-for="user in missingUsers" :key="user.id" class="flex items-center gap-3 p-3
+          v-for="user in validationResults?.missingUsers" :key="user.id"
+          class="flex items-center gap-3 p-3
             rounded-lg border cursor-pointer hover:bg-elevated/50 transition-colors"
           :class="selectedMissingUsers[user.id]
             ? 'border-error bg-error/5' : 'border-default'"
@@ -200,12 +272,11 @@ const indicators = useBulkIndicators
     <div class="flex justify-between">
       <UButton
         :label="$t('button.back')" color="neutral" variant="outline" icon="i-lucide-arrow-left"
-        :disabled="isProcessing" @click="handlePrevious"
+        loading-auto @click="handlePrevious"
       />
       <UButton
         :label="$t('bulk.upload.execute')" icon="i-lucide-arrow-right" trailing
-        :loading="isProcessing"
-        :disabled="!canProceed || isProcessing" @click="handleNext"
+        loading-auto :disabled="!canProceed" @click="handleNext"
       >
         <template v-if="!canProceed" #trailing>
           <UTooltip :text="$t('bulk.validation.fix_error')">
diff --git a/src/app/components/history/HistoryFilter.vue b/src/app/components/history/HistoryFilter.vue
index 4113213e..27a66acf 100644
--- a/src/app/components/history/HistoryFilter.vue
+++ b/src/app/components/history/HistoryFilter.vue
@@ -14,7 +14,6 @@ const {
   updateQuery,
   isFiltered,
   makeHistoryFilters,
-  loading,
 } = useHistoryFilter()
 
 const { handleFetchError } = useErrorHandling()
@@ -70,10 +69,6 @@ const { repositoryFilter, groupFilter, userFilter, operatorFilter }
     />
   </div>
 
-  <div v-if="loading" class="text-sm text-muted mb-2">
-    {{ $t('common.loading') }}
-  </div>
-
   <div class="grid grid-cols-1 md:grid-cols-3 gap-4 mt-4">
     <UPopover :popper="{ placement: 'bottom-start' }">
       <UInput
diff --git a/src/app/components/history/HistoryTable.vue b/src/app/components/history/HistoryTable.vue
index b8b129b3..835b59a2 100644
--- a/src/app/components/history/HistoryTable.vue
+++ b/src/app/components/history/HistoryTable.vue
@@ -9,14 +9,17 @@ interface Properties<T> {
     showStatus?: boolean
   }
   columns: TableColumn<T, unknown>[]
+  childData?: DownloadHistoryData[]
   pageInfo: string
   offset: number
   fileAvailabilityCheck?: (data: DownloadHistoryData) => boolean
+  loadMoreChildren?: (row: DownloadHistoryData) => void
 }
 defineProps<Properties<T>>()
 
 const { pageSize, pageNumber, updateQuery } = useHistory()
 const { table: { pageSize: { history: pageOptions } } } = useAppConfig()
+const isRowExpandable = (row: DownloadHistoryData) => row.childrenCount && row.childrenCount > 0
 </script>
 
 <template>
@@ -41,6 +44,8 @@ const { table: { pageSize: { history: pageOptions } } } = useAppConfig()
     :columns="columns"
     row-key="id"
     :loading="false"
+    :expandable="isRowExpandable"
+    @expand="loadMoreChildren"
   >
     <template #empty>
       <UEmpty
@@ -48,6 +53,17 @@ const { table: { pageSize: { history: pageOptions } } } = useAppConfig()
         :title="$t('history.empty-data')"
       />
     </template>
+    <template #expanded>
+      <div v-if="tableConfig?.enableExpand && childData">
+        <div
+          v-for="child in childData"
+          :key="child.id"
+          class="pl-8 py-2 border-b last:border-b-0 bg-gray-50"
+        >
+          <div>{{ child.timestamp }} ({{ child.operator }})</div>
+        </div>
+      </div>
+    </template>
   </UTable>
 
   <div class="grid grid-cols-3 items-center">
diff --git a/src/app/composables/useBulk.ts b/src/app/composables/useBulk.ts
index 475dcbe5..1948c8d3 100644
--- a/src/app/composables/useBulk.ts
+++ b/src/app/composables/useBulk.ts
@@ -3,12 +3,9 @@
  */
 import { UBadge, UIcon } from '#components'
 
-import type { FetchError } from 'ofetch'
 import type { BadgeProps, TableColumn } from '@nuxt/ui'
 
-const toast = useToast()
-
-const useBulk = <T extends UploadResult | ValidationResult>() => {
+const useBulk = <T extends EachResult>() => {
   const currentStep = ref<'upload' | 'validate' | 'result'>('upload')
 
   const { t: $t } = useI18n()
@@ -46,13 +43,11 @@ const useBulk = <T extends UploadResult | ValidationResult>() => {
   const pageSize = ref(query.value.l)
   const pageNumber = ref(query.value.p)
   const sortOrder = ref(query.value.d)
-  const makePageInfo = (result: Ref<ResultSummary | undefined>) => {
-    return computed(() => {
-      const start = result.value?.offset ?? 1
-      const total = result.value?.total ?? 0
-      const end = Math.min(start + pageSize.value!, total)
-      return `${start} - ${end} / ${total}`
-    })
+  const makePageInfo = (result: Ref<ExecuteResults | ValidationResults | undefined>) => {
+    const start = result.value?.offset ?? 1
+    const total = result.value?.total ?? 0
+    const end = Math.min(start + pageSize.value!, total)
+    return `${start} - ${end} / ${total}`
   }
 
   const makeStatusFilters = () => {
@@ -159,6 +154,7 @@ const useBulk = <T extends UploadResult | ValidationResult>() => {
     sortOrder,
     columns,
     makePageInfo,
+    makeIndicators,
     updateQuery,
     makeStatusFilters,
   }
@@ -174,209 +170,74 @@ const useUserUpload = () => {
   }
 }
 
-const useValidation = ({ taskId, selectedRepository }: { taskId: Ref<string | undefined>
+type IndicatorColor = 'success' | 'info' | 'error' | 'warning'
+interface Indicator {
+  title: string
+  icon: string
+  number: number
+  color: IndicatorColor
+  key: string
+}
+
+const makeIndicators = (summary: ValidationResults | ExecuteResults | undefined): Indicator[] => [
+  {
+    title: $t('bulk.status.create'),
+    icon: 'i-lucide-plus-circle',
+    number: summary?.summary.create ?? 0,
+    color: 'success',
+    key: 'create',
+  },
+  {
+    title: $t('bulk.status.update'),
+    icon: 'i-lucide-pencil',
+    number: summary?.summary.update ?? 0,
+    color: 'info',
+    key: 'update',
+  },
+  {
+    title: $t('bulk.status.delete'),
+    icon: 'i-lucide-trash-2',
+    number: summary?.summary.delete ?? 0,
+    color: 'error',
+    key: 'delete',
+  },
+  {
+    title: $t('bulk.status.skip'),
+    icon: 'i-lucide-minus-circle',
+    number: summary?.summary.skip ?? 0,
+    color: 'warning',
+    key: 'skip',
+  },
+  {
+    title: $t('bulk.status.error'),
+    icon: 'i-lucide-circle-x',
+    number: summary?.summary.error ?? 0,
+    color: 'error',
+    key: 'error',
+  },
+]
+
+const useValidation = ({ taskId }: { taskId: Ref<string | undefined>
   selectedRepository: Ref<string | undefined> }) => {
   const { query } = useBulk()
-  const validationResults = ref<ValidationResult[]>([])
-  const missingUsers = ref<MissingUser[]>([])
 
   const selectedMissingUsers = useState<Record<string, boolean>>(
     `selection-missing-users:${taskId}`, () => ({}),
   )
-  const fetchValidationResults = (url: string) => {
-    return useFetch<ResultSummary>(url, {
-      method: 'GET',
-      query,
-      lazy: true,
-      server: false,
-      onResponseError({ response }) {
-        switch (response.status) {
-          case 400: { {
-            toast.add({
-              title: $t('bulk.status.error'),
-              description: $t('bulk.validation.fetch_failed'),
-              color: 'error',
-              icon: 'i-lucide-circle-x',
-            }) }
-          break
-          }
-          default:{
-            handleFetchError({ response })
-            break
-          }
-        }
-      },
-    })
-  }
   const selectedCount = computed(() => {
     return Object.values(selectedMissingUsers.value).filter(value => value === true).length
   })
   const toggleSelection = (userId: string) => {
     selectedMissingUsers.value[userId] = !selectedMissingUsers.value[userId]
   }
-  const temporaryFileId = ref<string | undefined>(undefined)
-  const summary = ref({
-    create: 0, update: 0, delete: 0, skip: 0, error: 0,
-  })
-
-  const { handleFetchError } = useErrorHandling()
-  const executeBulkUpdate = async (url: string) => {
-    if (!taskId || !selectedRepository.value) {
-      throw new Error('Missing required data')
-    }
-    try {
-      const results = await $fetch<BulkProcessingStatus>(url, {
-        method: 'POST',
-        body: {
-          tempFileId: temporaryFileId.value,
-          repositoryId: selectedRepository.value,
-          deleteUsers:
-          Object.keys(selectedMissingUsers.value).filter(key => selectedMissingUsers.value[key]),
-        } as ExcuteRequest,
-      })
-      return results
-    }
-    catch (error) {
-      handleFetchError({ response: (error as FetchError).response! })
-      return { taskId: undefined, historyId: undefined }
-    }
-  }
-
-  const useBulkIndicators = computed<BulkIndicator[]>(() => [
-    {
-      title: $t('bulk.status.create'),
-      icon: 'i-lucide-plus-circle',
-      number: summary.value.create ?? 0,
-      color: 'success',
-      key: 'create',
-    },
-    {
-      title: $t('bulk.status.update'),
-      icon: 'i-lucide-pencil',
-      number: summary.value.update ?? 0,
-      color: 'info',
-      key: 'update',
-    },
-    {
-      title: $t('bulk.status.delete'),
-      icon: 'i-lucide-trash-2',
-      number: summary.value.delete ?? 0,
-      color: 'error',
-      key: 'delete',
-    },
-    {
-      title: $t('bulk.status.skip'),
-      icon: 'i-lucide-minus-circle',
-      number: summary.value.skip ?? 0,
-      color: 'warning',
-      key: 'skip',
-    },
-    {
-      title: $t('bulk.status.error'),
-      icon: 'i-lucide-circle-x',
-      number: summary.value.error ?? 0,
-      color: 'error',
-      key: 'error',
-    },
-  ])
 
   return {
-    useBulkIndicators,
     query,
-    validationResults,
-    missingUsers,
     selectedMissingUsers,
     selectedCount,
-    summary,
     taskId,
-    temporaryFileId,
-    fetchValidationResults,
-    executeBulkUpdate,
     toggleSelection,
   }
 }
 
-const useExecuteUpload = () => {
-  const { query } = useBulk()
-  const uploadResult = ref<ResultSummary | undefined>(undefined)
-  const { handleFetchError } = useErrorHandling()
-  const fetchUploadResult = async (url: string) => {
-    const { data, execute } = await useFetch<ResultSummary>(url, {
-      method: 'GET',
-      query,
-      lazy: true,
-      server: false,
-      onResponseError({ response }) {
-        switch (response.status) {
-          case 400: {
-            toast.add({
-              title: $t('bulk.status.error'),
-              description: $t('bulk.execute.result_failed'),
-              color: 'error',
-              icon: 'i-lucide-circle-x',
-            })
-            break
-          }
-          default: {
-            handleFetchError({ response })
-            break
-          }
-        }
-      },
-    })
-    return { uploadResult: data, execute }
-  }
-
-  const resultSummary = computed(() => ({
-    create: uploadResult.value!.summary.create,
-    update: uploadResult.value!.summary.update,
-    delete: uploadResult.value!.summary.delete,
-    skip: uploadResult.value!.summary.skip,
-    error: uploadResult.value!.summary.error,
-  }))
-
-  const useBulkIndicators = computed<BulkIndicator[]>(() => [
-    {
-      title: $t('bulk.status.create'),
-      icon: 'i-lucide-plus-circle',
-      number: resultSummary.value.create ?? 0,
-      color: 'success',
-      key: 'create',
-    },
-    {
-      title: $t('bulk.status.update'),
-      icon: 'i-lucide-pencil',
-      number: resultSummary.value.update ?? 0,
-      color: 'info',
-      key: 'update',
-    },
-    {
-      title: $t('bulk.status.delete'),
-      icon: 'i-lucide-trash-2',
-      number: resultSummary.value.delete ?? 0,
-      color: 'error',
-      key: 'delete',
-    },
-    {
-      title: $t('bulk.status.skip'),
-      icon: 'i-lucide-minus-circle',
-      number: resultSummary.value.skip ?? 0,
-      color: 'warning',
-      key: 'skip',
-    },
-    {
-      title: $t('bulk.status.error'),
-      icon: 'i-lucide-circle-x',
-      number: resultSummary.value.error ?? 0,
-      color: 'error',
-      key: 'error',
-    },
-  ])
-  return {
-    uploadResult,
-    useBulkIndicators,
-    fetchUploadResult,
-    resultSummary,
-  }
-}
-export { useBulk, useUserUpload, useValidation, useExecuteUpload }
+export { useBulk, useUserUpload, useValidation }
diff --git a/src/app/composables/useHistory.ts b/src/app/composables/useHistory.ts
index 5d10224a..78149059 100644
--- a/src/app/composables/useHistory.ts
+++ b/src/app/composables/useHistory.ts
@@ -6,9 +6,8 @@ import type { Row } from '@tanstack/table-core'
 import type { CalendarDate } from '@internationalized/date'
 import type { DropdownMenuItem, TableColumn } from '@nuxt/ui'
 
-const toast = useToast()
-
 const useHistory = () => {
+  const toast = useToast()
   const route = useRoute()
   const { t: $t } = useI18n()
   const { currentUser } = useAuth()
@@ -26,39 +25,10 @@ const useHistory = () => {
   const sortOrder = computed(() => query.value.d)
   const pageNumber = ref(query.value.p)
   const pageSize = ref(query.value.l)
-  const loading = ref(false)
-  const downloadGroups = ref<DownloadGroupItem[]>([])
-  const uploadRows = ref<UploadHistoryData[]>([])
   const totalItems = ref<number>(0)
-  const fileExistsCache = ref<Map<string, boolean>>(new Map())
-
-  const checkFileExists = async (fileId: string): Promise<boolean> => {
-    if (fileExistsCache.value.has(fileId)) {
-      return fileExistsCache.value.get(fileId)!
-    }
-
-    try {
-      const result = await $fetch<boolean>(`/api/history/files/${fileId}/exists`)
-      fileExistsCache.value.set(fileId, result)
-      return result
-    }
-    catch {
-      fileExistsCache.value.set(fileId, false)
-      return false
-    }
-  }
-
-  const preloadFileExistence = async (items: DownloadHistoryData[]) => {
-    const fileIds = items
-      .filter(item => item.fileId)
-      .map(item => item.fileId!)
-
-    await Promise.all(fileIds.map(id => checkFileExists(id)))
-  }
 
   const isFileAvailable = (data: DownloadHistoryData): boolean => {
-    if (!data.fileId) return false
-    return fileExistsCache.value.get(data.fileId) ?? true
+    return data.fileExists
   }
 
   const uploadColumns = computed<TableColumn<UploadHistoryData>[]>(() => [
@@ -136,6 +106,24 @@ const useHistory = () => {
   ])
 
   const downloadColumns = computed<TableColumn<DownloadHistoryData>[]>(() => [
+    {
+      id: 'expand',
+      cell: ({ row }) =>
+        h(UButton, {
+          'color': 'neutral',
+          'variant': 'ghost',
+          'icon': 'i-lucide-chevron-down',
+          'square': true,
+          'aria-label': 'Expand',
+          'ui': {
+            leadingIcon: [
+              'transition-transform',
+              row.getIsExpanded() ? 'duration-200 rotate-180' : '',
+            ],
+          },
+          'onClick': () => { row.toggleExpanded() },
+        }),
+    },
     {
       accessorKey: 'timestamp',
       header: () => sortableHeader('timestamp'),
@@ -149,7 +137,21 @@ const useHistory = () => {
       header: () => h(
         'span', { class: 'text-xs text-default font-medium' },
         $t('history.operator')),
-      cell: ({ row }) => row.original.operator.userName,
+      cell: ({ row }) => {
+        const name = row.original.operator.userName
+        const childrenCount = row.original.childrenCount
+        if (childrenCount && childrenCount > 0) {
+          return h('span', { class: 'inline-flex items-center gap-1' }, [
+            name,
+            h(UBadge, {
+              color: 'info',
+              variant: 'soft',
+              class: 'ml-1',
+            }, () => $t('history.re-download-count', { count: childrenCount })),
+          ])
+        }
+        return name
+      },
     },
     { accessorKey: 'users',
       header: () => h(
@@ -168,24 +170,26 @@ const useHistory = () => {
         'span', { class: 'text-xs text-default font-medium' },
         $t('history.re-download')),
       cell: ({ row }) => {
-        return h(UButton, {
-          color: 'primary',
-          variant: 'outline',
-          size: 'sm',
-          onClick: async () => {
-            const data = row.original
-            try {
-              await $fetch(`/api/history/files/${data.fileId}`, { method: 'GET' })
-            }
-            catch {
-              toast.add({
-                title: $t('history.file_not_available'),
-                color: 'error',
-                icon: 'i-lucide-circle-x',
-              })
-            }
-          },
-        }, () => $t('history.re-download'))
+        const data = row.original
+        return isFileAvailable(data)
+          ? h(UButton, {
+              color: 'primary',
+              variant: 'outline',
+              size: 'sm',
+              onClick: async () => {
+                try {
+                  await $fetch(`/api/history/files/${data.fileId}`, { method: 'GET' })
+                }
+                catch {
+                  toast.add({
+                    title: $t('history.file_not_available'),
+                    color: 'error',
+                    icon: 'i-lucide-circle-x',
+                  })
+                }
+              },
+            }, () => $t('history.re-download'))
+          : h('span', { class: 'text-xs text-error' }, $t('history.expired'))
       },
     },
     { accessorKey: 'actions',
@@ -290,43 +294,6 @@ const useHistory = () => {
       },
     ]
   }
-  const { handleFetchError } = useErrorHandling()
-  const loadChildren = async (
-    parentId: string,
-  ) => {
-    const { data } = await useFetch<DownloadApiModel>('/api/history/download', {
-      method: 'GET',
-      query: {
-        i: [parentId],
-      },
-      onResponseError({ response }) {
-        switch (response.status) {
-          case 400: { {
-            toast.add({
-              title: $t('bulk.status.error'),
-              description: $t('bulk.execute.result_failed'),
-              color: 'error',
-              icon: 'i-lucide-circle-x',
-            }) }
-          break
-          }
-          default:{
-            handleFetchError({ response })
-            break
-          }
-        }
-      },
-    })
-
-    const items: DownloadHistoryData[] = data.value?.resources ?? []
-
-    const group = downloadGroups.value.find(g => g.parent.id === parentId)
-    if (!group) return
-
-    group.children = [...group.children, ...items]
-    const totalChildCount = group.parent.childrenCount ?? group.children.length
-    group.hasMoreChildren = group.children.length < totalChildCount
-  }
 
   const togglePublicStatus = async (
     id: string,
@@ -334,11 +301,13 @@ const useHistory = () => {
   ) => {
     const body = { public: !currentPublic }
     try {
-      const result = await $fetch<boolean>(`/api/history/${tab.value}/${id}/public-status`, {
-        method: 'PUT',
-        body,
-      })
-      return result
+      const result
+        = await $fetch<PublicStatusUpdateRequest>(`/api/history/${tab.value}/${id}/public-status`,
+          {
+            method: 'PUT',
+            body,
+          })
+      return result.public
     }
     catch {
       toast.add({
@@ -360,12 +329,9 @@ const useHistory = () => {
   }
 
   return {
-    loading,
     tab,
     uploadColumns,
     downloadColumns,
-    downloadGroups,
-    uploadRows,
     totalItems,
     sortOrder,
     pageNumber,
@@ -373,8 +339,6 @@ const useHistory = () => {
     query,
     makePageInfo,
     updateQuery,
-    loadChildren,
-    preloadFileExistence,
     togglePublicStatus,
     isFileAvailable,
   }
@@ -558,11 +522,9 @@ const useHistoryFilter = () => {
   const targetLabel = computed(() =>
     tab.value === 'download' ? $t('history.target', 1) : $t('history.target', 2),
   )
-  const loading = ref(false)
 
   return {
     query,
-    loading,
     tab,
     isFiltered,
     updateQuery,
diff --git a/src/app/i18n/locales/en.json b/src/app/i18n/locales/en.json
index 1ea47bcf..04e33403 100644
--- a/src/app/i18n/locales/en.json
+++ b/src/app/i18n/locales/en.json
@@ -21,7 +21,8 @@
     },
     "execute": {
       "failed": "User update failed",
-      "result_failed": "Failed to get execution results"
+      "result_failed": "Failed to get execution results",
+      "timeout": "Bulk update process timed out"
     },
     "file-format-error": "The file format is not supported. \nChoose TSV, CSV, or Excel file.",
     "file-required": "Please select file",
@@ -36,6 +37,7 @@
       "select": "Please select the user to delete."
     },
     "missing_user": "User not included in file",
+    "no-results": "data not found",
     "operator": "Execution user",
     "repository-required": "Please select a repository",
     "select-repository": "Please select a repository",
@@ -67,9 +69,11 @@
     "validation": {
       "error": "Invalid data detected",
       "error-detail": "Please correct the file and upload it again.",
+      "failed": "File validation failed",
       "fetch_failed": "Failed to obtain verification results",
       "fix_error": "Please fix the error",
-      "results": "data preview"
+      "results": "data preview",
+      "timeout": "File validation timed out"
     },
     "view-all": "Show all"
   },
@@ -104,7 +108,13 @@
     }
   },
   "error-page": {
+    "failed": {
+      "bulk-validation": "File validation failed",
+      "load-more": "Failed to retrieve download history again"
+    },
     "forbidden": {
+      "bulk-edit": "You do not have permission to work with users of this repository.",
+      "bulk-result": "You do not have permission to view upload history.",
       "group-access": "You do not have permission to access this group.",
       "group-create": "You do not have permission to create groups in the selected repository.",
       "group-delete": "You do not have permission to delete this group.",
@@ -118,6 +128,8 @@
       "user-edit": "You do not have permission to change this user's information."
     },
     "not-found": {
+      "bulk-result": "No matching upload history was found.",
+      "bulk-validation": "File verification results not found",
       "group": "No such group found.",
       "repository": "No such repository found.",
       "user": "No such user found."
@@ -236,6 +248,7 @@
     "failed": "failure",
     "failed-count": "Number of failures",
     "file": "file",
+    "file_not_available": "File download failed",
     "filter": {
       "options_not_found": "Failed to get filter",
       "title": "filter"
@@ -249,7 +262,7 @@
     "progress": "Processing",
     "public": "Make it public",
     "re-download": "re-download",
-    "re-download-count": "Re-DL",
+    "re-download-count": "Re-DL: {count} times",
     "reset": "reset",
     "show-detail": "Show details",
     "status": "status",
@@ -273,6 +286,7 @@
     "table-title": "History list",
     "target": "Download target | Upload target",
     "title": "History",
+    "toggle_public_status_failed": "Failed to update publishing status",
     "unavailable": "Expired",
     "upload": {
       "date": "Upload date and time"
diff --git a/src/app/i18n/locales/ja.json b/src/app/i18n/locales/ja.json
index ae2b16b4..bdab6382 100644
--- a/src/app/i18n/locales/ja.json
+++ b/src/app/i18n/locales/ja.json
@@ -21,7 +21,8 @@
     },
     "execute": {
       "failed": "ユーザーの更新に失敗しました",
-      "result_failed": "実行結果の取得に失敗しました"
+      "result_failed": "実行結果の取得に失敗しました",
+      "timeout": "一括更新処理がタイムアウトしました"
     },
     "file-format-error": "対応していないファイル形式です。TSV、CSV、またはExcelファイルを選択してください。",
     "file-required": "ファイルを選択してください",
@@ -36,6 +37,7 @@
       "select": "削除するユーザーを選択してください。"
     },
     "missing_user": "ファイルに含まれていないユーザー",
+    "no-results": "データが見つかりません",
     "operator": "実行ユーザー",
     "repository-required": "リポジトリを選択してください",
     "select-repository": "リポジトリを選択してください",
@@ -67,9 +69,11 @@
     "validation": {
       "error": "不正なデータが検出されました",
       "error-detail": "ファイルを修正して再度アップロードしてください。",
+      "failed": "ファイルの検証に失敗しました",
       "fetch_failed": "検証結果の取得に失敗しました",
       "fix_error": "エラーを修正してください",
-      "results": "データプレビュー"
+      "results": "データプレビュー",
+      "timeout": "ファイルの検証がタイムアウトしました"
     },
     "view-all": "すべて表示"
   },
@@ -94,7 +98,13 @@
     "loading": "読み込み中..."
   },
   "error-page": {
+    "failed": {
+      "bulk-validation": "ファイルの検証に失敗しました",
+      "load-more": "再ダウンロード履歴の取得に失敗しました"
+    },
     "forbidden": {
+      "bulk-edit": "このリポジトリのユーザーを操作する権限がありません。",
+      "bulk-result": "アップロード履歴を閲覧する権限がありません。",
       "group-access": "このグループにアクセスする権限がありません。",
       "group-create": "選択したリポジトリにグループを作成する権限がありません。",
       "group-delete": "このグループを削除する権限がありません。",
@@ -108,6 +118,8 @@
       "user-edit": "このユーザーの情報を変更する権限がありません。"
     },
     "not-found": {
+      "bulk-result": "該当するアップロード履歴が見つかりません。",
+      "bulk-validation": "ファイルの検証結果が見つかりません",
       "group": "該当するグループが見つかりません。",
       "repository": "該当するリポジトリが見つかりません。",
       "user": "該当するユーザーが見つかりません。"
@@ -221,6 +233,7 @@
     "failed": "失敗",
     "failed-count": "失敗件数",
     "file": "ファイル",
+    "file_not_available": "ファイルのダウンロードに失敗しました",
     "filter": {
       "options_not_found": "フィルターの取得に失敗しました",
       "title": "フィルター"
@@ -234,7 +247,7 @@
     "progress": "処理中",
     "public": "公開にする",
     "re-download": "再ダウンロード",
-    "re-download-count": "再DL",
+    "re-download-count": "再DL: {count}回",
     "reset": "リセット",
     "show-detail": "詳細を表示",
     "status": "ステータス",
@@ -258,6 +271,7 @@
     "table-title": "履歴一覧",
     "target": "ダウンロード対象 | アップロード対象",
     "title": "履歴",
+    "toggle_public_status_failed": "公開状態の更新に失敗しました",
     "unavailable": "期限切れ",
     "upload": {
       "date": "アップロード日時"
diff --git a/src/app/pages/bulk/index.vue b/src/app/pages/bulk/index.vue
index 579a7885..da3b7510 100644
--- a/src/app/pages/bulk/index.vue
+++ b/src/app/pages/bulk/index.vue
@@ -4,9 +4,12 @@ const selectedRepository = ref<string | undefined>(undefined)
 provide('selectedRepository', selectedRepository)
 const taskId = ref<string | undefined>(undefined)
 provide('taskId', taskId)
+const temporaryFileId = ref<string | undefined>(undefined)
+provide('temporaryFileId', temporaryFileId)
 
-const onValidateComplete = (taskIdValue: string) => {
-  taskId.value = taskIdValue
+const onValidateComplete = (data: BulkProcessingStatus) => {
+  taskId.value = data.taskId
+  temporaryFileId.value = data.tempFileId
   currentStep.value = 'validate'
 }
 
diff --git a/src/app/pages/history/index.vue b/src/app/pages/history/index.vue
index a4dcb225..6ae256e9 100644
--- a/src/app/pages/history/index.vue
+++ b/src/app/pages/history/index.vue
@@ -2,10 +2,12 @@
 import type { TabsItem } from '@nuxt/ui'
 
 const {
-  loading, query, makePageInfo, updateQuery, loadChildren, togglePublicStatus,
+  query, makePageInfo, updateQuery,
   tab, uploadColumns, downloadColumns, isFileAvailable,
 } = useHistory()
 
+const childData = ref<DownloadApiModel>()
+
 const tabItems = computed<TabsItem[]>(() => [
   { label: $t('history.tab.download'), icon: 'i-lucide-download', slot: 'download',
     value: 'download' },
@@ -13,7 +15,7 @@ const tabItems = computed<TabsItem[]>(() => [
 ])
 
 const { handleFetchError } = useErrorHandling()
-const { data } = useFetch<DownloadApiModel | UploadApiModel>(`/api/history/${tab.value}`, {
+const { data, execute } = useFetch<DownloadApiModel | UploadApiModel>(`/api/history/${tab.value}`, {
   method: 'GET',
   query,
   onResponseError: async ({ response }) => {
@@ -30,6 +32,7 @@ const activeTab = computed<'download' | 'upload'>({
   },
   set(tab) {
     updateQuery({ tab: tab })
+    execute()
   },
 })
 
@@ -37,37 +40,30 @@ const toggleSort = () => {
   updateQuery({ d: query.value.d === 'asc' ? 'desc' : 'asc' })
 }
 
-const handleLoadMoreChildren = async (parentId: string) => {
-  await loadChildren(parentId)
-}
-
-const handleAction = async (action: string, row: ActionRow) => {
-  const isDownload = 'parent' in row
-  const data = isDownload ? row.parent : row
-
-  switch (action) {
-    case 'toggle-public': {
-      const result = await togglePublicStatus(
-        data.id,
-        data.public,
-      )
-      if (result !== undefined) {
-        data.public = result
+const handleLoadMoreChildren = async (row: DownloadHistoryData) => {
+  const { data } = await useFetch<DownloadApiModel>('/api/history/download', {
+    method: 'GET',
+    query: {
+      i: [row.id],
+    },
+    onResponseError({ response }) {
+      switch (response.status) {
+        case 400: {
+          showError({
+            status: 400,
+            statusText: 'Bad Request',
+            message: $t('error-page.failed.load-more'),
+          })
+          break
+        }
+        default:{
+          handleFetchError({ response })
+          break
+        }
       }
-      break
-    }
-    case 'redownload': {
-      if (data.fileId) {
-        const url = `/api/history/files/${data.fileId}`
-        window.open(url, '_blank')
-      }
-      break
-    }
-    case 'show-detail': {
-      navigateTo(`/bulk/${data.id}`)
-      break
-    }
-  }
+    },
+  })
+  childData.value = data.value
 }
 </script>
 
@@ -88,19 +84,16 @@ const handleAction = async (action: string, row: ActionRow) => {
       <div class="container mx-auto px-4">
         <HistoryFilter target="download" />
 
-        <div v-if="loading" class="text-center text-sm text-muted">
-          {{ $t('common.loading') }}
-        </div>
-        <div v-else>
+        <div>
           <HistoryTable
             key="download-table" :data="(data?.resources ?? []) as DownloadHistoryData[]"
             :total="data?.total ?? 0"
             :table-config="{ enableExpand: true, showStatus: false }"
             :file-availability-check="isFileAvailable"
             :page-info="pageInfo" :offset="offset"
+            :child-data="childData?.resources ?? []"
             :columns="downloadColumns"
             @sort-change="toggleSort"
-            @action="handleAction"
             @load-more-children="handleLoadMoreChildren"
           />
         </div>
@@ -111,18 +104,13 @@ const handleAction = async (action: string, row: ActionRow) => {
       <div class="container mx-auto px-4">
         <HistoryFilter target="upload" />
 
-        <div v-if="loading" class="text-center text-sm text-muted">
-          {{ $t('common.loading') }}
-        </div>
-        <div v-else>
+        <div>
           <HistoryTable
             key="upload-table" :data="(data?.resources ?? []) as UploadHistoryData[]"
             :total="data?.total ?? 0"
             :table-config="{ enableExpand: false, showStatus: true }"
-            :file-availability-check="isFileAvailable"
             :page-info="pageInfo" :offset="offset"
             :columns="uploadColumns"
-            @action="handleAction"
             @sort-change="toggleSort"
           />
         </div>
diff --git a/src/app/types/bulks.ts b/src/app/types/bulks.ts
index 39c4a92a..2baf26a7 100644
--- a/src/app/types/bulks.ts
+++ b/src/app/types/bulks.ts
@@ -1,6 +1,6 @@
 type StatusType = 'create' | 'update' | 'delete' | 'skip' | 'error'
 
-interface ValidationResult {
+interface EachResult {
   row: number
   id: string
   status: StatusType
@@ -18,8 +18,8 @@ interface MissingUser {
   groups: string[]
 }
 
-interface ValidationSummary {
-  items: ValidationResult[]
+interface ValidationResults {
+  results: EachResult[]
   summary: Summary
   missingUsers: MissingUser[]
   total: number
@@ -27,17 +27,6 @@ interface ValidationSummary {
   pageSize: number
 }
 
-interface UploadResult {
-  row: number
-  id: string
-  status: StatusType
-  userName: string
-  eppn: string[]
-  emails: string[]
-  groups: string[]
-  code?: string
-}
-
 interface Summary {
   create: number
   update: number
@@ -46,8 +35,8 @@ interface Summary {
   error: number
 }
 
-interface ResultSummary {
-  results: UploadResult[]
+interface ExecuteResults {
+  results: EachResult[]
   summary: Summary
   fileInfo: {
     fileName: string
@@ -92,6 +81,7 @@ interface BulkIndicator {
   icon: string
   key: StatusType
 }
-export type { StatusType, ValidationResult, MissingUser, UploadResult, Summary, ExcuteResponse,
-  BulkProcessingStatus, ValidationSummary, ResultSummary, ExcuteRequest, UploadQuery, BulkIndicator,
+export type { StatusType, EachResult, MissingUser, Summary, ExcuteResponse,
+  BulkProcessingStatus, ValidationResults, ExecuteResults, ExcuteRequest,
+  UploadQuery, BulkIndicator,
 }
diff --git a/src/app/types/history.ts b/src/app/types/history.ts
index 352788cc..e8a7471a 100644
--- a/src/app/types/history.ts
+++ b/src/app/types/history.ts
@@ -9,6 +9,7 @@ interface DownloadHistoryData {
   parentId: string | undefined
   filePath: string
   fileId: string
+  fileExists: boolean
   repositoryCount: number
   groupCount: number
   userCount: number
@@ -56,13 +57,6 @@ interface HistoryQuery {
   i?: string[]
 }
 
-interface DownloadGroupItem {
-  parent: DownloadHistoryData
-  children: DownloadHistoryData[]
-  hasMoreChildren: boolean
-  childrenLimit: number
-}
-
 interface TableConfig {
   enableExpand?: boolean
   showStatus?: boolean
@@ -89,8 +83,8 @@ interface PublicStatusUpdateRequest {
   public: boolean
 }
 
-type ActionRow = DownloadGroupItem | UploadHistoryData
+type ActionRow = DownloadHistoryData | UploadHistoryData
 
 export type { DownloadHistoryData, UploadHistoryData, DownloadApiModel, UploadApiModel,
   HistoryQuery, TableConfig, FilterOptionsResponse, SelectOption, StatusConfig,
-  PublicStatusUpdateRequest, ActionRow, DownloadGroupItem }
+  PublicStatusUpdateRequest, ActionRow }
diff --git a/src/server/api/bulk.py b/src/server/api/bulk.py
index 7ebcf9ae..87387b8f 100644
--- a/src/server/api/bulk.py
+++ b/src/server/api/bulk.py
@@ -4,17 +4,15 @@
 
 """API router for bulk endpoints."""
 
-import typing as t
-
 from pathlib import Path
 from uuid import UUID, uuid7
 
-from flask import Blueprint
-from flask_login import current_user
+from flask import Blueprint, Response, current_app, send_file
+from flask_login import current_user, login_required
 from flask_pydantic import validate
 from redis.exceptions import ConnectionError as RedisConnectionError
 
-from server.api.helpers import validate_files
+from server.api.helpers import roles_required
 from server.api.schemas import (
     BulkBody,
     ErrorResponse,
@@ -23,18 +21,24 @@
     UploadFiles,
     UploadQuery,
 )
+from server.auth import is_user_logged_in
 from server.config import config
-from server.entities.bulk import ResultSummary, ValidateSummary
-from server.entities.login_user import LoginUser
-from server.exc import RecordNotFound
-from server.services import bulks, history_table
+from server.const import DEFAULT_SEARCH_COUNT, USER_ROLES
+from server.entities.bulk import ExecuteResults, ValidateResults
+from server.exc import InvalidExportError, RecordNotFound
+from server.services import bulks, history_table, repositories
+from server.services.utils import get_permitted_repository_ids
+
+
+STATUS_MAP = {0: "create", 1: "update", 2: "delete", 3: "skip", 4: "error"}
 
 
 bp = Blueprint("bulk", __name__)
 
 
 @bp.post("/upload-file")
-@validate_files
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
 @validate(response_by_alias=True)
 def upload_file(
     form: TargetRepository, files: UploadFiles
@@ -49,11 +53,20 @@ def upload_file(
         BulkBody: The response containing task ID
         ErrorResponse: The response containing task ID or error message.
     """
+    if repositories.get_by_id(form.repository_id) is None:
+        error = f"Repository not found: {form.repository_id}"
+        current_app.logger.error(error)
+        return ErrorResponse(code="", message=error), 404
+    if (
+        not is_user_logged_in(current_user)
+        or form.repository_id not in get_permitted_repository_ids()
+    ):
+        error = f"User does not have permission for repository: {form.repository_id}"
+        current_app.logger.error(error)
+        return ErrorResponse(code="", message=error), 403
     temp_id = uuid7()
     temp_dir = Path(config.STORAGE.local.temporary)
     original_filename = files.bulk_file.filename or "upload_file"
-    operator_id = t.cast("LoginUser", current_user).map_id
-    operator_name = t.cast("LoginUser", current_user).user_name
     new_filename = f"{temp_id}_{Path(original_filename).name}"
     file_path = temp_dir / new_filename
     files.bulk_file.save(str(file_path))
@@ -62,6 +75,8 @@ def upload_file(
         file_id=temp_id, file_path=str(file_path), file_content=file_content
     )
 
+    operator_id = current_user.map_id
+    operator_name = current_user.user_name
     bulks.delete_temporary_file.apply_async((str(temp_id),), countdown=3600)
     task = bulks.validate_upload_data.apply_async(
         (operator_id, operator_name, temp_id),
@@ -71,6 +86,8 @@ def upload_file(
 
 
 @bp.get("/validate/status/<string:task_id>")
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
 @validate(response_by_alias=True)
 def validate_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
     """Get the status of a validation task.
@@ -94,11 +111,13 @@ def validate_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
 
 
 @bp.get("/validate/result/<string:task_id>")
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
 @validate(response_by_alias=True)
 def validate_result(
     query: UploadQuery,
     task_id: str,
-) -> tuple[ValidateSummary | ErrorResponse, int]:
+) -> tuple[ValidateResults | ErrorResponse, int]:
     """Get the result of a validation task.
 
     Args:
@@ -117,29 +136,31 @@ def validate_result(
     if not res:
         error = f"Task not found: {task_id}"
         return ErrorResponse(code="", message=error), 404
-    if not res.successful():
-        error = f"Task not successful: {task_id}"
+    if not isinstance(res.result, UUID) or not res.successful():
+        error = f"Task failed: {res.result}"
         return ErrorResponse(code="", message=error), 400
     history_id = res.result
-    if isinstance(history_id, BaseException):
-        error = f"Task resulted in an exception: {history_id}"
-        return ErrorResponse(code="", message=error), 400
-    status_filter = (
-        [
-            {0: "create", 1: "update", 2: "delete", 3: "skip", 4: "error"}[status]
-            for status in query.f
-        ]
-        if query.f
-        else []
-    )
+    status_filter = [STATUS_MAP[status] for status in query.f] if query.f else []
     offset = query.p or 1
-    size = query.l or 20
-    return bulks.get_validate_result(
-        history_id=history_id, status_filter=status_filter, offset=offset, size=size
-    ), 200
+    size = query.l or DEFAULT_SEARCH_COUNT
+    try:
+        if not is_user_logged_in(
+            current_user
+        ) or not bulks.chack_permission_to_operation(history_id, current_user.map_id):
+            error = f"User does not have permission for history: {history_id}"
+            current_app.logger.error(error)
+            return ErrorResponse(code="", message=error), 403
+        result = bulks.get_validate_result(
+            history_id=history_id, status_filter=status_filter, offset=offset, size=size
+        )
+    except RecordNotFound as exc:
+        return ErrorResponse(code="", message=str(exc)), 404
+    return result, 200
 
 
 @bp.post("/execute")
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
 @validate(response_by_alias=True)
 def execute(body: ExcuteRequest) -> tuple[BulkBody | ErrorResponse, int]:
     """Execute a bulk upload.
@@ -155,6 +176,12 @@ def execute(body: ExcuteRequest) -> tuple[BulkBody | ErrorResponse, int]:
     """
     try:
         history_id = history_table.get_history_by_file_id(body.temp_file_id).id
+        if not is_user_logged_in(
+            current_user
+        ) or not bulks.chack_permission_to_operation(history_id, current_user.map_id):
+            error = f"User does not have permission for history: {history_id}"
+            current_app.logger.error(error)
+            return ErrorResponse(code="", message=error), 403
         task = bulks.update_users.apply_async(
             kwargs={
                 "history_id": history_id,
@@ -168,7 +195,9 @@ def execute(body: ExcuteRequest) -> tuple[BulkBody | ErrorResponse, int]:
 
 
 @bp.get("/execute/status/<string:task_id>")
-@validate()
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
+@validate(response_by_alias=True)
 def execute_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
     """Get the status of an execution task.
 
@@ -191,10 +220,12 @@ def execute_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
 
 
 @bp.get("/result/<string:history_id>")
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
 @validate(response_by_alias=True)
 def result(
     history_id: UUID, query: UploadQuery
-) -> tuple[ResultSummary | ErrorResponse, int]:
+) -> tuple[ExecuteResults | ErrorResponse, int]:
     """Get the result of a bulk upload.
 
     Args:
@@ -202,20 +233,17 @@ def result(
         query(UploadQuery): Query parameters for filtering results.
 
     Returns:
-        ResultSummary: Summary of displayed history If the get is successful
+        ExecuteResults: Summary of displayed history If the get is successful
         ErrorResponse: If the get is failed
     """
-    status_filter = (
-        [
-            {0: "create", 1: "update", 2: "delete", 3: "skip", 4: "error"}[status]
-            for status in query.f
-        ]
-        if query.f
-        else []
-    )
+    status_filter = [STATUS_MAP[status] for status in query.f] if query.f else []
     offset = query.p or 1
-    size = query.l or 10
+    size = query.l or DEFAULT_SEARCH_COUNT
     try:
+        if not bulks.chack_permission_to_view(history_id):
+            error = f"User does not have permission for history: {history_id}"
+            current_app.logger.error(error)
+            return ErrorResponse(code="", message=error), 403
         result = bulks.get_upload_result(
             history_id=history_id, status_filter=status_filter, offset=offset, size=size
         )
@@ -223,3 +251,24 @@ def result(
         return ErrorResponse(code="", message=str(exc)), 404
 
     return result, 200
+
+
+@bp.get("/user-export")
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
+@validate(response_by_alias=True)
+def user_export(user_ids: list[str]) -> Response | tuple[ErrorResponse, int]:
+    """Export users to a file for bulk processing.
+
+    Args:
+        user_ids (list[str]): The IDs of the users to export.
+
+    Returns:
+        Response: The response containing the exported file
+        ErrorResponse: The response containing an error message if the export fails
+    """
+    try:
+        files = bulks.make_export_file(user_ids)
+    except InvalidExportError as exc:
+        return ErrorResponse(code="", message=str(exc)), 500
+    return send_file(files)
diff --git a/src/server/entities/bulk.py b/src/server/entities/bulk.py
index d7b034e2..38fbcd78 100644
--- a/src/server/entities/bulk.py
+++ b/src/server/entities/bulk.py
@@ -35,13 +35,13 @@ class RepositoryMember(BaseModel):
     """The users belonging to the repository."""
 
 
-class ValidateSummary(BaseModel):
+class ValidateResults(BaseModel):
     """Model for summary of bulk validation result."""
 
-    results: list[CheckResult]
+    results: list[EachResult]
     """The list of validation results for each user."""
 
-    summary: HistorySummary
+    summary: ResultSummary
     """The summary of the validation operation."""
 
     missing_user: list[UserDetail] = []
@@ -51,7 +51,7 @@ class ValidateSummary(BaseModel):
     """Configure camelCase aliasing and forbid extra fields."""
 
 
-class HistorySummary(BaseModel):
+class ResultSummary(BaseModel):
     """Summary of the history operation."""
 
     create: int
@@ -69,7 +69,7 @@ class HistorySummary(BaseModel):
     """Configure camelCase aliasing and forbid extra fields."""
 
 
-class CheckResult(BaseModel):
+class EachResult(BaseModel):
     """Model for result of validation check for each user."""
 
     id: str | None
@@ -97,13 +97,13 @@ class CheckResult(BaseModel):
     """Configure camelCase aliasing and forbid extra fields."""
 
 
-class ResultSummary(BaseModel):
+class ExecuteResults(BaseModel):
     """Model for summary of bulk upload result."""
 
-    items: list[CheckResult]
+    items: list[EachResult]
     """The list of upload results for each user."""
 
-    summary: HistorySummary
+    summary: ResultSummary
     """The summary of the upload operation."""
 
     file_id: UUID
@@ -147,7 +147,7 @@ class Aggregated(t.TypedDict):
     summary: dict[str, int]
     """Summary of the aggregation."""
 
-    results: list[CheckResult]
+    results: list[EachResult]
     """List of check results."""
 
     missing_user: list[UserDetail]
diff --git a/src/server/entities/history_detail.py b/src/server/entities/history_detail.py
index 9a4c5108..58312570 100644
--- a/src/server/entities/history_detail.py
+++ b/src/server/entities/history_detail.py
@@ -46,6 +46,9 @@ class DownloadHistoryData(BaseModel):
     file_path: str
     """Path of the downloaded file."""
 
+    file_exists: bool = False
+    """Indicates if the downloaded file still exists."""
+
     repository_count: int
     """Number of repositories involved in the download."""
 
diff --git a/src/server/exc.py b/src/server/exc.py
index 8ae452f2..79c21a67 100644
--- a/src/server/exc.py
+++ b/src/server/exc.py
@@ -172,3 +172,17 @@ class FileValidationError(BulkOperationError):
 
     Errors caused by validation failures during bulk operations.
     """
+
+
+class FileNotFound(BulkOperationError):  # noqa: N818
+    """Exception for file not found errors in bulk operations.
+
+    Errors caused by missing files during bulk operations.
+    """
+
+
+class InvalidExportError(BulkOperationError):
+    """Exception for invalid export errors.
+
+    Errors caused by issues during export operations.
+    """
diff --git a/src/server/services/bulks.py b/src/server/services/bulks.py
index 628ecddf..984eb1f9 100644
--- a/src/server/services/bulks.py
+++ b/src/server/services/bulks.py
@@ -5,6 +5,7 @@
 """Services for managing bulk."""
 
 import csv
+import io
 import re
 import typing as t
 
@@ -24,14 +25,14 @@
 
 from server.clients import bulks
 from server.config import config
-from server.const import ValidationEntity
+from server.const import USER_ROLES, ValidationEntity
 from server.entities.bulk import (
-    CheckResult,
-    HistorySummary,
+    EachResult,
+    ExecuteResults,
     RepositoryMember,
     ResultSummary,
     UserAggregated,
-    ValidateSummary,
+    ValidateResults,
 )
 from server.entities.bulk_request import BulkOperation
 from server.entities.map_error import MapError
@@ -39,19 +40,24 @@
 from server.entities.map_user import EPPN, Email, Group, MapUser
 from server.entities.patch_request import RemoveOperation
 from server.entities.summaries import GroupSummary
-from server.entities.user_detail import UserDetail
+from server.entities.user_detail import RepositoryRole, UserDetail
 from server.exc import (
+    FileNotFound,
     FileValidationError,
+    InvalidExportError,
     OAuthTokenError,
     RecordNotFound,
     ResourceInvalid,
-    ResourceNotFound,
     UnexpectedResponseError,
 )
+from server.services.utils.permissions import (
+    get_permitted_repository_ids,
+    is_current_user_system_admin,
+)
 
 from . import groups, history_table, users, utils
 from .token import get_access_token, get_client_secret
-from .utils import session_required
+from .utils import detect_affiliations, session_required
 
 
 @shared_task()
@@ -76,8 +82,12 @@ def validate_upload_data(
 
     data, new_data = build_user_from_file(file_path)
 
-    updata_users: list[UserDetail] = build_user_detail_from_dict(data).root
-    create_users: list[UserDetail] = build_user_detail_from_dict_by_name(new_data).root
+    updata_users: list[UserDetail] = build_user_detail_from_dict(
+        data, repository_id
+    ).root
+    create_users: list[UserDetail] = build_user_detail_from_dict_by_name(
+        new_data, repository_id
+    ).root
     updata_users_id = {u.id for u in updata_users if u.id is not None}
     missing_users = _get_missing_users(repository_member, updata_users_id)
     repo_user_by_id = _get_repo_user_by_id(repository_member, updata_users_id)
@@ -86,7 +96,7 @@ def validate_upload_data(
         updata_users, create_users, repository_member, repo_user_by_id
     )
 
-    results = ValidateSummary(
+    results = ValidateResults(
         results=check_results, summary=summary, missing_user=missing_users
     )
     return history_table.create_upload(
@@ -132,42 +142,51 @@ def build_user_from_file(
             - The second dictionary contains new user data keyed by user name.
 
     Raises:
-        ResourceNotFound: If the file does not exist.
+        FileValidationError: If the file does not exist.
     """
     try:
         gen = _read_file(file_path)
-    except (ResourceInvalid, ResourceNotFound) as e:
+    except (FileValidationError, FileNotFound) as e:
         current_app.logger.error(e)
-        raise ResourceNotFound(str(e)) from e
+        raise FileValidationError(str(e)) from e
     it = next(gen)
-    header = [("" if h is None else str(h).strip()) for h in next(it)]
-    _ = next(it)
-    id_idx = header.index("id")
-    idx_of = {name: i for i, name in enumerate(header)}
 
     data = defaultdict(lambda: defaultdict(list))
     new_data = defaultdict(lambda: defaultdict(list))
-    for row in it:
-        if row is None:
+
+    idx_of = {}
+    id_idx = None
+    user_name_idx = None
+    header_row_index = 1
+
+    for i, row in enumerate(it):
+        if i == header_row_index + 1 or row is None:
             continue
-        r = list(row)
 
-        rid = r[id_idx]
-        if not rid:
+        if i == 0:
+            _ = (str(h).strip() if h is not None else "" for h in row)
+
+        if i == header_row_index:
+            header = [str(h).strip() if h is not None else "" for h in row]
+            idx_of = {name: idx for idx, name in enumerate(header)}
+            id_idx = idx_of.get("id")
             user_name_idx = idx_of.get("user_name")
-            if user_name_idx is None:
-                continue
-            user_name_value = r[user_name_idx]
-            bucket = new_data[user_name_value]
-            for col, j in idx_of.items():
-                if col != "user_name":
-                    bucket[col].append(r[j])
             continue
 
-        bucket = data[rid]
+        r = list(row)
+        rid = r[id_idx] if id_idx is not None else None
+
+        if rid:
+            bucket = data[rid]
+            exclude = {"id"}
+        else:
+            user_name_value = r[user_name_idx] if user_name_idx else None
+            bucket = new_data[user_name_value]
+            exclude = {"user_name"}
         for col, j in idx_of.items():
-            if col != "id":
+            if col not in exclude:
                 bucket[col].append(r[j])
+
     return dict(data), dict(new_data)
 
 
@@ -179,13 +198,13 @@ def _read_file(file_path: str) -> t.Generator:
 
 
     Raises:
-        ResourceNotFound: If the file does not exist.
-        ResourceInvalid : If the format is unsupported or parsing fails.
+        FileNotFound: If the file does not exist.
+        FileValidationError : If the format is unsupported or parsing fails.
     """
     path = Path(file_path)
     if not path.exists():
         error = f"{path}: File not found."
-        raise ResourceNotFound(error)
+        raise FileNotFound(error)
 
     iterator = None
     suffix = path.suffix.lower()
@@ -201,13 +220,13 @@ def _read_file(file_path: str) -> t.Generator:
             iterator = ws.iter_rows(values_only=True)
     if iterator is None:
         error = f"{path.suffix}: Unsupported file format."
-        raise ResourceInvalid(error)
+        raise FileValidationError(error)
 
     yield iterator
 
 
 def build_user_detail_from_dict(
-    data: dict[str, dict[str, list[str]]],
+    data: dict[str, dict[str, list[str]]], repository_id: str
 ) -> UserAggregated:
     """Build UserAggregated from a dictionary of user data.
 
@@ -215,6 +234,7 @@ def build_user_detail_from_dict(
         data (dict[str, dict[str, list[str]]]):
             A dictionary where the key is the user ID and the value is another
             dictionary containing user attributes.
+        repository_id (str): The ID of the repository to which the users belong.
 
     Returns:
         UserAggregated:
@@ -237,6 +257,11 @@ def build_user_detail_from_dict(
             if preferred_language_list is not None and len(preferred_language_list) > 0
             else ""
         )
+        str_role = columns.get("role")
+        role = str_role[0] if str_role and len(str_role) > 0 else None
+        repository_roles: list[RepositoryRole] = [
+            RepositoryRole(id=repository_id, user_role=_resolve_non_sysadmin_role(role))
+        ]
 
         eppns: set[str] = set(columns.get("edu_person_principal_names[]") or [])
         emails: set[str] = set(columns.get("emails[]") or [])
@@ -263,6 +288,7 @@ def build_user_detail_from_dict(
                 user_name=user_name,
                 emails=emails,
                 preferred_language=preferred_language,
+                repository_roles=repository_roles,
                 groups=groups,
             )
         )
@@ -271,7 +297,7 @@ def build_user_detail_from_dict(
 
 
 def build_user_detail_from_dict_by_name(
-    data: dict[str, dict[str, list[str]]],
+    data: dict[str, dict[str, list[str]]], repository_id: str
 ) -> UserAggregated:
     """Build UserAggregated from a dictionary of user data.
 
@@ -279,6 +305,7 @@ def build_user_detail_from_dict_by_name(
         data (dict[str, dict[str, list[str]]]):
             A dictionary where the key is the user name and the value is another
             dictionary containing user attributes.
+        repository_id (str): The ID of the repository to which the users belong.
 
     Returns:
         UserAggregated:
@@ -303,6 +330,11 @@ def build_user_detail_from_dict_by_name(
 
         gid_list: list[str] = list(columns.get("groups[].id") or [])
         gname_list: list[str] = list(columns.get("groups[].name") or [])
+        str_role = columns.get("role")
+        role = str_role[0] if str_role and len(str_role) > 0 else None
+        repository_roles: list[RepositoryRole] = [
+            RepositoryRole(id=repository_id, user_role=_resolve_non_sysadmin_role(role))
+        ]
         groups: list[GroupSummary] = []
         seen = set()
         for gid, gname in zip_longest(gid_list, gname_list, fillvalue=None):
@@ -323,6 +355,7 @@ def build_user_detail_from_dict_by_name(
                 user_name=user_name,
                 emails=emails,
                 preferred_language=preferred_language,
+                repository_roles=repository_roles,
                 groups=groups,
             )
         )
@@ -330,6 +363,20 @@ def build_user_detail_from_dict_by_name(
     return UserAggregated(root=users)
 
 
+def _resolve_non_sysadmin_role(role: str | None) -> USER_ROLES | None:
+    if role is None:
+        return None
+
+    value_to_member = {m.value: m for m in USER_ROLES}
+
+    member = value_to_member.get(role)
+
+    if member is None or member is USER_ROLES.SYSTEM_ADMIN:
+        return None
+
+    return member
+
+
 def _get_missing_users(
     repository_member: RepositoryMember, file_users_id: set[str]
 ) -> list[UserDetail]:
@@ -363,13 +410,13 @@ def _build_check_results(
     create_users: list[UserDetail],
     repository_member: RepositoryMember,
     repo_user_by_id: dict[str, UserDetail],
-) -> tuple[list[CheckResult], HistorySummary]:
+) -> tuple[list[EachResult], ResultSummary]:
     count_create = 0
     count_update = 0
     count_delete = 0
     count_skip = 0
     count_error = 0
-    check_results: list[CheckResult] = []
+    check_results: list[EachResult] = []
     for u in create_users:
         code = None
         user_group_ids = {g.id for g in u.groups} if u.groups else set()
@@ -377,7 +424,7 @@ def _build_check_results(
         if not user_group_ids.issubset(repository_member.groups):
             code = "Group ID does not exist"
             check_results.append(
-                CheckResult(
+                EachResult(
                     id=u.id,
                     eppn=u.eppns or [],
                     user_name=u.user_name,
@@ -393,7 +440,7 @@ def _build_check_results(
         if not _check_value(u):
             code = "Invalid user data"
             check_results.append(
-                CheckResult(
+                EachResult(
                     id=u.id,
                     eppn=u.eppns or [],
                     user_name=u.user_name,
@@ -407,7 +454,7 @@ def _build_check_results(
             continue
 
         check_results.append(
-            CheckResult(
+            EachResult(
                 id=u.id,
                 eppn=u.eppns or [],
                 user_name=u.user_name,
@@ -436,7 +483,7 @@ def _build_check_results(
             count_skip += 1
         code = _check_immutable_attributes(repo_user, u)
         check_results.append(
-            CheckResult(
+            EachResult(
                 id=u.id,
                 eppn=repo_user.eppns or [],
                 user_name=repo_user.user_name,
@@ -446,7 +493,7 @@ def _build_check_results(
                 code=code,
             )
         )
-    summary = HistorySummary(
+    summary = ResultSummary(
         create=count_create,
         update=count_update,
         delete=count_delete,
@@ -467,7 +514,7 @@ def _check_value(user: UserDetail) -> bool:
     """
     if not user.id:
         return False
-    if not re.compile(r"^[A-Za-z0-9]{1,50}$").fullmatch(user.id):
+    if not re.compile(r"^[A-Za-z0-9._-]{1,50}$").fullmatch(user.id):
         return False
     return len(user.user_name) <= ValidationEntity.USER_NAME_MAX_LENGTH
 
@@ -484,22 +531,20 @@ def _check_immutable_attributes(
     Returns:
         str | None: The name of the immutable attribute if found, None otherwise.
     """
+    if original.user_name != update_user.user_name:
+        return "user_name is immutable"
     if original.emails != update_user.emails:
-        return "emails"
+        return "emails are immutable"
     if original.eppns != update_user.eppns:
-        return "eppns"
+        return "eppns are immutable"
     if original.preferred_language != update_user.preferred_language:
-        return "preferred_language"
-    if original.last_modified != update_user.last_modified:
-        return "last_modified"
-    if original.created != update_user.created:
-        return "created"
+        return "preferred_language is immutable"
     return None
 
 
 def get_validate_result(
     history_id: UUID, status_filter: list[str], offset: int, size: int
-) -> ValidateSummary:
+) -> ValidateResults:
     """Get the validation result summary for the specified upload history ID.
 
     Args:
@@ -514,11 +559,11 @@ def get_validate_result(
     results = history_table.get_paginated_upload_results(
         history_id, offset, size, status_filter
     )
-    check_results = [CheckResult.model_validate(it) for it in results]
+    check_results = [EachResult.model_validate(it) for it in results]
 
     summary = history_table.get_upload_results(history_id, "summary")
     missing_user = history_table.get_upload_results(history_id, "missingUser")
-    return ValidateSummary.model_validate({
+    return ValidateResults.model_validate({
         "results": check_results,
         "summary": summary,
         "missingUser": missing_user or [],
@@ -529,36 +574,37 @@ def get_validate_result(
 
 @shared_task()
 def update_users(
-    history_id: UUID, temp_file_id: UUID, delete_users: list[str] | None
+    history_id: UUID, temp_file_id: UUID, remove_users: list[str] | None
 ) -> UUID:
     """Perform bulk update of users based on the validation results.
 
     Args:
         history_id (UUID): The ID of the upload history.
         temp_file_id (UUID): The ID of the temporary file.
-        delete_users (list[str] | None): The list of user IDs to be deleted.
+        remove_users (list[str] | None):
+          The list of user IDs to be removed by repository.
 
     Returns:
         UUID: The ID of the upload history record.
 
     Raises:
-        ResourceNotFound: If the upload history does not exist.
+        FileNotFound: If the upload history does not exist.
         requests.RequestException: If there is an error communicating with mAP Core API.
         ValidationError: If there is an error parsing the response from mAP Core API.
         OAuthTokenError: If there is an issue with the access token.
         UnexpectedResponseError: If there is an unexpected response from mAP Core API.
-        ResourceInvalid: If there is an invalid resource error from mAP Core API.
         FileValidationError: If there are errors in the validation results.
+        ResourceInvalid: If there is a resource invalid error from mAP Core API.
     """
     upload_data = history_table.get_upload_by_id(history_id)
     if not upload_data:
         error = f"History not found: {history_id}"
         current_app.logger.error(error)
-        raise ResourceNotFound(error)
+        raise FileNotFound(error)
 
     # file content must contain at least one repository.
     repository_id = upload_data.file.file_content["repositories"][0]["id"]
-    check_results: list[CheckResult] = upload_data.results.get("results", [])
+    check_results: list[EachResult] = upload_data.results.get("results", [])
 
     summary = upload_data.results.get("summary", {})
     if summary.get("error", 1) > 0:
@@ -567,7 +613,7 @@ def update_users(
         raise FileValidationError(error)
 
     bulk_ops, count_delete = _build_bulk_operations_from_check_results(
-        repository_id, check_results, delete_users
+        repository_id, check_results, remove_users
     )
     summary.update({"delete": count_delete})
 
@@ -636,25 +682,25 @@ def save_file(temp_file_id: UUID) -> UUID:
         UUID: The ID of the saved permanent file.
 
     Raises:
-        ResourceNotFound: If the temporary file does not exist.
-        ResourceInvalid: If the file format is invalid.
+        FileNotFound: If the temporary file does not exist.
+        FileValidationError: If the file format is invalid.
     """
     try:
         files = history_table.get_file_by_id(temp_file_id)
         repository_id = files.file_content["repositories"][0]["id"]
     except (KeyError, AttributeError) as e:
         current_app.logger.error("Failed to retrieve temporary file: %s", temp_file_id)
-        raise ResourceNotFound(str(e)) from e
+        raise FileNotFound(str(e)) from e
 
     file_path = Path(files.file_path)
     if file_path.parent != Path(config.STORAGE.local.temporary):
         return files.id
     if not file_path.exists():
         error_msg = f"File not found: {file_path}"
-        raise ResourceNotFound(error_msg)
+        raise FileNotFound(error_msg)
     if file_path.suffix not in {".csv", ".tsv", ".xlsx"}:
         error = "not supported file format."
-        raise ResourceInvalid(error)
+        raise FileValidationError(error)
 
     target_dir = Path(config.STORAGE.local.storage) / datetime.now(UTC).strftime(
         "%Y/%m"
@@ -668,7 +714,7 @@ def save_file(temp_file_id: UUID) -> UUID:
     )
 
 
-def build_map_user_from_check_result(user: CheckResult) -> MapUser:
+def build_map_user_from_check_result(user: EachResult) -> MapUser:
     """Build MapUser from CheckResult.
 
     Args:
@@ -718,7 +764,7 @@ def build_remove_user_path(user: UserDetail, repository_id: str) -> BulkOperatio
 
 
 def _build_bulk_operations_from_check_results(
-    repository_id: str, check_results: list[CheckResult], delete_users: list[str] | None
+    repository_id: str, check_results: list[EachResult], remove_users: list[str] | None
 ) -> tuple[list[BulkOperation], int]:
     repository_member = get_repository_member(repository_id)
 
@@ -761,7 +807,7 @@ def _build_bulk_operations_from_check_results(
     ])
 
     delete_user_list = users.search(
-        utils.make_criteria_object("users", i=delete_users), raw=True
+        utils.make_criteria_object("users", i=remove_users), raw=True
     ).resources
 
     group_user_ops = {}
@@ -776,7 +822,7 @@ def _build_bulk_operations_from_check_results(
                 "remove"
             ].add(user.id)
         check_results.append(
-            CheckResult(
+            EachResult(
                 id=user.id,
                 eppn=user.eppns or [],
                 user_name=user.user_name,
@@ -824,7 +870,7 @@ def _build_groups_update_bulk_operations(
 
 def get_upload_result(
     history_id: UUID, status_filter: list[str], offset: int, size: int
-) -> ResultSummary:
+) -> ExecuteResults:
     """Get the bulk operation result summary with filtering and pagination.
 
     Args:
@@ -834,7 +880,7 @@ def get_upload_result(
         offset (int): The offset for pagination.
 
     Returns:
-        ResultSummary: The summary of the bulk operation result.
+        ExecuteResults: The summary of the bulk operation result.
 
     Raises:
         RecordNotFound: If the upload history with the given ID does not exist.
@@ -861,7 +907,7 @@ def get_upload_result(
         "offset": offset,
         "pageSize": size,
     }
-    return ResultSummary.model_validate(payload)
+    return ExecuteResults.model_validate(payload)
 
 
 @shared_task()
@@ -879,3 +925,113 @@ def delete_temporary_file(temp_id: str) -> None:
     if Path(file_path).exists():
         Path(file_path).unlink()
     history_table.delete_file_by_id(temp_file_id)
+
+
+def chack_permission_to_operation(history_id: UUID, operator_id: str) -> bool:
+    """Check if the user has permission to perform bulk operation.
+
+    Args:
+        history_id (UUID): The ID of the upload history.
+        operator_id (str): The ID of the operator.
+
+    Returns:
+        bool: True if the user has permission, False otherwise.
+
+    Raises:
+        RecordNotFound: If the upload history with the given ID does not exist.
+    """
+    upload = history_table.get_upload_by_id(history_id)
+    if not upload:
+        error = f"upload history not found: {history_id}"
+        current_app.logger.error(error)
+        raise RecordNotFound(error)
+    return upload.operator_id == operator_id
+
+
+def chack_permission_to_view(history_id: UUID) -> bool:
+    """Check if the user has permission to view the specified upload history.
+
+    Args:
+        history_id (UUID): The ID of the upload history.
+
+    Returns:
+        bool: True if the user has permission, False otherwise.
+
+    Raises:
+        RecordNotFound: If the upload history with the given ID does not exist.
+    """
+    if is_current_user_system_admin():
+        return True
+    upload = history_table.get_upload_by_id(history_id)
+    if not upload:
+        error = f"upload history not found: {history_id}"
+        current_app.logger.error(error)
+        raise RecordNotFound(error)
+    repository_id = upload.file.file_content["repositories"][0]["id"]
+    return repository_id not in get_permitted_repository_ids() and upload.public
+
+
+def make_export_file(user_ids: list[str]) -> t.BinaryIO:
+    """Generate a file containing user details for the specified user IDs.
+
+    Args:
+        user_ids (list[str]): A list of user IDs to include in the export file.
+
+    Returns:
+        BinaryIO: A binary file-like object containing the exported user details.
+
+    Raises:
+        InvalidExportError: if not have permission to export the user.
+    """
+    output = io.StringIO()
+    writer = csv.writer(output)
+    header = [
+        "id",
+        "user_name",
+        "groups[].id",
+        "groups[].name",
+        "role",
+        "edu_person_principal_names[]",
+        "preferred_language",
+        "emails[]",
+    ]
+    writer.writerow(header)
+    users_list = users.search(
+        utils.make_criteria_object("users", i=user_ids), raw=True
+    ).resources
+    permitted_repository_ids = get_permitted_repository_ids()
+
+    for map_user in users_list:
+        roles, groups = detect_affiliations([g.value for g in map_user.groups or []])
+        if any(role.role == USER_ROLES.SYSTEM_ADMIN for role in roles):
+            error = f"User '{map_user.id}' is a system admin and cannot be exported."
+            raise InvalidExportError(error)
+        if not is_current_user_system_admin() and not any(
+            group.repository_id in permitted_repository_ids for group in groups
+        ):
+            error = f"the current user does not have permission to access user '{map_user.id}'."  # noqa: E501
+            raise InvalidExportError(error)
+
+        group_ids = [g.group_id for g in groups] or [""]
+        roles_list = [r.role.value for r in roles] or [""]
+        eppns = [eppn.value for eppn in map_user.edu_person_principal_names or []]
+        emails = [email.value for email in map_user.emails or []]
+
+        max_len = max(len(group_ids), len(roles_list), len(eppns), len(emails))
+
+        for i in range(max_len):
+            row = [
+                map_user.id,
+                map_user.user_name,
+                group_ids[i] if i < len(group_ids) else group_ids[len(group_ids) - 1],
+                "",  # group name is not exported. it can't be get from mAP Core API search user endpoint  # noqa: E501
+                roles_list[i]
+                if i < len(roles_list)
+                else roles_list[len(roles_list) - 1],
+                eppns[i] if i < len(eppns) else eppns[len(eppns) - 1],
+                map_user.preferred_language or "",
+                emails[i] if i < len(emails) else emails[len(emails) - 1],
+            ]
+            writer.writerow(row)
+
+    return io.BytesIO(output.getvalue().encode("utf-8"))
diff --git a/src/server/services/history.py b/src/server/services/history.py
index bc3789e6..024c1dbd 100644
--- a/src/server/services/history.py
+++ b/src/server/services/history.py
@@ -7,6 +7,7 @@
 import typing as t
 
 from datetime import date, datetime, time, timedelta
+from pathlib import Path
 from types import SimpleNamespace
 from uuid import UUID
 
@@ -14,6 +15,7 @@
 from sqlalchemy import cast, func, or_, select
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import aliased
 
 from server.const import DEFAULT_SEARCH_COUNT
 from server.db.history import DownloadHistory, Files, UploadHistory
@@ -183,9 +185,11 @@ def get_download_history_data(
     count_stmt = select(func.count()).select_from(base_stmt.subquery())
     total = db.session.execute(count_stmt).scalar_one()
 
+    child = aliased(DownloadHistory)
     subq = (
-        select(func.count(DownloadHistory.id))
-        .where(DownloadHistory.parent_id == DownloadHistory.id)
+        select(func.count(child.id))
+        .where(child.parent_id == DownloadHistory.id)
+        .correlate(DownloadHistory)
         .scalar_subquery()
     )
     stmt = base_stmt.add_columns(subq)
@@ -211,6 +215,7 @@ def get_download_history_data(
             "group_count": len(file.file_content.get("groups", [])),
             "user_count": len(file.file_content.get("users", [])),
             "children_count": children_count,
+            "file_exists": Path(file.file_path).exists(),
         }
         for history, file, children_count in t.cast(
             "t.Sequence[tuple[DownloadHistory, Files, int]]", rows
@@ -219,7 +224,7 @@ def get_download_history_data(
     return SearchResult[DownloadHistoryData].model_validate(
         {
             "total": total,
-            "pageSize": page_size,
+            "page_size": page_size,
             "offset": offset,
             "resources": data,
         },

From a2fec70dddafcdd842b5c552b1e3b3b9641bec2a Mon Sep 17 00:00:00 2001
From: ivis-kosaka <nobuyoshi.kosaka@ivis.co.jp>
Date: Mon, 9 Mar 2026 09:43:45 +0000
Subject: [PATCH 2/4] fix: bulk and history view and add log message

---
 configs/server.config.toml                    |  12 +
 src/app/components/bulk/BulkResultStep.vue    |  18 +-
 src/app/components/bulk/BulkUploadStep.vue    |  80 +++--
 src/app/components/bulk/BulkUserTable.vue     |   2 +
 .../components/bulk/BulkValidationStep.vue    |  28 +-
 src/app/components/history/HistoryTable.vue   |   3 +-
 src/app/composables/useBulk.ts                |  92 +++---
 src/app/pages/bulk/[id].vue                   |   2 +-
 src/app/pages/bulk/index.vue                  |   5 +
 src/app/pages/history/index.vue               |  27 +-
 src/server/api/bulk.py                        | 154 ++++------
 src/server/api/history.py                     |  36 +--
 src/server/api/schemas.py                     |  20 ++
 src/server/api/users.py                       |  33 +-
 src/server/clients/groups.py                  |  12 -
 src/server/clients/services.py                |   6 -
 src/server/clients/users.py                   |   6 -
 src/server/config.py                          |  19 ++
 src/server/exc.py                             |  14 +
 src/server/messages/error.py                  | 133 ++++++++
 src/server/messages/info.py                   |  32 ++
 src/server/services/bulks.py                  | 267 +++++++++-------
 src/server/services/history.py                |  99 +++---
 src/server/services/history_table.py          | 287 +++++++++++++-----
 src/server/services/users.py                  | 126 ++++++++
 25 files changed, 1027 insertions(+), 486 deletions(-)

diff --git a/configs/server.config.toml b/configs/server.config.toml
index 6e185bde..b83cca9f 100644
--- a/configs/server.config.toml
+++ b/configs/server.config.toml
@@ -133,6 +133,18 @@ contributor = "{repository_name}投稿ユーザー"
 # It should include '{repository_name}' placeholder.
 general_user = "{repository_name}一般ユーザー"
 
+[users]
+# List of fields to include in the exported user details.
+export_fields = [
+        "id",
+        "user_name",
+        "groups[].id",
+        "groups[].name",
+        "role",
+        "edu_person_principal_names[]",
+        "preferred_language",
+        "emails[]",
+    ]
 
 [map_core]
 # Base URL for the mAP Core service.
diff --git a/src/app/components/bulk/BulkResultStep.vue b/src/app/components/bulk/BulkResultStep.vue
index 7f28da0a..0d1d1f68 100644
--- a/src/app/components/bulk/BulkResultStep.vue
+++ b/src/app/components/bulk/BulkResultStep.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const properties = defineProps<{
   historyId: string
-  taskId: string
+  taskId?: string
 }>()
 
 const { query, makePageInfo, makeIndicators } = useBulk()
@@ -14,6 +14,7 @@ const { data: status, execute: executeStatus }
     {
       method: 'GET',
       lazy: true,
+      immediate: false,
       onResponseError({ response }) {
         switch (response.status) {
           case 404: {
@@ -28,11 +29,16 @@ const { data: status, execute: executeStatus }
       server: false })
 
 const { polling: { interval, maxAttempts } } = useAppConfig()
+const isPolling = ref(false)
 const pollExecuteStatus = async () => {
+  isPolling.value = true
   for (let index = 0; index < maxAttempts; index++) {
     await executeStatus()
     const st = (status.value?.status)
-    if (st === 'SUCCESS') return
+    if (st === 'SUCCESS') {
+      isPolling.value = false
+      return
+    }
     if (st === 'FAILURE') {
       toast.add({
         title: $t('bulk.status.error'),
@@ -40,6 +46,7 @@ const pollExecuteStatus = async () => {
         color: 'error',
         icon: 'i-lucide-circle-x',
       })
+      isPolling.value = false
       return
     }
     await new Promise(r => setTimeout(r, interval))
@@ -50,14 +57,16 @@ const pollExecuteStatus = async () => {
     color: 'error',
     icon: 'i-lucide-circle-x',
   })
+  isPolling.value = false
 }
 
-const { data: executeResult, execute: fetchExecuteResult }
+const { data: executeResult, execute: fetchExecuteResult, status: getResultStatus }
   = await useFetch<ExecuteResults>(`/api/bulk/result/${properties.historyId}`, {
     method: 'GET',
     query,
     lazy: true,
     server: false,
+    immediate: false,
     onResponseError({ response }) {
       switch (response.status) {
         case 403: {
@@ -91,7 +100,7 @@ onMounted(async () => {
 
 const indicators = computed(() => makeIndicators(executeResult.value))
 const fileInfo = computed(() => executeResult.value!.fileInfo)
-const pageInfo = makePageInfo(executeResult)
+const pageInfo = computed(() => makePageInfo(executeResult))
 </script>
 
 <template>
@@ -143,6 +152,7 @@ const pageInfo = makePageInfo(executeResult)
       :page-info="pageInfo"
       :offset="executeResult!.offset"
       :title="$t('bulk.import-results')"
+      :status="isPolling ? 'loading' : getResultStatus "
     />
   </div>
 </template>
diff --git a/src/app/components/bulk/BulkUploadStep.vue b/src/app/components/bulk/BulkUploadStep.vue
index 87c9551e..fa6b7a38 100644
--- a/src/app/components/bulk/BulkUploadStep.vue
+++ b/src/app/components/bulk/BulkUploadStep.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
-import type { FormError, FormSubmitEvent } from '@nuxt/ui'
+import type { FormError, FormErrorEvent, FormSubmitEvent } from '@nuxt/ui'
 
 const emit = defineEmits<{
   next: [data: BulkProcessingStatus]
+  error: [event: FormErrorEvent]
+  update: [repositoryId: string]
 }>()
 
 const { isProcessing } = useUserUpload()
 const { table: { pageSize } } = useAppConfig()
+
 const state = reactive<{
   repository: string | undefined
   file: File | undefined
@@ -57,40 +60,44 @@ const handleNext = async (event: FormSubmitEvent<Schema>) => {
   const formData = new FormData()
   formData.append('bulk_file', event.data.file!)
   formData.append('repository_id', event.data.repository!)
-
-  const { data } = await useFetch<BulkProcessingStatus>('/api/bulk/upload-file', {
-    method: 'POST',
-    body: formData,
-    onResponseError({ response }) {
-      switch (response.status) {
-        case 403: {
-          showError({
-            status: 403,
-            statusText: 'Forbidden',
-            message: $t('error-page.forbidden.bulk-edit'),
-          })
-          break }
-        case 404: {
-          showError({
-            status: 404,
-            statusText: 'Not Found',
-            message: $t('error-page.not-found.repository'),
-          })
-          break
+  try {
+    const data = await $fetch<BulkProcessingStatus>('/api/bulk/upload-file', {
+      method: 'POST',
+      body: formData,
+      onResponseError({ response }) {
+        switch (response.status) {
+          case 403: {
+            showError({
+              status: 403,
+              statusText: 'Forbidden',
+              message: $t('error-page.forbidden.bulk-edit'),
+            })
+            break
+          }
+          case 404: {
+            showError({
+              status: 404,
+              statusText: 'Not Found',
+              message: $t('error-page.not-found.repository'),
+            })
+            break
+          }
+          default: {
+            handleFetchError({ response })
+          }
         }
-        default: {
-          handleFetchError({ response })
-        }
-      }
-    },
-    server: false,
-  })
+        isProcessing.value = false
+      },
+    })
 
-  if (data.value) {
-    emit('next', data.value)
+    if (data) {
+      emit('next', data)
+    }
+  }
+  catch {
+    // Error is handled in onResponseError
   }
 }
-
 const repositorySelect = useTemplateRef('repositorySelect')
 const {
   items: repositoryNames,
@@ -107,6 +114,12 @@ const {
   }),
 })
 setupRepoScroll(repositorySelect)
+
+const { handleFormError } = useFormError()
+const onError = (event: FormErrorEvent) => {
+  handleFormError(event)
+  emit('error', event)
+}
 </script>
 
 <template>
@@ -131,8 +144,9 @@ setupRepoScroll(repositorySelect)
       </template>
     </UAlert>
     <UForm
+      class="space-y-6"
       :validate="validateFileFormat" :state="state"
-      @submit="handleNext"
+      @submit="handleNext" @error="onError"
     >
       <UFormField
         :label="$t('bulk.select-repository')"
@@ -145,7 +159,7 @@ setupRepoScroll(repositorySelect)
           :placeholder="$t('group.placeholder.repository')"
           :items="repositoryNames" :loading="repoSearchStatus === 'pending'" ignore-filter
           :ui="{ base: 'w-full' }"
-          @update:open="onRepoOpen"
+          @update:open="onRepoOpen" @update:model-value="emit('update', state.repository!)"
         />
       </UFormField>
 
diff --git a/src/app/components/bulk/BulkUserTable.vue b/src/app/components/bulk/BulkUserTable.vue
index a6e556c0..b82a33a8 100644
--- a/src/app/components/bulk/BulkUserTable.vue
+++ b/src/app/components/bulk/BulkUserTable.vue
@@ -5,6 +5,7 @@ defineProps<{
   title?: string
   pageInfo?: string
   offset?: number
+  status: string
 }>()
 
 const { updateQuery, pageNumber, pageSize, makeStatusFilters, columns } = useBulk()
@@ -43,6 +44,7 @@ const filterSelects = makeStatusFilters()
   <UTable
     :data="data"
     :columns="columns"
+    :loading="status === 'loading'"
     sticky
   >
     <template #empty>
diff --git a/src/app/components/bulk/BulkValidationStep.vue b/src/app/components/bulk/BulkValidationStep.vue
index 09174547..ed45ca35 100644
--- a/src/app/components/bulk/BulkValidationStep.vue
+++ b/src/app/components/bulk/BulkValidationStep.vue
@@ -24,6 +24,7 @@ const { data: status, execute: getValidateStatus }
       method: 'GET',
       lazy: true,
       server: false,
+      immediate: false,
       onResponseError({ response }) {
         switch (response.status) {
           case 404: {
@@ -41,12 +42,16 @@ const { data: status, execute: getValidateStatus }
         }
       },
     })
-
+const isPolling = ref(false)
 const pollValidationStatus = async () => {
+  isPolling.value = true
   for (let index = 0; index < maxAttempts; index++) {
     await getValidateStatus()
     const st = (status.value?.status)
-    if (st === 'SUCCESS') return
+    if (st === 'SUCCESS') {
+      isPolling.value = false
+      return
+    }
     if (st === 'FAILURE') {
       toast.add({
         title: $t('bulk.status.error'),
@@ -54,6 +59,7 @@ const pollValidationStatus = async () => {
         color: 'error',
         icon: 'i-lucide-circle-x',
       })
+      isPolling.value = false
       return
     }
 
@@ -65,21 +71,24 @@ const pollValidationStatus = async () => {
     color: 'error',
     icon: 'i-lucide-circle-x',
   })
+  isPolling.value = false
 }
 
-const { data: validationResults, execute: getValidateResult }
+const { data: validationResults, execute: getValidateResult, status: getResultStatus }
   = await useFetch<ValidationResults>(`/api/bulk/validate/result/${taskId.value}`, {
     method: 'GET',
     query,
     lazy: true,
     server: false,
+    immediate: false,
     onResponseError({ response }) {
       switch (response.status) {
         case 400: {
-          showError({
-            status: 400,
-            statusText: 'Bad Request',
-            message: $t('error-page.failed.bulk-validation'),
+          toast.add({
+            title: $t('bulk.status.error'),
+            description: $t('bulk.validation.failed'),
+            color: 'error',
+            icon: 'i-lucide-circle-x',
           })
           break
         }
@@ -182,9 +191,6 @@ const deselectAllMissingUsers = () => {
   selectedMissingUsers.value = {}
 }
 
-const totalCount = computed(() => data.value?.total)
-const indicators = useBulkIndicators
-
 const indicatorWrapper = useTemplateRef('indicatorWrapper')
 const { isStuck } = useSticky(indicatorWrapper,
   { baseElementSelector: 'header', spaceRem: 1, fallbackPosition: 64 },
@@ -235,7 +241,7 @@ const { isStuck } = useSticky(indicatorWrapper,
     <BulkUserTable
       :data="validationResults?.results ?? []" :total-count="totalCount ?? 0"
       :page-info="pageInfo" :offset="offset"
-      :title="$t('bulk.validation.results')"
+      :title="$t('bulk.validation.results')" :status="isPolling ? 'loading' : getResultStatus"
     />
 
     <div v-if="validationResults?.missingUsers.length ?? 0 > 0" variant="outline">
diff --git a/src/app/components/history/HistoryTable.vue b/src/app/components/history/HistoryTable.vue
index 835b59a2..41b43d40 100644
--- a/src/app/components/history/HistoryTable.vue
+++ b/src/app/components/history/HistoryTable.vue
@@ -12,6 +12,7 @@ interface Properties<T> {
   childData?: DownloadHistoryData[]
   pageInfo: string
   offset: number
+  status: string
   fileAvailabilityCheck?: (data: DownloadHistoryData) => boolean
   loadMoreChildren?: (row: DownloadHistoryData) => void
 }
@@ -43,7 +44,7 @@ const isRowExpandable = (row: DownloadHistoryData) => row.childrenCount && row.c
     :data="data"
     :columns="columns"
     row-key="id"
-    :loading="false"
+    :loading="status === 'loading'"
     :expandable="isRowExpandable"
     @expand="loadMoreChildren"
   >
diff --git a/src/app/composables/useBulk.ts b/src/app/composables/useBulk.ts
index 1948c8d3..76f5840e 100644
--- a/src/app/composables/useBulk.ts
+++ b/src/app/composables/useBulk.ts
@@ -144,7 +144,52 @@ const useBulk = <T extends EachResult>() => {
       },
     },
   ])
+  type IndicatorColor = 'success' | 'info' | 'error' | 'warning'
+  interface Indicator {
+    title: string
+    icon: string
+    number: number
+    color: IndicatorColor
+    key: string
+  }
 
+  const makeIndicators = (summary: ValidationResults | ExecuteResults | undefined): Indicator[] => [
+    {
+      title: $t('bulk.status.create'),
+      icon: 'i-lucide-plus-circle',
+      number: summary?.summary.create ?? 0,
+      color: 'success',
+      key: 'create',
+    },
+    {
+      title: $t('bulk.status.update'),
+      icon: 'i-lucide-pencil',
+      number: summary?.summary.update ?? 0,
+      color: 'info',
+      key: 'update',
+    },
+    {
+      title: $t('bulk.status.delete'),
+      icon: 'i-lucide-trash-2',
+      number: summary?.summary.delete ?? 0,
+      color: 'error',
+      key: 'delete',
+    },
+    {
+      title: $t('bulk.status.skip'),
+      icon: 'i-lucide-minus-circle',
+      number: summary?.summary.skip ?? 0,
+      color: 'warning',
+      key: 'skip',
+    },
+    {
+      title: $t('bulk.status.error'),
+      icon: 'i-lucide-circle-x',
+      number: summary?.summary.error ?? 0,
+      color: 'error',
+      key: 'error',
+    },
+  ]
   return {
     query,
     currentStep,
@@ -170,53 +215,6 @@ const useUserUpload = () => {
   }
 }
 
-type IndicatorColor = 'success' | 'info' | 'error' | 'warning'
-interface Indicator {
-  title: string
-  icon: string
-  number: number
-  color: IndicatorColor
-  key: string
-}
-
-const makeIndicators = (summary: ValidationResults | ExecuteResults | undefined): Indicator[] => [
-  {
-    title: $t('bulk.status.create'),
-    icon: 'i-lucide-plus-circle',
-    number: summary?.summary.create ?? 0,
-    color: 'success',
-    key: 'create',
-  },
-  {
-    title: $t('bulk.status.update'),
-    icon: 'i-lucide-pencil',
-    number: summary?.summary.update ?? 0,
-    color: 'info',
-    key: 'update',
-  },
-  {
-    title: $t('bulk.status.delete'),
-    icon: 'i-lucide-trash-2',
-    number: summary?.summary.delete ?? 0,
-    color: 'error',
-    key: 'delete',
-  },
-  {
-    title: $t('bulk.status.skip'),
-    icon: 'i-lucide-minus-circle',
-    number: summary?.summary.skip ?? 0,
-    color: 'warning',
-    key: 'skip',
-  },
-  {
-    title: $t('bulk.status.error'),
-    icon: 'i-lucide-circle-x',
-    number: summary?.summary.error ?? 0,
-    color: 'error',
-    key: 'error',
-  },
-]
-
 const useValidation = ({ taskId }: { taskId: Ref<string | undefined>
   selectedRepository: Ref<string | undefined> }) => {
   const { query } = useBulk()
diff --git a/src/app/pages/bulk/[id].vue b/src/app/pages/bulk/[id].vue
index 7c22e0be..0817fe65 100644
--- a/src/app/pages/bulk/[id].vue
+++ b/src/app/pages/bulk/[id].vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const route = useRoute()
 const historyId = computed(() => route.params.id as string)
-const taskId = computed(() => route.query.taskId as string)
+const taskId = computed(() => route.query.taskId as string | undefined)
 
 const { currentStep, items } = useBulk()
 currentStep.value = 'result'
diff --git a/src/app/pages/bulk/index.vue b/src/app/pages/bulk/index.vue
index da3b7510..f0de4475 100644
--- a/src/app/pages/bulk/index.vue
+++ b/src/app/pages/bulk/index.vue
@@ -18,6 +18,10 @@ const onUploadComplete = ({ taskId: taskIdValue, historyId }: ExcuteResponse) =>
   navigateTo(`/bulk/${historyId}?taskId=${taskIdValue}`)
 }
 
+const onSelectRepository = (repositoryId: string) => {
+  selectedRepository.value = repositoryId
+}
+
 const goBackToUpload = () => {
   currentStep.value = 'upload'
 }
@@ -48,6 +52,7 @@ const goBackToUpload = () => {
     <BulkUploadStep
       v-else
       @next="onValidateComplete"
+      @update="onSelectRepository"
     />
   </div>
 </template>
diff --git a/src/app/pages/history/index.vue b/src/app/pages/history/index.vue
index 6ae256e9..f7925717 100644
--- a/src/app/pages/history/index.vue
+++ b/src/app/pages/history/index.vue
@@ -15,16 +15,17 @@ const tabItems = computed<TabsItem[]>(() => [
 ])
 
 const { handleFetchError } = useErrorHandling()
-const { data, execute } = useFetch<DownloadApiModel | UploadApiModel>(`/api/history/${tab.value}`, {
-  method: 'GET',
-  query,
-  onResponseError: async ({ response }) => {
-    handleFetchError({ response })
-  },
-  lazy: true,
-  server: false,
-})
-const pageInfo = makePageInfo(data)
+const { data, execute, status } = useFetch<DownloadApiModel | UploadApiModel>(
+  `/api/history/${tab.value}`, {
+    method: 'GET',
+    query,
+    onResponseError: async ({ response }) => {
+      handleFetchError({ response })
+    },
+    lazy: true,
+    server: false,
+  })
+const pageInfo = computed(() => makePageInfo(data))
 const offset = computed(() => (data.value?.offset ?? 1))
 const activeTab = computed<'download' | 'upload'>({
   get() {
@@ -90,9 +91,10 @@ const handleLoadMoreChildren = async (row: DownloadHistoryData) => {
             :total="data?.total ?? 0"
             :table-config="{ enableExpand: true, showStatus: false }"
             :file-availability-check="isFileAvailable"
-            :page-info="pageInfo" :offset="offset"
+            :page-info="pageInfo.value" :offset="offset"
             :child-data="childData?.resources ?? []"
             :columns="downloadColumns"
+            :status="status"
             @sort-change="toggleSort"
             @load-more-children="handleLoadMoreChildren"
           />
@@ -109,8 +111,9 @@ const handleLoadMoreChildren = async (row: DownloadHistoryData) => {
             key="upload-table" :data="(data?.resources ?? []) as UploadHistoryData[]"
             :total="data?.total ?? 0"
             :table-config="{ enableExpand: false, showStatus: true }"
-            :page-info="pageInfo" :offset="offset"
+            :page-info="pageInfo.value" :offset="offset"
             :columns="uploadColumns"
+            :status="status"
             @sort-change="toggleSort"
           />
         </div>
diff --git a/src/server/api/bulk.py b/src/server/api/bulk.py
index 1ece954c..086d6910 100644
--- a/src/server/api/bulk.py
+++ b/src/server/api/bulk.py
@@ -4,16 +4,28 @@
 
 """API router for bulk endpoints."""
 
-from pathlib import Path
-from uuid import UUID, uuid7
+from uuid import UUID
 
-from flask import Blueprint, Response, current_app, send_file
+from flask import Blueprint, current_app
 from flask_login import current_user, login_required
 from flask_pydantic import validate
-from redis.exceptions import ConnectionError as RedisConnectionError
 
-from server.api.helpers import roles_required
-from server.api.schemas import (
+from server.auth import is_user_logged_in
+from server.const import DEFAULT_SEARCH_COUNT, USER_ROLES
+from server.entities.bulk import ExecuteResults, ValidateResults
+from server.exc import (
+    FileFormatError,
+    FileNotFound,
+    FileValidationError,
+    RecordNotFound,
+    TaskExcutionError,
+)
+from server.messages import E
+from server.services import bulks, history_table, repositories
+from server.services.utils import get_permitted_repository_ids
+
+from .helpers import roles_required, validate_files
+from .schemas import (
     BulkBody,
     BulkFileForm,
     ErrorResponse,
@@ -21,13 +33,6 @@
     TargetRepositoryForm,
     UploadQuery,
 )
-from server.auth import is_user_logged_in
-from server.config import config
-from server.const import DEFAULT_SEARCH_COUNT, USER_ROLES
-from server.entities.bulk import ExecuteResults, ValidateResults
-from server.exc import InvalidExportError, RecordNotFound
-from server.services import bulks, history_table, repositories
-from server.services.utils import get_permitted_repository_ids
 
 
 STATUS_MAP = {0: "create", 1: "update", 2: "delete", 3: "skip", 4: "error"}
@@ -39,6 +44,7 @@
 @bp.post("/upload-file")
 @login_required
 @roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
+@validate_files
 @validate(response_by_alias=True)
 def upload_file(
     form: TargetRepositoryForm, files: BulkFileForm
@@ -54,35 +60,22 @@ def upload_file(
         ErrorResponse: The response containing task ID or error message.
     """
     if repositories.get_by_id(form.repository_id) is None:
-        error = f"Repository not found: {form.repository_id}"
+        error = E.REPOSITORY_NOT_FOUND % {"id": form.repository_id}
         current_app.logger.error(error)
-        return ErrorResponse(code="", message=error), 404
+        return ErrorResponse(message=error), 404
     if (
-        not is_user_logged_in(current_user)
-        or form.repository_id not in get_permitted_repository_ids()
+        not current_user.is_system_admin
+        and form.repository_id not in get_permitted_repository_ids()
     ):
-        error = f"User does not have permission for repository: {form.repository_id}"
+        error = E.REPOSITORY_FORBIDDEN % {"id": form.repository_id}
         current_app.logger.error(error)
-        return ErrorResponse(code="", message=error), 403
-    temp_id = uuid7()
-    temp_dir = Path(config.STORAGE.local.temporary)
-    original_filename = files.bulk_file.filename or "upload_file"
-    new_filename = f"{temp_id}_{Path(original_filename).name}"
-    file_path = temp_dir / new_filename
-    files.bulk_file.save(str(file_path))
-    file_content = {"repositories": [{"id": form.repository_id}]}
-    history_table.create_file(
-        file_id=temp_id, file_path=str(file_path), file_content=file_content
-    )
-
-    operator_id = current_user.map_id
-    operator_name = current_user.user_name
-    bulks.delete_temporary_file.apply_async((str(temp_id),), countdown=3600)
+        return ErrorResponse(message=error), 403
+    temp_file_id = bulks.upload_file(form.repository_id, files.bulk_file)
     task = bulks.validate_upload_data.apply_async(
-        (operator_id, operator_name, temp_id),
+        (current_user.map_id, current_user.user_name, temp_file_id),
         session_required=True,  # pyright: ignore[reportCallIssue]
     )
-    return BulkBody(task_id=task.id, temp_file_id=temp_id), 202
+    return BulkBody(task_id=task.id, temp_file_id=temp_file_id), 200
 
 
 @bp.get("/validate/status/<string:task_id>")
@@ -99,14 +92,11 @@ def validate_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
         BulkBody: The response containing task status
         ErrorResponse: The response containing task status or error message
     """
-    try:
-        res = bulks.validate_upload_data.AsyncResult(task_id)
-    except RedisConnectionError:
-        error = f"Failed to connect to Redis: {task_id}"
-        return ErrorResponse(code="", message=error), 500
+    res = bulks.get_validate_task_result(task_id)
     if not res:
-        error = f"Task not found: {task_id}"
-        return ErrorResponse(code="", message=error), 404
+        error = E.TASK_NOT_FOUND % {"task_id": task_id}
+        current_app.logger.error(error)
+        return ErrorResponse(message=error), 404
     return BulkBody(status=res.state), 200
 
 
@@ -129,32 +119,31 @@ def validate_result(
         ErrorResponse: The response containing validation result or error message.
     """
     try:
-        res = bulks.validate_upload_data.AsyncResult(task_id)
-    except RedisConnectionError:
-        error = f"Failed to connect to Redis: {task_id}"
-        return ErrorResponse(code="", message=error), 500
-    if not res:
-        error = f"Task not found: {task_id}"
-        return ErrorResponse(code="", message=error), 404
-    if not isinstance(res.result, UUID) or not res.successful():
-        error = f"Task failed: {res.result}"
-        return ErrorResponse(code="", message=error), 400
-    history_id = res.result
-    status_filter = [STATUS_MAP[status] for status in query.f] if query.f else []
-    offset = query.p or 1
-    size = query.l or DEFAULT_SEARCH_COUNT
-    try:
+        res = bulks.get_validate_task_result(task_id)
+        match res.result:
+            case FileNotFound():
+                return ErrorResponse(message=res.result.message), 404
+            case FileValidationError() | FileFormatError():
+                return ErrorResponse(message=res.result.message), 400
+            case UUID():
+                pass
+            case _:
+                return ErrorResponse(message=E.UNEXPECTED_SERVER_ERROR), 500
+        history_id = res.result
+        status_filter = [STATUS_MAP[status] for status in query.f] if query.f else []
+        offset = query.p or 1
+        size = query.l or DEFAULT_SEARCH_COUNT
         if not is_user_logged_in(
             current_user
         ) or not bulks.chack_permission_to_operation(history_id, current_user.map_id):
-            error = f"User does not have permission for history: {history_id}"
+            error = E.OPERATION_FORBIDDEN
             current_app.logger.error(error)
-            return ErrorResponse(code="", message=error), 403
+            return ErrorResponse(message=error), 403
         result = bulks.get_validate_result(
             history_id=history_id, status_filter=status_filter, offset=offset, size=size
         )
-    except RecordNotFound as exc:
-        return ErrorResponse(code="", message=str(exc)), 404
+    except (RecordNotFound, TaskExcutionError) as exc:
+        return ErrorResponse(message=exc.message), 404
     return result, 200
 
 
@@ -179,9 +168,9 @@ def execute(body: ExcuteRequest) -> tuple[BulkBody | ErrorResponse, int]:
         if not is_user_logged_in(
             current_user
         ) or not bulks.chack_permission_to_operation(history_id, current_user.map_id):
-            error = f"User does not have permission for history: {history_id}"
+            error = E.OPERATION_FORBIDDEN
             current_app.logger.error(error)
-            return ErrorResponse(code="", message=error), 403
+            return ErrorResponse(message=error), 403
         task = bulks.update_users.apply_async(
             kwargs={
                 "history_id": history_id,
@@ -190,7 +179,7 @@ def execute(body: ExcuteRequest) -> tuple[BulkBody | ErrorResponse, int]:
             },
         )
     except RecordNotFound as exc:
-        return ErrorResponse(code="", message=str(exc)), 404
+        return ErrorResponse(message=exc.message), 404
     return BulkBody(task_id=task.id, history_id=history_id), 200
 
 
@@ -209,13 +198,9 @@ def execute_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
         ErrorResponse: The response containing task status or error message
     """
     try:
-        res = bulks.update_users.AsyncResult(task_id)
-    except RedisConnectionError:
-        error = f"Failed to connect to Redis: {task_id}"
-        return ErrorResponse(code="", message=error), 500
-    if not res:
-        error = f"Task not found: {task_id}"
-        return ErrorResponse(code="", message=error), 404
+        res = bulks.get_execute_task_result(task_id)
+    except TaskExcutionError as exc:
+        return ErrorResponse(message=exc.message), 404
     return BulkBody(status=res.state), 200
 
 
@@ -241,34 +226,13 @@ def result(
     size = query.l or DEFAULT_SEARCH_COUNT
     try:
         if not bulks.chack_permission_to_view(history_id):
-            error = f"User does not have permission for history: {history_id}"
+            error = E.OPERATION_FORBIDDEN
             current_app.logger.error(error)
-            return ErrorResponse(code="", message=error), 403
+            return ErrorResponse(message=error), 403
         result = bulks.get_upload_result(
             history_id=history_id, status_filter=status_filter, offset=offset, size=size
         )
     except RecordNotFound as exc:
-        return ErrorResponse(code="", message=str(exc)), 404
+        return ErrorResponse(message=exc.message), 404
 
     return result, 200
-
-
-@bp.get("/user-export")
-@login_required
-@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
-@validate(response_by_alias=True)
-def user_export(user_ids: list[str]) -> Response | tuple[ErrorResponse, int]:
-    """Export users to a file for bulk processing.
-
-    Args:
-        user_ids (list[str]): The IDs of the users to export.
-
-    Returns:
-        Response: The response containing the exported file
-        ErrorResponse: The response containing an error message if the export fails
-    """
-    try:
-        files = bulks.make_export_file(user_ids)
-    except InvalidExportError as exc:
-        return ErrorResponse(code="", message=str(exc)), 500
-    return send_file(files)
diff --git a/src/server/api/history.py b/src/server/api/history.py
index 2a5c2824..32e0d391 100644
--- a/src/server/api/history.py
+++ b/src/server/api/history.py
@@ -16,7 +16,8 @@
 from server.const import USER_ROLES
 from server.entities.history_detail import HistoryQuery
 from server.entities.search_request import FilterOption, SearchResult
-from server.exc import DatabaseError, InvalidQueryError, RecordNotFound
+from server.exc import InvalidQueryError, RecordNotFound
+from server.messages import E
 from server.services import history
 from server.services.utils import search_history_filter_options
 
@@ -59,8 +60,8 @@ def filter_options_operators(
     """
     try:
         result = history.get_filter_items(tab, key="o", criteria=query)
-    except InvalidQueryError as ex:
-        return ErrorResponse(code="", message=str(ex)), 400
+    except InvalidQueryError as exc:
+        return ErrorResponse(message=exc.message), 400
     return result, 200
 
 
@@ -81,15 +82,10 @@ def get(
         SearchResult: if successful and status code 200
         ErrorResponse: if a connection error occurs and status code 503
     """
-    try:
-        if tab == "download":
-            result = history.get_download_history_data(query)
-        else:
-            result = history.get_upload_history_data(query)
-    except DatabaseError:
-        error = f"{tab} table connection error"
-        current_app.logger.error(error)
-        return ErrorResponse(code="", message=error), 503
+    if tab == "download":
+        result = history.get_download_history_data(query)
+    else:
+        result = history.get_upload_history_data(query)
     return result, 200
 
 
@@ -115,8 +111,8 @@ def public_status(
         result: bool = history.update_public_status(
             tab=tab, history_id=history_id, public=body.public
         )
-    except RecordNotFound as ex:
-        return ErrorResponse(code="", message=str(ex)), 404
+    except RecordNotFound as exc:
+        return ErrorResponse(message=exc.message), 404
     return HistoryPublic(public=result), 200
 
 
@@ -136,12 +132,12 @@ def files(file_id: UUID) -> Response | tuple[ErrorResponse, int]:
     try:
         path_str = history.get_file_path(file_id)
         file_path = Path(path_str)
-    except RecordNotFound as ex:
-        return ErrorResponse(code="", message=str(ex)), 404
+    except RecordNotFound as exc:
+        return ErrorResponse(message=exc.message), 404
     if not file_path.exists():
-        error = f"File not found: {file_id}"
+        error = E.FILE_NOT_FOUND % {"path": file_path}
         current_app.logger.error(error)
-        return ErrorResponse(code="", message=error), 404
+        return ErrorResponse(message=error), 404
     return send_file(path_or_file=file_path)
 
 
@@ -160,8 +156,8 @@ def is_exist_files(file_id: UUID) -> tuple[bool | ErrorResponse, int]:
     """
     try:
         file_path = Path(history.get_file_path(file_id))
-    except RecordNotFound as ex:
-        return ErrorResponse(code="", message=str(ex)), 404
+    except RecordNotFound as exc:
+        return ErrorResponse(message=exc.message), 404
     if not Path(file_path).exists():
         return False, 200
     return True, 200
diff --git a/src/server/api/schemas.py b/src/server/api/schemas.py
index c3e63630..193dfe28 100644
--- a/src/server/api/schemas.py
+++ b/src/server/api/schemas.py
@@ -354,3 +354,23 @@ class UploadQuery(BaseModel):
 
     l: t.Annotated[int | None, "length"] = None  # noqa: E741
     """Page size (number of items per page)."""
+
+
+class FileQuery(BaseModel):
+    """Query parameters for file export."""
+
+    f: t.Annotated[t.Literal["tsv", "csv"], "format"] = "tsv"
+    """File format for export."""
+
+    model_config = ignore_extra_config
+    """Configure to ignore extra fields."""
+
+
+class ExportBody(BaseModel):
+    """Body for user export request."""
+
+    user_ids: list[str]
+    """List of user IDs to export."""
+
+    model_config = camel_case_config
+    """Configure to use camelCase aliasing."""
diff --git a/src/server/api/users.py b/src/server/api/users.py
index 8f24425f..7acf21fa 100644
--- a/src/server/api/users.py
+++ b/src/server/api/users.py
@@ -9,7 +9,7 @@
 import traceback
 import typing as t
 
-from flask import Blueprint, current_app, url_for
+from flask import Blueprint, Response, current_app, send_file, url_for
 from flask_login import current_user, login_required
 from flask_pydantic import validate
 
@@ -18,6 +18,7 @@
 from server.entities.search_request import FilterOption, SearchResult
 from server.entities.user_detail import UserDetail
 from server.exc import (
+    InvalidExportError,
     InvalidFormError,
     InvalidQueryError,
     RequestConflict,
@@ -33,7 +34,7 @@
 
 from .auth import logout
 from .helpers import roles_required
-from .schemas import ErrorResponse, UsersQuery
+from .schemas import ErrorResponse, ExportBody, FileQuery, UsersQuery
 
 
 bp = Blueprint("users", __name__)
@@ -205,3 +206,31 @@ def filter_options() -> list[FilterOption]:
         list[FilterOption]: List of filter options for user search.
     """
     return search_users_options()
+
+
+@bp.get("/export")
+@bp.post("/export")
+@login_required
+@roles_required(USER_ROLES.SYSTEM_ADMIN, USER_ROLES.REPOSITORY_ADMIN)
+@validate(response_by_alias=True)
+def user_export(
+    body: ExportBody, query: FileQuery
+) -> Response | tuple[ErrorResponse, int]:
+    """Export users to a file for bulk processing.
+
+    Args:
+        body (ExportBody):
+            The body of the export request containing the IDs of the users to export.
+        query (FileQuery): The query parameters for the export.
+
+    Returns:
+        Response: The response containing the exported file
+        ErrorResponse: The response containing an error message if the export fails
+    """
+    try:
+        files = users.make_export_file(
+            body.user_ids or [], query, current_user.map_id, current_user.name
+        )
+    except InvalidExportError as exc:
+        return ErrorResponse(message=exc.message), 403
+    return send_file(files)
diff --git a/src/server/clients/groups.py b/src/server/clients/groups.py
index 3b2eac2b..6fca8573 100644
--- a/src/server/clients/groups.py
+++ b/src/server/clients/groups.py
@@ -91,10 +91,6 @@ def search(
         by_alias=True,
     )
 
-    from contrib import dump
-
-    dump(auth_params | attributes_params | query_params, "groups_search_query")
-
     response = requests.get(
         f"{config.MAP_CORE.base_url}{MAP_GROUPS_ENDPOINT}",
         params=auth_params | attributes_params | query_params,
@@ -104,8 +100,6 @@ def search(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "groups_search_response")
-
     if response.status_code > HTTPStatus.BAD_REQUEST:
         response.raise_for_status()
 
@@ -216,10 +210,6 @@ def post(
             alias_generator(name) for name in exclude
         ])
 
-    from contrib import dump
-
-    dump(auth_params | payload, "groups_post_payload")
-
     response = requests.post(
         f"{config.MAP_CORE.base_url}{MAP_GROUPS_ENDPOINT}",
         params=attributes_params,
@@ -230,8 +220,6 @@ def post(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "groups_post_response")
-
     if response.status_code > HTTPStatus.BAD_REQUEST:
         response.raise_for_status()
 
diff --git a/src/server/clients/services.py b/src/server/clients/services.py
index 0dc18ceb..a6c0e4f3 100644
--- a/src/server/clients/services.py
+++ b/src/server/clients/services.py
@@ -214,10 +214,6 @@ def post(
             alias_generator(name) for name in exclude
         ])
 
-    from contrib import dump
-
-    dump({"request": auth_params} | payload, "service_post_payload")
-
     response = requests.post(
         f"{config.MAP_CORE.base_url}{MAP_SERVICES_ENDPOINT}",
         params=attributes_params,
@@ -228,8 +224,6 @@ def post(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "service_post_response")
-
     status_code = response.status_code
     if status_code not in {HTTPStatus.BAD_REQUEST, HTTPStatus.CONFLICT}:
         response.raise_for_status()
diff --git a/src/server/clients/users.py b/src/server/clients/users.py
index 4a4e419f..6f734811 100644
--- a/src/server/clients/users.py
+++ b/src/server/clients/users.py
@@ -91,10 +91,6 @@ def search(
         by_alias=True,
     )
 
-    from contrib import dump
-
-    dump(auth_params | attributes_params | query_params, "users_search_query")
-
     response = requests.get(
         f"{config.MAP_CORE.base_url}{MAP_USERS_ENDPOINT}",
         params=auth_params | attributes_params | query_params,
@@ -104,8 +100,6 @@ def search(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "users_search_response")
-
     if response.status_code > HTTPStatus.BAD_REQUEST:
         response.raise_for_status()
 
diff --git a/src/server/config.py b/src/server/config.py
index efcd5351..f9f6b2d6 100644
--- a/src/server/config.py
+++ b/src/server/config.py
@@ -83,6 +83,9 @@ class RuntimeConfig(BaseSettings):
     GROUPS: GroupsConfig
     """Group related configuration values."""
 
+    USERS: UsersConfig
+    """Users related configuration values."""
+
     POSTGRES: PostgresConfig = Field(
         default_factory=lambda: PostgresConfig(),  # noqa: PLW0108
         exclude=True,
@@ -408,6 +411,22 @@ def __getitem__(self, key: USER_ROLES) -> str:  # noqa: D105
         return getattr(self, key)
 
 
+class UsersConfig(BaseModel):
+    """Schema for user export file configuration."""
+
+    export_fields: list[str] = [
+        "id",
+        "user_name",
+        "groups[].id",
+        "groups[].name",
+        "role",
+        "edu_person_principal_names[]",
+        "preferred_language",
+        "emails[]",
+    ]
+    """List of fields to include in the exported user details."""
+
+
 class MapCoreConfig(BaseModel):
     """Schema for mAP Core service configuration."""
 
diff --git a/src/server/exc.py b/src/server/exc.py
index 8bda90c9..ea1d7b8f 100644
--- a/src/server/exc.py
+++ b/src/server/exc.py
@@ -202,6 +202,20 @@ class FileNotFound(BulkOperationError):  # noqa: N818
     """
 
 
+class FileFormatError(BulkOperationError):
+    """Exception for file format errors in bulk operations.
+
+    Errors caused by invalid file formats during bulk operations.
+    """
+
+
+class FileUploadError(BulkOperationError):
+    """Exception for file upload errors in bulk operations.
+
+    Errors caused by issues during file upload in bulk operations.
+    """
+
+
 class InvalidExportError(BulkOperationError):
     """Exception for invalid export errors.
 
diff --git a/src/server/messages/error.py b/src/server/messages/error.py
index 885c53ed..bb336d6e 100644
--- a/src/server/messages/error.py
+++ b/src/server/messages/error.py
@@ -554,6 +554,20 @@
     "System Administrator.",
 )
 
+USER_CANNOT_EXPORT_SYSTEM_ADMIN = LogMessage(
+    "E361",
+    "System Administrator user is not allowed to be exported.",
+)
+
+USER_FORBIDDEN_EXPORT = LogMessage(
+    "E362",
+    "Logged-in user does not have permission to export a User.",
+)
+
+FAILED_CREATE_DOWNLOAD_HISTORY_RECORD = LogMessage(
+    "E363",
+    "Failed to create download history for file (id: %(file_id)s) in database.",
+)
 
 UNAUTHORIZED = LogMessage(
     "E401",
@@ -576,6 +590,125 @@
     "The server application is currently unavailable.",
 )
 
+FAILED_BULK_OPERATION = LogMessage(
+    "E600",
+    "Failed to perform bulk operation.",
+)
+
+FAILED_SAVE_UPLOADED_FILE = LogMessage(
+    "E601",
+    "Failed to save uploaded file (path: %(file_path)s).",
+)
+
+OPERATION_FORBIDDEN = LogMessage(
+    "E602",
+    "Logged-in user does not have permission to perform this operation.",
+)
+
+FAILED_GET_UPLOAD_HISTORY_RECORD = LogMessage(
+    "E610",
+    "Failed to get upload history (id: %(history_id)s) from database.",
+)
+
+FAILED_GET_UPLOAD_HISTORY_RECORD_BY_FILE_ID = LogMessage(
+    "E611",
+    "Failed to get upload history by file ID (file_id: %(file_id)s) from database.",
+)
+
+FAILED_CREATE_UPLOAD_HISTORY_RECORD = LogMessage(
+    "E612",
+    "Failed to create upload history for file (id: %(file_id)s) in database.",
+)
+
+FAILED_UPDATE_HISTORY_RECORD_STATUS = LogMessage(
+    "E613",
+    "Failed to update upload history status (id: %(history_id)s) in database.",
+)
+
+INVALID_UPLOAD_HISTORY_RECORD_ATTRIBUTES = LogMessage(
+    "E614",
+    "Results must include 'summary' and 'results' keys",
+)
+
+UPDATE_HISTORY_RECORD_NOT_FOUND = LogMessage(
+    "E615",
+    "Record (id: %(id)s) not found in database.",
+)
+
+FAILED_GET_FILE_RECORD = LogMessage(
+    "E616",
+    "Failed to get file record(file_id: %(file_id)s) from database.",
+)
+
+FAILED_DELETE_FILE_RECORD = LogMessage(
+    "E617",
+    "Failed to delete file record(file_id: %(file_id)s) from database.",
+)
+
+INVALID_Query = LogMessage(
+    "E618",
+    "offset: %(offset)s and size: %(size)s must be non-negative integers.",
+)
+
+FAILED_CREATE_FILE_RECORD = LogMessage(
+    "E620",
+    "Failed to create file record for file (id: %(file_id)s) in database.",
+)
+
+INVALID_FILE_STRUCTURE = LogMessage(
+    "E621",
+    "Invalid file structure.",
+)
+
+FILE_EXPIRED = LogMessage(
+    "E622", " File not found (path: %(path)s). It may have been expired."
+)
+
+FILE_FORMAT_UNSUPPORTED = LogMessage(
+    "E623",
+    "Unsupported file format (suffix: %(suffix)s).",
+)
+
+FILE_VALIDATION_ERROR = LogMessage(
+    "E624",
+    "File validation failed for task: %(task_id)s. Please check the file.",
+)
+
+TASK_NOT_FOUND = LogMessage(
+    "E634",
+    "Task (id: %(task_id)s) not found. It may have been expired.",
+)
+
+FAILED_GET_HISTORY_RECORDS = LogMessage(
+    "E700",
+    "Failed to get history records from table: %(table)s.",
+)
+
+FAILED_GET_HISTORY_RECORD = LogMessage(
+    "E701",
+    "Failed to get history record (id: %(history_id)s) from table: %(table)s.",
+)
+
+FAILED_UPDATE_PUBLIC = LogMessage(
+    "E702",
+    "Failed to update public status of history record (id: %(history_id)s)  in"
+    " database.",
+)
+
+FILE_NOT_FOUND = LogMessage(
+    "E704",
+    "File not found (path: %(path)s).",
+)
+
+FAILED_GET_FILTER_ITEMS = LogMessage(
+    "E705",
+    "Failed to get filter items for history search (key: %(key)s).",
+)
+
+FAILED_GET_FILE_PATH = LogMessage(
+    "E706",
+    "Failed to get file path for file (id: %(file_id)s) from database.",
+)
 
 UNNECESSARY_CONTRIB = LogMessage(
     "E999", "Contrib utilities can only be used in development mode."
diff --git a/src/server/messages/info.py b/src/server/messages/info.py
index 8c5e825d..a65a805c 100644
--- a/src/server/messages/info.py
+++ b/src/server/messages/info.py
@@ -177,3 +177,35 @@
     "I321",
     "Successfully updated affiliations of User resource (id: %(id)s, ePPN: %(eppn)s).",
 )
+
+
+SUCCESS_UPLOAD_FILES = LogMessage(
+    "I601",
+    "successfully uploaded file and create Files record: %(file_path)s",
+)
+
+SUCCESS_VALIDATE = LogMessage(
+    "I602",
+    "successfully validated the uploaded file: %(file_id)s",
+)
+
+SUCCESS_GET_VALIDATE_RESULT = LogMessage(
+    "I603",
+    "successfully retrieved validation result for history record: %(history_id)s",
+)
+
+SUCCESS_BULK_OPERATION = LogMessage(
+    "I604",
+    "successfully completed bulk operation for history record: %(history_id)s",
+)
+
+SUCCESS_GET_BULK_OPERATION_RESULT = LogMessage(
+    "I605",
+    "successfully retrieved bulk operation result for history record: %(history_id)s",
+)
+
+SUCCESS_UPDATE_PUBLIC_STATUS = LogMessage(
+    "I700",
+    "successfully update public status of history record (id: %(history_id)s)  in"
+    " database.",
+)
diff --git a/src/server/services/bulks.py b/src/server/services/bulks.py
index 984eb1f9..ee635c3d 100644
--- a/src/server/services/bulks.py
+++ b/src/server/services/bulks.py
@@ -5,7 +5,6 @@
 """Services for managing bulk."""
 
 import csv
-import io
 import re
 import typing as t
 
@@ -14,7 +13,7 @@
 from http import HTTPStatus
 from itertools import zip_longest
 from pathlib import Path
-from uuid import UUID
+from uuid import UUID, uuid7
 
 import openpyxl
 import requests
@@ -22,10 +21,12 @@
 from celery import shared_task
 from flask import current_app
 from pydantic import ValidationError
+from redis.exceptions import ConnectionError as RedisConnectionError
 
 from server.clients import bulks
 from server.config import config
 from server.const import USER_ROLES, ValidationEntity
+from server.db import db
 from server.entities.bulk import (
     EachResult,
     ExecuteResults,
@@ -42,22 +43,66 @@
 from server.entities.summaries import GroupSummary
 from server.entities.user_detail import RepositoryRole, UserDetail
 from server.exc import (
+    DatastoreError,
+    FileFormatError,
     FileNotFound,
+    FileUploadError,
     FileValidationError,
-    InvalidExportError,
+    InvalidFormError,
     OAuthTokenError,
     RecordNotFound,
-    ResourceInvalid,
+    TaskExcutionError,
     UnexpectedResponseError,
 )
+from server.messages import E, I
 from server.services.utils.permissions import (
     get_permitted_repository_ids,
     is_current_user_system_admin,
 )
+from server.services.utils.transformers import validate_user_to_map_user
 
 from . import groups, history_table, users, utils
 from .token import get_access_token, get_client_secret
-from .utils import detect_affiliations, session_required
+from .utils import session_required
+
+
+if t.TYPE_CHECKING:
+    from celery.result import AsyncResult
+    from werkzeug.datastructures import FileStorage
+
+
+def upload_file(repository_id: str, bulk_file: FileStorage) -> UUID:
+    """Upload a file for bulk processing.
+
+    Args:
+        repository_id (str): Target repository ID for upload.
+        bulk_file (FileStorage): File to upload.
+
+    Returns:
+        UUID: The ID of the temporary file.
+
+    Raises:
+        FileUploadError: If there is an error saving the uploaded file.
+    """
+    temp_id = uuid7()
+    temp_dir = Path(config.STORAGE.local.temporary)
+    original_filename = bulk_file.filename or "upload_file"
+    new_filename = f"{temp_id}_{Path(original_filename).name}"
+    file_path = temp_dir / new_filename
+    file_content = {"repositories": [{"id": repository_id}]}
+    history_table.create_file(
+        file_id=temp_id, file_path=str(file_path), file_content=file_content
+    )
+    try:
+        bulk_file.save(str(file_path))
+    except (PermissionError, FileNotFoundError) as exc:
+        db.session.rollback()
+        error = E.FAILED_SAVE_UPLOADED_FILE % {"file_path": file_path}
+        raise FileUploadError(error) from exc
+    db.session.commit()
+    current_app.logger.info(I.SUCCESS_UPLOAD_FILES, {"file_path": file_path})
+    delete_temporary_file.apply_async((str(temp_id),), countdown=3600)
+    return temp_id
 
 
 @shared_task()
@@ -99,12 +144,14 @@ def validate_upload_data(
     results = ValidateResults(
         results=check_results, summary=summary, missing_user=missing_users
     )
-    return history_table.create_upload(
+    result = history_table.create_upload(
         operator_id=operator_id,
         operator_name=operator_name,
         file_id=temp_file_id,
         results=results.model_dump(mode="json"),
     )
+    current_app.logger.info(I.SUCCESS_VALIDATE, {"file_id": temp_file_id})
+    return result.id
 
 
 def get_repository_member(repository_id: str) -> RepositoryMember:
@@ -140,15 +187,8 @@ def build_user_from_file(
             A tuple containing two dictionaries:
             - The first dictionary contains user data keyed by user ID.
             - The second dictionary contains new user data keyed by user name.
-
-    Raises:
-        FileValidationError: If the file does not exist.
     """
-    try:
-        gen = _read_file(file_path)
-    except (FileValidationError, FileNotFound) as e:
-        current_app.logger.error(e)
-        raise FileValidationError(str(e)) from e
+    gen = _read_file(file_path)
     it = next(gen)
 
     data = defaultdict(lambda: defaultdict(list))
@@ -196,14 +236,13 @@ def _read_file(file_path: str) -> t.Generator:
     Args:
         file_path (str): Path to the input file containing user data.
 
-
     Raises:
         FileNotFound: If the file does not exist.
-        FileValidationError : If the format is unsupported or parsing fails.
+        FileFormatError : If the format is unsupported or parsing fails.
     """
     path = Path(file_path)
     if not path.exists():
-        error = f"{path}: File not found."
+        error = E.FILE_EXPIRED % {"path": path}
         raise FileNotFound(error)
 
     iterator = None
@@ -219,8 +258,8 @@ def _read_file(file_path: str) -> t.Generator:
         if ws:
             iterator = ws.iter_rows(values_only=True)
     if iterator is None:
-        error = f"{path.suffix}: Unsupported file format."
-        raise FileValidationError(error)
+        error = E.FILE_FORMAT_UNSUPPORTED % {"suffix": path.suffix}
+        raise FileFormatError(error)
 
     yield iterator
 
@@ -239,6 +278,9 @@ def build_user_detail_from_dict(
     Returns:
         UserAggregated:
             The aggregated user details built from the input dictionary.
+
+    Raises:
+        FileValidationError: If there is an error validating the user data.
     """
     users: list[UserDetail] = []
 
@@ -292,8 +334,11 @@ def build_user_detail_from_dict(
                 groups=groups,
             )
         )
-
-    return UserAggregated(root=users)
+    try:
+        return UserAggregated(root=users)
+    except ValidationError as exc:
+        current_app.logger.error(exc)
+        raise FileValidationError(E.INVALID_FILE_STRUCTURE) from exc
 
 
 def build_user_detail_from_dict_by_name(
@@ -310,6 +355,9 @@ def build_user_detail_from_dict_by_name(
     Returns:
         UserAggregated:
             The aggregated user details built from the input dictionary.
+
+    Raises:
+        FileValidationError: If there is an error validating the user data.
     """
     users: list[UserDetail] = []
 
@@ -359,22 +407,18 @@ def build_user_detail_from_dict_by_name(
                 groups=groups,
             )
         )
+    try:
+        return UserAggregated(root=users)
+    except ValidationError as exc:
+        current_app.logger.error(exc)
+        raise FileValidationError(E.INVALID_FILE_STRUCTURE) from exc
 
-    return UserAggregated(root=users)
-
-
-def _resolve_non_sysadmin_role(role: str | None) -> USER_ROLES | None:
-    if role is None:
-        return None
-
-    value_to_member = {m.value: m for m in USER_ROLES}
 
-    member = value_to_member.get(role)
+_ROLE_MAP = {m.value: m for m in USER_ROLES if m is not USER_ROLES.SYSTEM_ADMIN}
 
-    if member is None or member is USER_ROLES.SYSTEM_ADMIN:
-        return None
 
-    return member
+def _resolve_non_sysadmin_role(role: str | None) -> USER_ROLES | None:
+    return _ROLE_MAP.get(role) if role else None
 
 
 def _get_missing_users(
@@ -436,9 +480,9 @@ def _build_check_results(
             )
             count_error += 1
             continue
-
-        if not _check_value(u):
-            code = "Invalid user data"
+        try:
+            validate_user_to_map_user(u, mode="create")
+        except InvalidFormError as exc:
             check_results.append(
                 EachResult(
                     id=u.id,
@@ -447,7 +491,7 @@ def _build_check_results(
                     groups=user_group_ids,
                     email=u.emails or [],
                     status="error",
-                    code=code,
+                    code=exc.message,
                 )
             )
             count_error += 1
@@ -542,6 +586,32 @@ def _check_immutable_attributes(
     return None
 
 
+def get_validate_task_result(task_id: str) -> AsyncResult[UUID]:
+    """Get the result of a validation task.
+
+    Args:
+        task_id (str): The ID of the validation task.
+
+    Returns:
+        AsyncResult[UUID]: The result of the validation task.
+
+    Raises:
+        DatastoreError: If there is an error connecting to the datastore.
+        TaskExcutionError: If the task with the given ID does not exist.
+    """
+    try:
+        res = validate_upload_data.AsyncResult(task_id)
+    except RedisConnectionError as exc:
+        error = E.FAILED_CONNECT_REDIS % {"error": str(exc)}
+        current_app.logger.error(error)
+        raise DatastoreError(error) from exc
+    if not res:
+        error = E.TASK_NOT_FOUND % {"task_id": task_id}
+        current_app.logger.error(error)
+        raise TaskExcutionError(error)
+    return res
+
+
 def get_validate_result(
     history_id: UUID, status_filter: list[str], offset: int, size: int
 ) -> ValidateResults:
@@ -563,13 +633,15 @@ def get_validate_result(
 
     summary = history_table.get_upload_results(history_id, "summary")
     missing_user = history_table.get_upload_results(history_id, "missingUser")
-    return ValidateResults.model_validate({
+    result = ValidateResults.model_validate({
         "results": check_results,
         "summary": summary,
         "missingUser": missing_user or [],
         "offset": offset,
         "pageSize": size,
     })
+    current_app.logger.info(I.SUCCESS_GET_VALIDATE_RESULT, {"history_id": history_id})
+    return result
 
 
 @shared_task()
@@ -594,7 +666,6 @@ def update_users(
         OAuthTokenError: If there is an issue with the access token.
         UnexpectedResponseError: If there is an unexpected response from mAP Core API.
         FileValidationError: If there are errors in the validation results.
-        ResourceInvalid: If there is a resource invalid error from mAP Core API.
     """
     upload_data = history_table.get_upload_by_id(history_id)
     if not upload_data:
@@ -643,8 +714,9 @@ def update_users(
         raise
 
     if isinstance(result, MapError):
-        current_app.logger.info(result.detail)
-        raise ResourceInvalid(result.detail)
+        current_app.logger.error(E.RECEIVE_RESPONSE_MESSAGE, {"message": result.detail})
+        error = E.FAILED_BULK_OPERATION
+        raise UnexpectedResponseError(result.detail)
 
     count_error = 0
     for i, operation in enumerate(result.operations):
@@ -669,6 +741,7 @@ def update_users(
             status="S",
         )
 
+    current_app.logger.info(I.SUCCESS_BULK_OPERATION, {"history_id": history_id})
     return history_id
 
 
@@ -683,7 +756,7 @@ def save_file(temp_file_id: UUID) -> UUID:
 
     Raises:
         FileNotFound: If the temporary file does not exist.
-        FileValidationError: If the file format is invalid.
+        FileFormatError: If the file format is invalid.
     """
     try:
         files = history_table.get_file_by_id(temp_file_id)
@@ -699,8 +772,8 @@ def save_file(temp_file_id: UUID) -> UUID:
         error_msg = f"File not found: {file_path}"
         raise FileNotFound(error_msg)
     if file_path.suffix not in {".csv", ".tsv", ".xlsx"}:
-        error = "not supported file format."
-        raise FileValidationError(error)
+        error = E.FILE_FORMAT_UNSUPPORTED % {"suffix": file_path.suffix}
+        raise FileFormatError(error)
 
     target_dir = Path(config.STORAGE.local.storage) / datetime.now(UTC).strftime(
         "%Y/%m"
@@ -711,7 +784,7 @@ def save_file(temp_file_id: UUID) -> UUID:
     return history_table.create_file(
         file_path=str(target_path),
         file_content={"repositories": [{"id": repository_id}]},
-    )
+    ).id
 
 
 def build_map_user_from_check_result(user: EachResult) -> MapUser:
@@ -868,6 +941,32 @@ def _build_groups_update_bulk_operations(
     return bulk_ops
 
 
+def get_execute_task_result(task_id: str) -> AsyncResult[UUID]:
+    """Get the result of an execution task.
+
+    Args:
+        task_id (str): The ID of the execution task.
+
+    Returns:
+        AsyncResult[UUID]: The result of the execution task.
+
+    Raises:
+        DatastoreError: If there is an error connecting to the datastore.
+        TaskExcutionError: If the task with the given ID does not exist.
+    """
+    try:
+        res = update_users.AsyncResult(task_id)
+    except RedisConnectionError as exc:
+        error = E.FAILED_CONNECT_REDIS % {"error": str(exc)}
+        current_app.logger.error(error)
+        raise DatastoreError(error) from exc
+    if not res:
+        error = E.TASK_NOT_FOUND % {"task_id": task_id}
+        current_app.logger.error(error)
+        raise TaskExcutionError(error)
+    return res
+
+
 def get_upload_result(
     history_id: UUID, status_filter: list[str], offset: int, size: int
 ) -> ExecuteResults:
@@ -887,7 +986,7 @@ def get_upload_result(
     """
     upload = history_table.get_upload_by_id(history_id)
     if not upload:
-        error = f"upload history not found: {history_id}"
+        error = E.UPDATE_HISTORY_RECORD_NOT_FOUND % {"id": history_id}
         raise RecordNotFound(error)
 
     raw_results: list[dict] = history_table.get_paginated_upload_results(
@@ -907,7 +1006,11 @@ def get_upload_result(
         "offset": offset,
         "pageSize": size,
     }
-    return ExecuteResults.model_validate(payload)
+    result = ExecuteResults.model_validate(payload)
+    current_app.logger.info(
+        I.SUCCESS_GET_BULK_OPERATION_RESULT, {"history_id": history_id}
+    )
+    return result
 
 
 @shared_task()
@@ -942,7 +1045,7 @@ def chack_permission_to_operation(history_id: UUID, operator_id: str) -> bool:
     """
     upload = history_table.get_upload_by_id(history_id)
     if not upload:
-        error = f"upload history not found: {history_id}"
+        error = E.UPDATE_HISTORY_RECORD_NOT_FOUND % {"id": history_id}
         current_app.logger.error(error)
         raise RecordNotFound(error)
     return upload.operator_id == operator_id
@@ -964,74 +1067,8 @@ def chack_permission_to_view(history_id: UUID) -> bool:
         return True
     upload = history_table.get_upload_by_id(history_id)
     if not upload:
-        error = f"upload history not found: {history_id}"
+        error = E.UPDATE_HISTORY_RECORD_NOT_FOUND % {"id": history_id}
         current_app.logger.error(error)
         raise RecordNotFound(error)
     repository_id = upload.file.file_content["repositories"][0]["id"]
     return repository_id not in get_permitted_repository_ids() and upload.public
-
-
-def make_export_file(user_ids: list[str]) -> t.BinaryIO:
-    """Generate a file containing user details for the specified user IDs.
-
-    Args:
-        user_ids (list[str]): A list of user IDs to include in the export file.
-
-    Returns:
-        BinaryIO: A binary file-like object containing the exported user details.
-
-    Raises:
-        InvalidExportError: if not have permission to export the user.
-    """
-    output = io.StringIO()
-    writer = csv.writer(output)
-    header = [
-        "id",
-        "user_name",
-        "groups[].id",
-        "groups[].name",
-        "role",
-        "edu_person_principal_names[]",
-        "preferred_language",
-        "emails[]",
-    ]
-    writer.writerow(header)
-    users_list = users.search(
-        utils.make_criteria_object("users", i=user_ids), raw=True
-    ).resources
-    permitted_repository_ids = get_permitted_repository_ids()
-
-    for map_user in users_list:
-        roles, groups = detect_affiliations([g.value for g in map_user.groups or []])
-        if any(role.role == USER_ROLES.SYSTEM_ADMIN for role in roles):
-            error = f"User '{map_user.id}' is a system admin and cannot be exported."
-            raise InvalidExportError(error)
-        if not is_current_user_system_admin() and not any(
-            group.repository_id in permitted_repository_ids for group in groups
-        ):
-            error = f"the current user does not have permission to access user '{map_user.id}'."  # noqa: E501
-            raise InvalidExportError(error)
-
-        group_ids = [g.group_id for g in groups] or [""]
-        roles_list = [r.role.value for r in roles] or [""]
-        eppns = [eppn.value for eppn in map_user.edu_person_principal_names or []]
-        emails = [email.value for email in map_user.emails or []]
-
-        max_len = max(len(group_ids), len(roles_list), len(eppns), len(emails))
-
-        for i in range(max_len):
-            row = [
-                map_user.id,
-                map_user.user_name,
-                group_ids[i] if i < len(group_ids) else group_ids[len(group_ids) - 1],
-                "",  # group name is not exported. it can't be get from mAP Core API search user endpoint  # noqa: E501
-                roles_list[i]
-                if i < len(roles_list)
-                else roles_list[len(roles_list) - 1],
-                eppns[i] if i < len(eppns) else eppns[len(eppns) - 1],
-                map_user.preferred_language or "",
-                emails[i] if i < len(emails) else emails[len(emails) - 1],
-            ]
-            writer.writerow(row)
-
-    return io.BytesIO(output.getvalue().encode("utf-8"))
diff --git a/src/server/services/history.py b/src/server/services/history.py
index 024c1dbd..5bdf046f 100644
--- a/src/server/services/history.py
+++ b/src/server/services/history.py
@@ -27,6 +27,7 @@
 from server.entities.search_request import SearchResult
 from server.entities.summaries import UserSummary
 from server.exc import DatabaseError, InvalidQueryError, RecordNotFound
+from server.messages import E, I
 
 from .utils import (
     get_permitted_repository_ids,
@@ -51,25 +52,31 @@ def get_upload_history_data(
     Returns:
         SearchResult: upload history data with pagination.
 
+    Raises:
+        DatabaseError: If a database operation fails.
     """
     filters = _build_filters_for_history(criteria, history_type="upload")
 
     base_stmt = select(UploadHistory, Files).join(UploadHistory.file).filter(*filters)
     count_stmt = select(func.count()).select_from(base_stmt.subquery())
+    try:
+        total = db.session.execute(count_stmt).scalar_one()
 
-    total = db.session.execute(count_stmt).scalar_one()
-
-    if criteria.d == "desc":
-        stmt = base_stmt.order_by(UploadHistory.timestamp.desc())
-    else:
-        stmt = base_stmt.order_by(UploadHistory.timestamp.asc())
+        if criteria.d == "desc":
+            stmt = base_stmt.order_by(UploadHistory.timestamp.desc())
+        else:
+            stmt = base_stmt.order_by(UploadHistory.timestamp.asc())
 
-    page = criteria.p or 1
-    page_size = criteria.l or DEFAULT_SEARCH_COUNT
-    offset = (page - 1) * page_size
-    stmt = stmt.limit(page_size).offset(offset)
+        page = criteria.p or 1
+        page_size = criteria.l or DEFAULT_SEARCH_COUNT
+        offset = (page - 1) * page_size
+        stmt = stmt.limit(page_size).offset(offset)
 
-    rows = db.session.execute(stmt).all()
+        rows = db.session.execute(stmt).all()
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_HISTORY_RECORDS % {"table": "upload"}
+        raise DatabaseError(error) from exc
     data = [
         {
             **history.__dict__,
@@ -176,6 +183,8 @@ def get_download_history_data(
     Returns:
         SearchResult: download history data with pagination.
 
+    Raises:
+        DatabaseError: If a database operation fails.
     """
     filters = _build_filters_for_history(criteria, history_type="download")
 
@@ -183,28 +192,33 @@ def get_download_history_data(
         select(DownloadHistory, Files).join(DownloadHistory.file).filter(*filters)
     )
     count_stmt = select(func.count()).select_from(base_stmt.subquery())
-    total = db.session.execute(count_stmt).scalar_one()
-
-    child = aliased(DownloadHistory)
-    subq = (
-        select(func.count(child.id))
-        .where(child.parent_id == DownloadHistory.id)
-        .correlate(DownloadHistory)
-        .scalar_subquery()
-    )
-    stmt = base_stmt.add_columns(subq)
+    try:
+        total = db.session.execute(count_stmt).scalar_one()
+
+        child = aliased(DownloadHistory)
+        subq = (
+            select(func.count(child.id))
+            .where(child.parent_id == DownloadHistory.id)
+            .correlate(DownloadHistory)
+            .scalar_subquery()
+        )
+        stmt = base_stmt.add_columns(subq)
 
-    if criteria.d == "desc":
-        stmt = stmt.order_by(DownloadHistory.timestamp.desc())
-    else:
-        stmt = stmt.order_by(DownloadHistory.timestamp.asc())
+        if criteria.d == "desc":
+            stmt = stmt.order_by(DownloadHistory.timestamp.desc())
+        else:
+            stmt = stmt.order_by(DownloadHistory.timestamp.asc())
 
-    page = criteria.p or 1
-    page_size = criteria.l or DEFAULT_SEARCH_COUNT
-    offset = (page - 1) * page_size
-    stmt = stmt.limit(page_size).offset(offset)
+        page = criteria.p or 1
+        page_size = criteria.l or DEFAULT_SEARCH_COUNT
+        offset = (page - 1) * page_size
+        stmt = stmt.limit(page_size).offset(offset)
 
-    rows = db.session.execute(stmt).all()
+        rows = db.session.execute(stmt).all()
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_HISTORY_RECORDS % {"table": "download"}
+        raise DatabaseError(error) from exc
     data = [
         {
             **history.__dict__,
@@ -247,6 +261,7 @@ def get_filter_items(
 
     Raises:
         InvalidQueryError: If the filter key is invalid.
+        DatabaseError: If a database operation fails.
     """
     table = UploadHistory if tab == "upload" else DownloadHistory
     if key == "o":
@@ -255,8 +270,12 @@ def get_filter_items(
         page_size = criteria.l or DEFAULT_SEARCH_COUNT
         offset = (page - 1) * page_size
         stmt = stmt.limit(page_size).offset(offset)
-
-        results = db.session.execute(stmt).all()
+        try:
+            results = db.session.execute(stmt).all()
+        except SQLAlchemyError as exc:
+            current_app.logger.error(str(exc))
+            error = E.FAILED_GET_HISTORY_RECORDS % {"table": tab}
+            raise DatabaseError(error) from exc
         items = [
             UserSummary(id=operator_id, user_name=operator_name)
             for operator_id, operator_name in results
@@ -265,7 +284,7 @@ def get_filter_items(
             resources=items, total=0, page_size=page_size, offset=offset
         )
 
-    error = f"Unsupported criteria type: {type(criteria)}"
+    error = E.FAILED_GET_FILTER_ITEMS % {"key": key}
     current_app.logger.error(error)
     raise InvalidQueryError(error)
 
@@ -292,14 +311,19 @@ def update_public_status(
 
         record = db.session.get(table, history_id)
         if record is None:
-            error = f"{history_id} is not found"
+            error = E.FAILED_GET_HISTORY_RECORD % {
+                "history_id": history_id,
+                "table": tab,
+            }
             raise RecordNotFound(error)
 
         record.public = public
     except SQLAlchemyError as exc:
-        error = "Failed to update the public status due to a database error."
+        current_app.logger.error(str(exc))
+        error = E.FAILED_UPDATE_PUBLIC % {"history_id": history_id}
         raise DatabaseError(error) from exc
     db.session.commit()
+    current_app.logger.info(I.SUCCESS_UPDATE_PUBLIC_STATUS)
     return record.public
 
 
@@ -319,11 +343,12 @@ def get_file_path(file_id: UUID) -> str:
     try:
         file = db.session.get(Files, file_id)
     except SQLAlchemyError as exc:
-        error = "Failed to retrieve the file path due to a database error."
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_FILE_PATH % {"file_id": file_id}
         raise DatabaseError(error) from exc
 
     if not file:
-        error = f"File with ID {file_id} not found."
+        error = E.FAILED_GET_FILE_PATH % {"file_id": file_id}
         raise RecordNotFound(error)
 
     return file.file_path
diff --git a/src/server/services/history_table.py b/src/server/services/history_table.py
index ff97c18e..ec43a1b7 100644
--- a/src/server/services/history_table.py
+++ b/src/server/services/history_table.py
@@ -11,11 +11,18 @@
 
 from flask import current_app
 from sqlalchemy import func
+from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import selectinload
 
 from server.db import db
-from server.db.history import Files, UploadHistory
-from server.exc import InvalidQueryError, InvalidRecordError, RecordNotFound
+from server.db.history import DownloadHistory, Files, UploadHistory
+from server.exc import (
+    DatabaseError,
+    InvalidQueryError,
+    InvalidRecordError,
+    RecordNotFound,
+)
+from server.messages import E
 
 
 def get_upload_by_id(history_id: UUID) -> UploadHistory | None:
@@ -26,10 +33,19 @@ def get_upload_by_id(history_id: UUID) -> UploadHistory | None:
 
     Returns:
         UploadHistory | None: The upload history record, or None if not found.
+
+    Raises:
+        DatabaseError: If there is an error querying the database.
     """
-    return db.session.get(
-        UploadHistory, history_id, options=[selectinload(UploadHistory.file)]
-    )
+    try:
+        history = db.session.get(
+            UploadHistory, history_id, options=[selectinload(UploadHistory.file)]
+        )
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_UPLOAD_HISTORY_RECORD % {"history_id": history_id}
+        raise DatabaseError(error) from exc
+    return history
 
 
 def get_upload_results(history_id: UUID, attribute: str) -> dict:
@@ -41,14 +57,27 @@ def get_upload_results(history_id: UUID, attribute: str) -> dict:
 
     Returns:
         dict: The upload results for the specified attribute.
+
+    Raises:
+        DatabaseError: If there is an error querying the database.
+        RecordNotFound: If no history record is found for the given ID.
     """
-    result = (
-        db.session
-        .query(UploadHistory.results[attribute])
-        .filter(UploadHistory.id == history_id)
-        .first()
-    )
-    return result[0] if result else {}
+    try:
+        result = (
+            db.session
+            .query(UploadHistory.results[attribute])
+            .filter(UploadHistory.id == history_id)
+            .first()
+        )
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_UPLOAD_HISTORY_RECORD % {"history_id": history_id}
+        raise DatabaseError(error) from exc
+    if result is None:
+        error = E.FAILED_GET_FILE_RECORD % {"file_id": history_id}
+        current_app.logger.error(error)
+        raise RecordNotFound(error)
+    return result[0]
 
 
 def get_paginated_upload_results(
@@ -67,34 +96,40 @@ def get_paginated_upload_results(
 
     Raises:
         InvalidQueryError: If offset or size is less than 1.
+        DatabaseError: If there is an error querying the database.
     """
     if offset < 1 or size < 1:
-        error_message = "Invalid offset or size"
-        raise InvalidQueryError(error_message)
+        error = E.INVALID_Query % {"offset": offset, "size": size}
+        current_app.logger.error(error)
+        raise InvalidQueryError(error)
 
     elements = func.jsonb_array_elements(
         UploadHistory.results["results"]
     ).column_valued("item")
-    query = (
-        db.session
-        .query(elements)
-        .select_from(UploadHistory)
-        .filter(UploadHistory.id == history_id)
-    )
-
-    if status_filter:
-        query = query.filter(elements.op("->>")("status").in_(status_filter))
-
-    offset_val = (offset - 1) * size
-
-    raw_results = query.limit(size).offset(offset_val).all()
-
+    try:
+        query = (
+            db.session
+            .query(elements)
+            .select_from(UploadHistory)
+            .filter(UploadHistory.id == history_id)
+        )
+
+        if status_filter:
+            query = query.filter(elements.op("->>")("status").in_(status_filter))
+
+        offset_val = (offset - 1) * size
+
+        raw_results = query.limit(size).offset(offset_val).all()
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_UPLOAD_HISTORY_RECORD % {"history_id": history_id}
+        raise DatabaseError(error) from exc
     return [r[0] for r in raw_results]
 
 
 def create_upload(
     file_id: UUID, results: dict, operator_id: str, operator_name: str
-) -> UUID:
+) -> UploadHistory:
     """Create a new upload history record.
 
     Args:
@@ -104,30 +139,35 @@ def create_upload(
         operator_name (str): The name of the operator performing the upload.
 
     Returns:
-        UUID: The ID of the newly created upload history record.
+        UploadHistory: The newly created upload history record.
 
     Raises:
         InvalidRecordError: If the results dictionary is missing required keys.
+        DatabaseError:
+          If there is an error creating the upload history record in the database.
     """
-    history_record = UploadHistory()
-    history_record.file_id = file_id
     summary = results.get("summary")
     items = results.get("results")
     missing_users = results.get("missing_users", [])
     if summary is None or items is None:
-        error_message = "Results must include 'summary' and 'results' keys"
-        raise InvalidRecordError(error_message)
-
-    history_record.results = {
-        "summary": summary,
-        "items": items,
-        "missing_users": missing_users,
-    }
-    history_record.operator_id = operator_id
-    history_record.operator_name = operator_name
-    db.session.add(history_record)
-    db.session.commit()
-    return history_record.id
+        raise InvalidRecordError(E.INVALID_UPLOAD_HISTORY_RECORD_ATTRIBUTES)
+    try:
+        history_record = UploadHistory()
+        history_record.file_id = file_id
+        history_record.results = {
+            "summary": summary,
+            "items": items,
+            "missing_users": missing_users,
+        }
+        history_record.operator_id = operator_id
+        history_record.operator_name = operator_name
+        db.session.add(history_record)
+        db.session.commit()
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_CREATE_UPLOAD_HISTORY_RECORD % {"file_id": file_id}
+        raise DatabaseError(error) from exc
+    return history_record
 
 
 def update_upload_status(
@@ -138,34 +178,42 @@ def update_upload_status(
 ) -> None:
     """Update the status of an upload history record.
 
+    Must call db.session.commit() after using this function to persist changes.
+
     Args:
         history_id (UUID): The ID of the history record to update.
         status (Literal["P", "S", "F"]):
           The new status ("P": Progress, "S": Success, "F": Failed).
         new_results (dict | None): New results to update, if any.
         file_id (UUID | None): New file ID to update, if any.
-    """
-    obj = db.session.get(UploadHistory, history_id)
-    if obj is None:
-        return
-    if new_results:
-        obj.results = {
-            "summary": new_results.get("summary", {}),
-            "items": new_results.get("results", []),
-            "missing_users": new_results.get("missing_users", []),
-        }
-
-    obj.status = status
-    now = datetime.now(UTC)
-    if status == "P":
-        obj.timestamp = now
-    else:
-        obj.end_timestamp = now
-
-    if file_id:
-        obj.file_id = file_id
 
-    db.session.commit()
+    Raises:
+        DatabaseError: If there is an error updating the database.
+    """
+    try:
+        obj = db.session.get(UploadHistory, history_id)
+        if obj is None:
+            return
+        if new_results:
+            obj.results = {
+                "summary": new_results.get("summary", {}),
+                "items": new_results.get("results", []),
+                "missing_users": new_results.get("missing_users", []),
+            }
+
+        obj.status = status
+        now = datetime.now(UTC)
+        if status == "P":
+            obj.timestamp = now
+        else:
+            obj.end_timestamp = now
+
+        if file_id:
+            obj.file_id = file_id
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_UPDATE_HISTORY_RECORD_STATUS % {"history_id": history_id}
+        raise DatabaseError(error) from exc
 
 
 def get_history_by_file_id(file_id: UUID) -> UploadHistory:
@@ -179,8 +227,16 @@ def get_history_by_file_id(file_id: UUID) -> UploadHistory:
 
     Raises:
         RecordNotFound: If no history record is found for the file ID.
+        DatabaseError: If there is an error querying the database.
     """
-    result = db.session.query(UploadHistory).filter_by(file_id=file_id).one_or_none()
+    try:
+        result = (
+            db.session.query(UploadHistory).filter_by(file_id=file_id).one_or_none()
+        )
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_UPLOAD_HISTORY_RECORD_BY_FILE_ID % {"file_id": file_id}
+        raise DatabaseError(error) from exc
     if result is None:
         error = f"History not found for file_id: {file_id}"
         current_app.logger.error(error)
@@ -199,8 +255,14 @@ def get_file_by_id(file_id: UUID) -> Files:
 
     Raises:
         RecordNotFound: If no file record is found for the file ID.
+        DatabaseError: If there is an error querying the database.
     """
-    result = db.session.query(Files).filter_by(id=file_id).one_or_none()
+    try:
+        result = db.session.query(Files).filter_by(id=file_id).one_or_none()
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_GET_FILE_RECORD % {"file_id": file_id}
+        raise DatabaseError(error) from exc
     if result is None:
         error = f"File not found for file_id: {file_id}"
         current_app.logger.error(error)
@@ -211,35 +273,92 @@ def get_file_by_id(file_id: UUID) -> Files:
 def delete_file_by_id(file_id: UUID) -> None:
     """Delete a file record by its ID.
 
+    Must call db.session.commit() after using this function to persist changes.
+
     Args:
         file_id (UUID): The ID of the file to delete.
+
+    Raises:
+        DatabaseError: If there is an error deleting the file from the database.
     """
-    Files.query.filter(Files.id == file_id).delete()
-    db.session.commit()
+    try:
+        Files.query.filter(Files.id == file_id).delete()
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_DELETE_FILE_RECORD % {"file_id": file_id}
+        raise DatabaseError(error) from exc
 
 
 def create_file(
     file_path: str, file_content: dict, file_id: UUID | None = None
-) -> UUID:
+) -> Files:
     """Create or update a file record.
 
+    Must call db.session.commit() after using this function to persist changes.
+
     Args:
         file_path (str): The path of the file.
         file_content (dict): The content of the file.
         file_id (UUID | None): The ID of the file to update.
 
     Returns:
-        UUID: The ID of the created or updated file.
+        Files: The created or updated file record.
+
+    Raises:
+        DatabaseError: If there is an error creating the file record in the database.
+    """
+    try:
+        file_record = Files()
+        if file_id:
+            file_record.id = file_id
+        file_record.file_path = str(file_path)
+        file_record.file_content = {
+            "repositories": file_content.get("repositories", []),
+            "groups": file_content.get("groups", []),
+            "users": file_content.get("users", []),
+        }
+        db.session.add(file_record)
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_CREATE_FILE_RECORD % {"file_path": file_path}
+        raise DatabaseError(error) from exc
+    return file_record
+
+
+def create_download_history(
+    file_id: UUID,
+    file_path: str,
+    file_content: dict,
+    operator_id: str,
+    operator_name: str,
+) -> DownloadHistory:
+    """Create a new download history record.
+
+    Must call db.session.commit() after using this function to persist changes.
+
+    Args:
+        file_id (UUID): The ID of the associated file.
+        file_path (str): The path of the file.
+        file_content (dict): The content of the file.
+        operator_id (str): The ID of the operator performing the download.
+        operator_name (str): The name of the operator performing the download.
+
+    Returns:
+        DownloadHistory: The newly created download history record.
+
+    Raises:
+        DatabaseError:
+          If there is an error creating the download history record in the database.
     """
-    file_record = Files()
-    if file_id:
-        file_record.id = file_id
-    file_record.file_path = str(file_path)
-    file_record.file_content = {
-        "repositories": file_content.get("repositories", []),
-        "groups": file_content.get("groups", []),
-        "users": file_content.get("users", []),
-    }
-    db.session.add(file_record)
-    db.session.commit()
-    return file_record.id
+    try:
+        create_file(file_path, file_content, file_id)
+        download_history = DownloadHistory()
+        download_history.file_id = file_id
+        download_history.operator_id = operator_id
+        download_history.operator_name = operator_name
+        db.session.add(download_history)
+    except SQLAlchemyError as exc:
+        current_app.logger.error(str(exc))
+        error = E.FAILED_CREATE_DOWNLOAD_HISTORY_RECORD % {"file_id": file_id}
+        raise DatabaseError(error) from exc
+    return download_history
diff --git a/src/server/services/users.py b/src/server/services/users.py
index b1ac0b81..8b74bf09 100644
--- a/src/server/services/users.py
+++ b/src/server/services/users.py
@@ -7,7 +7,10 @@
 import re
 import typing as t
 
+from datetime import UTC, datetime
 from http import HTTPStatus
+from pathlib import Path
+from uuid import uuid7
 
 import requests
 
@@ -23,7 +26,9 @@
     MAP_NO_RIGHTS_APPEND_PATTERN,
     MAP_NO_RIGHTS_UPDATE_PATTERN,
     MAP_NOT_FOUND_PATTERN,
+    USER_ROLES,
 )
+from server.db import db
 from server.entities.map_error import MapError
 from server.entities.search_request import SearchResponse, SearchResult
 from server.entities.summaries import UserSummary
@@ -32,6 +37,7 @@
     ApiClientError,
     ApiRequestError,
     CredentialsError,
+    InvalidExportError,
     InvalidFormError,
     InvalidQueryError,
     OAuthTokenError,
@@ -40,6 +46,9 @@
     UnexpectedResponseError,
 )
 from server.messages import E, I
+from server.services import history_table
+from server.services.utils.affiliations import detect_affiliations
+from server.services.utils.permissions import get_permitted_repository_ids
 from server.signals import user_deleted, user_updated
 
 from .token import get_access_token, get_client_secret
@@ -55,6 +64,7 @@
 
 
 if t.TYPE_CHECKING:
+    from server.api.schemas import FileQuery
     from server.clients.users import UsersSearchResponse
     from server.entities.map_user import Group, MapUser
     from server.entities.patch_request import PatchOperation
@@ -733,3 +743,119 @@ def handle_user_updated(
     users.get_by_id.clear_cache(user.id)  # pyright: ignore[reportFunctionMemberAccess]
     if user.eppns:
         users.get_by_eppn.clear_cache(*user.eppns)  # pyright: ignore[reportFunctionMemberAccess]
+
+
+def make_export_file(
+    user_ids: list[str], query: FileQuery, operator_id: str, operator_name: str
+) -> Path:
+    """Generate a file containing user details for the specified user IDs.
+
+    Args:
+        user_ids (list[str]): A list of user IDs to include in the export file.
+        query (FileQuery): The file query containing export format and other parameters.
+        operator_id (str): The ID of the operator performing the export.
+        operator_name (str): The name of the operator performing the export.
+
+    Returns:
+        Path: The path to the generated export file.
+    """
+    user_list = search(make_criteria_object("users", i=user_ids), raw=True).resources
+    delimiter = "," if query.f == "csv" else "\t"
+    file_id = uuid7()
+    target_dir = Path(config.STORAGE.local.storage) / datetime.now(UTC).strftime(
+        "%Y/%m"
+    )
+    target_dir.mkdir(parents=True, exist_ok=True)
+    file_path = target_dir / f"{file_id}.{query.f}"
+    file_path.write_text(delimiter.join(config.USERS.export_fields), encoding="utf-8")
+
+    permitted_repository_ids = get_permitted_repository_ids()
+
+    file_repositories, file_groups, file_users = _wite_user(
+        user_list, delimiter, file_path, permitted_repository_ids
+    )
+    file_content = {
+        "repositories": list(file_repositories),
+        "groups": list(file_groups),
+        "users": list(file_users),
+    }
+    history_table.create_download_history(
+        file_id, str(file_path), file_content, operator_id, operator_name
+    )
+    db.session.commit()
+    return file_path
+
+
+def _wite_user(
+    user_list: list[MapUser],
+    delimiter: str,
+    file_path: Path,
+    permitted_repository_ids: set[str],
+) -> tuple[set[dict[str, str]], set[dict[str, str]], set[dict[str, str]]]:
+    """Write user details to file.
+
+    Args:
+        user_list (list[MapUser]): A list of user details.
+        delimiter (str): The delimiter to use in the file.
+        file_path (Path): The path to the file.
+        permitted_repository_ids (list[str]): A list of permitted repository IDs.
+
+    Returns:
+        tuple[set[dict[str, str]], set[dict[str, str]], set[dict[str, str]]]:
+          A tuple containing sets of file repositories, file groups, and file users.
+
+    Raises:
+        InvalidExportError:
+          If the user cannot be exported due to insufficient permissions.
+    """
+    file_repositories = set[dict[str, str]]()
+    file_groups = set[dict[str, str]]()
+    file_users = set[dict[str, str]]()
+    for map_user in user_list:
+        roles, groups = detect_affiliations([g.value for g in map_user.groups or []])
+        if not is_current_user_system_admin() and any(
+            role.role == USER_ROLES.SYSTEM_ADMIN for role in roles
+        ):
+            error = E.USER_CANNOT_EXPORT_SYSTEM_ADMIN
+            raise InvalidExportError(error)
+        if not is_current_user_system_admin() and not any(
+            group.repository_id in permitted_repository_ids for group in groups
+        ):
+            error = E.USER_FORBIDDEN_EXPORT
+            raise InvalidExportError(error)
+
+        file_users.add({"id": map_user.id or "", "user_name": map_user.user_name or ""})
+        group_ids = []
+        for group in groups:
+            if group.repository_id not in permitted_repository_ids:
+                continue
+
+            file_groups.add({"id": group.group_id or "", "display_name": ""})
+            file_repositories.add({"id": group.repository_id or "", "display_name": ""})
+            group_ids.append(group.group_id or "")
+        roles_list = [
+            r.role.value for r in roles if r.repository_id in permitted_repository_ids
+        ] or [""]
+        eppns = [eppn.value for eppn in map_user.edu_person_principal_names or []]
+        emails = [email.value for email in map_user.emails or []]
+
+        max_len = max(len(group_ids), len(roles_list), len(eppns), len(emails))
+
+        for i in range(max_len):
+            row = [
+                map_user.id,
+                map_user.user_name,
+                group_ids[i] if i < len(group_ids) else group_ids[len(group_ids) - 1],
+                "",  # group name is not exported. it can't be get from mAP Core API search user endpoint  # noqa: E501
+                roles_list[i]
+                if i < len(roles_list)
+                else roles_list[len(roles_list) - 1],
+                eppns[i] if i < len(eppns) else eppns[len(eppns) - 1],
+                map_user.preferred_language or "",
+                emails[i] if i < len(emails) else emails[len(emails) - 1],
+            ]
+            file_path.write_text(
+                delimiter.join(row) + "\n",
+                encoding="utf-8",
+            )
+    return file_repositories, file_groups, file_users

From c4c4719ac02c22cccf7d0c2609a7afc411002750 Mon Sep 17 00:00:00 2001
From: ivis-kuroda <tomohiro.kuroda@ivis.co.jp>
Date: Mon, 9 Mar 2026 10:45:37 +0000
Subject: [PATCH 3/4] feat: show version command

---
 src/server/cli/app.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/server/cli/app.py

diff --git a/src/server/cli/app.py b/src/server/cli/app.py
new file mode 100644
index 00000000..2af4be07
--- /dev/null
+++ b/src/server/cli/app.py
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2025 National Institute of Informatics.
+#
+
+"""Application command-line interface."""
+
+import pathlib
+import tomllib
+
+import click
+
+from flask import current_app
+
+
+@click.group()
+def app() -> None:
+    """Manage application."""
+
+
+@app.command()
+def version() -> None:
+    """Display application version."""
+    with pathlib.Path("pyproject.toml").open("rb") as f:
+        pyproject = tomllib.load(f)
+    version = pyproject["project"]["version"]
+    current_app.logger.info(version)

From 9e5abc6e7dd3525f58285ceeaa20e1a237ed9fb1 Mon Sep 17 00:00:00 2001
From: ivis-kosaka <nobuyoshi.kosaka@ivis.co.jp>
Date: Mon, 9 Mar 2026 10:51:08 +0000
Subject: [PATCH 4/4] ci: generate stub before typecheck

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b581ba62..c63f74db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,6 +62,7 @@ jobs:
       - name: Run Task
         run: |
           export PYTHONPATH=$(pwd)
+          FLASK_ENV=development uv run flask -A server.app --debug app version
           uv run ${{ matrix.task.command }}
 
       - name: Minimize uv cache