From 31c6f952a278a75004939c6169db1de18c284917 Mon Sep 17 00:00:00 2001
From: Dan Felder <d.felder@kunzleigh.com>
Date: Thu, 9 Jan 2025 15:31:48 -0500
Subject: [PATCH 1/4] Production Release

Sprint 46 issues included:

BUG: Admin/User Profile Saved Changes are Not Displayed on Results screen #709
BUG: Insert a space between the date field of Completion date range end and Quiz type(s) on the SmartPay Training Report #705
Customizable Training Report for A/OPC #633
---
 .../src/components/AdminSearchUser.vue        |   3 +
 .../src/components/AdminTrainingReport.vue    |   3 +-
 .../src/components/ReportRepository.vue       |  29 +++
 .../src/components/TrainingReportDownload.vue | 221 +++++++++++++++---
 .../__tests__/TrainingReportDownload.spec.js  | 108 +++++++++
 training/api/api_v1/users.py                  |  23 +-
 training/repositories/user.py                 |  75 ++++--
 training/schemas/__init__.py                  |   2 +-
 .../smartpay_training_report_filter.py        |  12 +
 training/tests/conftest.py                    |   7 +-
 training/tests/test_api_users.py              |  51 ++++
 training/tests/test_user_repository.py        |  82 ++++++-
 12 files changed, 557 insertions(+), 59 deletions(-)
 create mode 100644 training-front-end/src/components/ReportRepository.vue
 create mode 100644 training-front-end/src/components/__tests__/TrainingReportDownload.spec.js
 create mode 100644 training/schemas/smartpay_training_report_filter.py

diff --git a/training-front-end/src/components/AdminSearchUser.vue b/training-front-end/src/components/AdminSearchUser.vue
index 3c1a8afa..94cf139b 100644
--- a/training-front-end/src/components/AdminSearchUser.vue
+++ b/training-front-end/src/components/AdminSearchUser.vue
@@ -70,6 +70,9 @@
   function cancelEdit(){
     setSelectedUser(undefined)
     setSelectedAgencyId(undefined)
+    // refresh search on cancel from edit reporting page as you can also update user details on the page without
+    // updating the reporting access. Refresh page to display updated details.
+    search()
   }
   
   async function updateUserSuccess(message) {
diff --git a/training-front-end/src/components/AdminTrainingReport.vue b/training-front-end/src/components/AdminTrainingReport.vue
index dd54eac4..49df8cbc 100644
--- a/training-front-end/src/components/AdminTrainingReport.vue
+++ b/training-front-end/src/components/AdminTrainingReport.vue
@@ -58,7 +58,7 @@
 
   //format dates from uswds standard to the format needed for backend 
   const formatDateToYYYYMMDD = (dates) => {
-    return dates ? dates.map(date => (date ? new Date(date).toISOString().split('T')[0] : null)) : [];
+    return dates ? dates.map(date => (date ? new Date(date).toISOString() : null)) : [];
   };
 
   async function downloadReport() {
@@ -133,6 +133,7 @@
           :validator="v_all_info$.quiz_names"
           name="Quiz type(s)"
           legend="Quiz type(s)"
+          class="margin-top-4"
         />
         <USWDSComboBox
           v-model="user_input.agency_id"
diff --git a/training-front-end/src/components/ReportRepository.vue b/training-front-end/src/components/ReportRepository.vue
new file mode 100644
index 00000000..2d2b67fe
--- /dev/null
+++ b/training-front-end/src/components/ReportRepository.vue
@@ -0,0 +1,29 @@
+<script>
+
+import {useStore} from "@nanostores/vue";
+import {profile} from "../stores/user.js";
+
+const user = useStore(profile)
+const base_url = import.meta.env.PUBLIC_API_BASE_URL
+const downloadTrainingCompletionReport = async function(filterData){
+  const response = await fetch(`${base_url}/api/v1/users/download-smartpay-training-report`, {
+    method: 'POST',
+    headers: {
+      'Authorization': `Bearer ${user.value.jwt}`,
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify(filterData)
+  });
+  if (!response.ok) {
+    const message = await response.text()
+    throw new Error(message)
+  }
+
+  return await response //needs to be returned as raw not json
+}
+
+export default {
+  downloadTrainingCompletionReport
+}
+
+</script>
diff --git a/training-front-end/src/components/TrainingReportDownload.vue b/training-front-end/src/components/TrainingReportDownload.vue
index 0143fb15..a52ef862 100644
--- a/training-front-end/src/components/TrainingReportDownload.vue
+++ b/training-front-end/src/components/TrainingReportDownload.vue
@@ -1,49 +1,208 @@
 <script setup>
-  import { computed } from "vue"
-  import { useStore } from '@nanostores/vue'
-  import { profile} from '../stores/user'
-  import USWDSAlert from './USWDSAlert.vue'
+import { computed, reactive, ref, watch} from "vue"
+import { useStore } from '@nanostores/vue'
+import { useVuelidate } from "@vuelidate/core";
+import { profile } from '../stores/user' 
+import USWDSAlert from './USWDSAlert.vue'
+import ValidatedDateRangePicker from "./form-components/ValidatedDateRangePicker.vue";
+import ValidatedCheckboxGroup from "./form-components/ValidatedCheckboxGroup.vue";
+import USWDSComboBox from "./form-components/USWDSComboBox.vue";
+import {agencyList, bureauList, setSelectedAgencyId} from "../stores/agencies.js";
+import ReportRepository from "./ReportRepository.vue";
+import ReportUtilities from "./ReportUtilities.vue";
+import SpinnerGraphic from "./SpinnerGraphic.vue";
 
-  const user = useStore(profile)
-  const isReportUser = computed(() => user.value.roles.includes('Report'))
-  const base_url = import.meta.env.PUBLIC_API_BASE_URL
-  const report_url = `${base_url}/api/v1/users/download-user-quiz-completion-report`
+const error = ref()
+const showSuccessMessage = ref(false)
+const isLoading = ref(false)
+const showSpinner = ref(false)
+const user = useStore(profile)
+const isReportUser = computed(() => user.value.roles.includes('Report'))
+const agency_options = useStore(agencyList)
+const bureaus = useStore(bureauList)
+const report_agencies = user.value.report_agencies
+let filteredAgencyOptions
+let filteredBureauOptions
+
+filteredAgencyOptions = computed(() => {
+  return agency_options.value.filter((agency) => report_agencies.map(x => x.name).includes(agency.name))
+})
+
+filteredBureauOptions = computed(() => {
+  return bureaus.value.filter((bureau) => report_agencies.map(x => x.id).includes(bureau.id))
+})
+
+//Properties 
+const user_input = reactive({
+  agency_id: undefined,
+  bureau_id: undefined,
+  quiz_names: undefined,
+  completion_date_range: undefined,
+})
+
+watch(() => user_input.agency_id, async() => {
+  setSelectedAgencyId(user_input.agency_id)
+  user_input.bureau_id = undefined
+})
+
+function setError(event){
+  error.value = event
+}
+
+const validation_info = {
+  agency_id: {},
+  bureau_id: {},
+  completion_date_range: {},
+  quiz_names: {}
+}
+
+const quiz_names_options = [
+  {value: 'Fleet Training For Program Coordinators', label: 'Fleet Training For Program Coordinators'},
+  {value: 'Purchase Training for Card/Account Holders and Approving Officials', label: 'Purchase Training for Card/Account Holders and Approving Officials'},
+  {value: 'Purchase Training For Program Coordinators', label: 'Purchase Training For Program Coordinators'},
+  {value: 'Travel Training for Agency/Organization Program Coordinators', label: 'Travel Training for Agency/Organization Program Coordinators'},
+  {value: 'Travel Training for Card/Account Holders and Approving Officials', label: 'Travel Training for Card/Account Holders and Approving Officials'},
+];
+
+const v_all_info$ = useVuelidate(validation_info, user_input)
+
+//format dates from uswds standard to the format needed for backend 
+const formatDateToYYYYMMDD = (dates) => {
+  return dates ? dates.map(date => (date ? new Date(date).toISOString() : null)) : [];
+};
+
+async function downloadReport() {
+  isLoading.value = true
+  showSpinner.value = true
+  error.value = undefined
+  showSuccessMessage.value = false
+
+  try {
+    const dates = formatDateToYYYYMMDD(user_input.completion_date_range)
+    const model = {
+      'agency_id': user_input.agency_id || null,
+      'bureau_id': user_input.bureau_id || null,
+      'completion_date_start': dates[0] || null,
+      'completion_date_end': dates[1] || null,
+      'quiz_names': user_input.quiz_names || null
+    }
+    let response = await ReportRepository.downloadTrainingCompletionReport(model)
+    const blob = await response.blob();
+    await ReportUtilities.downloadBlobAsFile(blob, 'SmartPayTrainingReport.csv')
+    showSuccessMessage.value = true
+
+  } catch (error) {
+    setError(error)
+  }
+
+  isLoading.value = false
+  showSpinner.value = false
+}
 
 </script>
 <template>
   <section 
-    v-if="isReportUser"  
+    v-if="isReportUser"
     class="usa-prose"
   >
-    <h2>Download Your Report</h2>
-    <p>
-      We’ve created a report for you in CSV format. You can open it in the spreadsheet 
-      application of your choice (e.g. Microsoft Excel, Google Sheets, Apple Numbers).
-    </p>
-    <form
-      :action="report_url"
-      method="post"
-    >
-      <input 
-        type="hidden"
-        name="jwtToken"
-        :value="user.jwt"
-      >
-      <button
-        class="usa-button"
-        type="submit"
+    <div class="padding-top-4 padding-bottom-4 grid-container">
+      <h2>Download Your Report</h2>
+      <h2>Enter Report Parameters</h2>
+      <p>
+        The GSA SmartPay Training Report has no required parameters.
+      </p>
+      <p>
+        <b>Note:</b> If a report is generated with an individual completing multiple trainings, each training will be listed separately on the report.
+      </p>
+      <form
+        ref="form"
+        class="usa-form usa-form--large margin-bottom-3"
+        data-test="report-form"
+        @submit.prevent="downloadReport"
       >
-        Download Report
-      </button>
-    </form>
+        <ValidatedDateRangePicker
+          v-model="user_input.completion_date_range"
+          client:load
+          :validator="v_all_info$.completion_date_range"
+          label="Completion date range"
+          name="Completion date range"
+        />
+        <ValidatedCheckboxGroup
+          v-model="user_input.quiz_names"
+          :options="quiz_names_options"
+          :validator="v_all_info$.quiz_names"
+          name="Quiz type(s)"
+          legend="Quiz type(s)"
+          class="margin-top-4"
+        />
+        <USWDSComboBox
+          v-model="user_input.agency_id"
+          client:load
+          :validator="v_all_info$.agency_id"
+          :items="filteredAgencyOptions"
+          label="Agency / organization"
+          name="Agency"
+        />
+        <USWDSComboBox
+          v-if="filteredBureauOptions.length"
+          v-model="user_input.bureau_id"
+          client:load
+          :validator="v_all_info$.bureau_id"
+          :items="filteredBureauOptions"
+          label="Sub-agency, organization, or bureau"
+          name="Bureau"
+        />
+        <input
+          class="usa-button"
+          type="submit"
+          value="Submit"
+          :disabled="isLoading"
+          data-test="submit"
+        >
+        <div>
+          <USWDSAlert
+            v-if="error"
+            status="error"
+            class="usa-alert--slim"
+            :has-heading="false"
+          >
+            {{ error }}
+          </USWDSAlert>
+          <USWDSAlert
+            v-if="showSuccessMessage"
+            status="success"
+            class="usa-alert--slim"
+            :has-heading="false"
+          >
+            Report has been generated.
+          </USWDSAlert>
+        </div>
+        <div class="grid-row grid-gap margin-top-3">
+          <!--display spinner along with submit button in one row for desktop-->
+          <div
+            v-if="showSpinner"
+            class="display-none tablet:display-block tablet:grid-col-1 tablet:padding-top-3 tablet:margin-left-neg-1"
+          >
+            <SpinnerGraphic />
+          </div>
+        </div>
+        <!--display spinner under submit button for mobile view-->
+        <div
+          v-if="showSpinner"
+          class="tablet:display-none margin-top-1 text-center"
+        >
+          <SpinnerGraphic />
+        </div>
+      </form>
+    </div>
   </section>
   <section v-else>
-    <USWDSAlert      
+    <USWDSAlert
       status="error"
       class="usa-alert"
       heading="You are not authorized to receive reports."
     >
-      Your email account is not authorized to access training reports. If you should be authorized, you can 
+      Your email account is not authorized to access training reports. If you should be authorized, you can
       <a
         class="usa-link"
         href="mailto:gsa_smartpay@gsa.gov"
diff --git a/training-front-end/src/components/__tests__/TrainingReportDownload.spec.js b/training-front-end/src/components/__tests__/TrainingReportDownload.spec.js
new file mode 100644
index 00000000..ab117bfe
--- /dev/null
+++ b/training-front-end/src/components/__tests__/TrainingReportDownload.spec.js
@@ -0,0 +1,108 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { mount, flushPromises  } from '@vue/test-utils'
+import { vi } from 'vitest';
+import TrainingReportDownload from '../TrainingReportDownload.vue';
+import ReportRepository from '../ReportRepository.vue';
+import { profile } from '../../stores/user';
+
+// Mocking the ReportUtilities module
+vi.mock('../ReportUtilities.vue', () => ({
+    default: {
+        downloadBlobAsFile: vi.fn(), // Mock this method to do nothing
+    },
+}));
+
+const agency_api = [
+    { 'id': 1, 'name': 'General Services Administration', 'bureaus': []},
+    { 'id': 2,
+        'name': 'Department of the Treasury',
+        'bureaus': [
+            {'id': 3, 'name': 'United States Mint'},
+            {'id': 4, 'name': 'Financial Crimes Enforcement'}
+        ]
+    },
+    { 'id': 5, 'name': 'Department of the Interior', 'bureaus': []}
+]
+
+describe('TrainingReportDownload.vue', () => {
+    let wrapper;
+
+    beforeEach(async () => {
+        // Reset all mocks before each test
+        vi.clearAllMocks();
+
+        vi.spyOn(global, 'fetch').mockImplementation(() => {
+            return Promise.resolve({ok: true, status:200, json: () => Promise.resolve(agency_api) })
+        })
+
+        // Set the profile mock with Report role
+        profile.set({ name: 'Amelia Sedley', jwt: 'some-token-value', roles: ['Report'], 
+            report_agencies: [
+                {name: 'General Services Administration', bureau: null, id: 1},
+                {name: 'Department of the Treasury', bureau: 'Financial Crimes Enforcement', id: 4},
+                {name: 'Department of the Interior', bureau: null, id: 5}
+            ] });
+
+        wrapper = await mount(TrainingReportDownload, {
+            global: {
+                stubs: {
+                    // Stub child components that are not essential for the test
+                    USWDSAlert: true,
+                    ValidatedSelect: true,
+                    ValidatedDateRangePicker: true,
+                    ValidatedCheckboxGroup: true,
+                    SpinnerGraphic: true,
+                },
+            },
+        });
+    });
+
+    it('renders the form when the user is an Report', () => {
+        expect(wrapper.html()).toContain('Enter Report Parameters');
+        expect(wrapper.find('form').exists()).toBe(true);
+    });
+
+    it('displays an error message when the user is not authorized', async () => {
+        // Change the profile to non report user
+        profile.set({ name: 'Amelia Sedley', jwt: 'some-token-value', roles: [] });
+
+        await wrapper.vm.$nextTick();
+
+        expect(wrapper.html()).toContain('You are not authorized to receive reports.');
+        expect(wrapper.find('form').exists()).toBe(false);
+    });
+
+    it('handles errors during report download', async () => {
+        ReportRepository.downloadTrainingCompletionReport = vi.fn(() => Promise.reject(new Error('Failed to download')));
+
+        await wrapper.find('form').trigger('submit.prevent');
+
+        expect(wrapper.vm.error.message).toBe('Failed to download');
+    });
+
+    it('shows a success message after a successful report download', async () => {
+        ReportRepository.downloadTrainingCompletionReport = vi.fn(() =>
+            Promise.resolve({
+                blob: () => new Blob(['mock-csv-content'], { type: 'text/csv' }),
+            })
+        );
+
+        // Trigger the form submission
+        await wrapper.find('form').trigger('submit.prevent');
+
+        // Wait for all pending promises and Vue updates to complete
+        await flushPromises();
+
+        // Assert that the success message is shown
+        expect(wrapper.vm.showSuccessMessage).toBe(true);
+    });
+
+    it('displays a spinner while the report is loading', async () => {
+        const downloadPromise = new Promise(() => {}); // Mock a pending download
+        ReportRepository.downloadTrainingCompletionReport = vi.fn(() => downloadPromise);
+
+        await wrapper.find('form').trigger('submit.prevent');
+
+        expect(wrapper.vm.showSpinner).toBe(true);
+    });
+});
\ No newline at end of file
diff --git a/training/api/api_v1/users.py b/training/api/api_v1/users.py
index 32fde4e6..c4b045b7 100644
--- a/training/api/api_v1/users.py
+++ b/training/api/api_v1/users.py
@@ -3,10 +3,9 @@
 import logging
 from training.api.auth import RequireRole
 from fastapi import APIRouter, status, HTTPException, Response, Depends, Query
-from training.schemas import User, UserCreate, UserSearchResult, UserUpdate, AdminSmartPayTrainingReportFilter
+from training.schemas import User, UserCreate, UserSearchResult, UserUpdate, SmartPayTrainingReportFilter
 from training.repositories import UserRepository
 from training.api.deps import user_repository
-from training.api.auth import user_from_form
 from typing import Annotated
 
 
@@ -48,14 +47,24 @@ def edit_user_for_reporting(
         )
 
 
-@router.post("/users/download-user-quiz-completion-report")
-def download_report_csv(user=Depends(user_from_form), repo: UserRepository = Depends(user_repository)):
+@router.post("/users/download-smartpay-training-report")
+def download_smartpay_training_report_csv(
+        filter_info: SmartPayTrainingReportFilter,
+        repo: UserRepository = Depends(user_repository),
+        user=Depends(RequireRole(["Report"]))
+):
+    '''
+    :param filter_info: filter parameters
+    :param repo: User Repository
+    :param user: User
+    :return: Returns a report of all quiz_completions based on the pasted in filter_info.
+    '''
     try:
-        results = repo.get_user_quiz_completion_report(user['id'])
+        results = repo.get_user_quiz_completion_report(filter_info, user['id'])
     except ValueError:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
-            detail="invalid report user"
+            detail="Unable to process"
         )
 
     output = StringIO()
@@ -73,7 +82,7 @@ def download_report_csv(user=Depends(user_from_form), repo: UserRepository = Dep
 
 @router.post("/users/download-admin-smartpay-training-report")
 def download_admin_smartpay_training_report_csv(
-    filter_info: AdminSmartPayTrainingReportFilter,
+    filter_info: SmartPayTrainingReportFilter,
     repo: UserRepository = Depends(user_repository),
     user=Depends(RequireRole(["Admin"])
                  )):
diff --git a/training/repositories/user.py b/training/repositories/user.py
index ad365ab4..e25dd47e 100644
--- a/training/repositories/user.py
+++ b/training/repositories/user.py
@@ -1,7 +1,7 @@
 from sqlalchemy import nullsfirst, or_
 from sqlalchemy.orm import Session
 from training import models, schemas
-from training.schemas import UserQuizCompletionReportData, UserSearchResult, AdminSmartPayTrainingReportFilter
+from training.schemas import UserQuizCompletionReportData, UserSearchResult, SmartPayTrainingReportFilter
 from .base import BaseRepository
 from datetime import datetime
 from collections import namedtuple
@@ -54,23 +54,70 @@ def edit_user_for_reporting(self, user_id: int, report_agencies_list: list[int],
         self._session.commit()
         return db_user
 
-    def get_user_quiz_completion_report(self, report_user_id: int) -> list[UserQuizCompletionReportData]:
+    def get_user_quiz_completion_report(self, filter: SmartPayTrainingReportFilter, report_user_id: int) -> list[UserQuizCompletionReportData]:
+        report_data = namedtuple("ReportData", ["name", "email", "agency", "bureau", "quiz", "completion_date"])
         report_user = self.find_by_id(report_user_id)
+
+        # Build the query
+        query = (
+            self._session.query(
+                models.User.name,
+                models.User.email,
+                models.Agency.name,
+                models.Agency.bureau,
+                models.Quiz.name,
+                models.QuizCompletion.submit_ts
+            )
+            .select_from(models.User)
+            .join(models.Agency)
+            .join(models.QuizCompletion)
+            .join(models.Quiz)
+            .filter(models.QuizCompletion.passed)
+        )
+
         if report_user and report_user.report_agencies:
-            allowed_agency_ids = [obj.id for obj in report_user.report_agencies]
-            results = (self._session.query(models.User.name.label("name"), models.User.email.label("email"),
-                                           models.Agency.name.label("agency"), models.Agency.bureau.label("bureau"),
-                                           models.Quiz.name.label("quiz"), models.QuizCompletion.submit_ts.label("completion_date"))
-                       .select_from(models.User)
-                       .join(models.Agency)
-                       .join(models.QuizCompletion)
-                       .join(models.Quiz).filter(models.QuizCompletion.passed, models.User.agency_id.in_(allowed_agency_ids))
-                       .order_by(models.Agency.name.asc(), nullsfirst(models.Agency.bureau.asc()), models.QuizCompletion.submit_ts.desc()).all())
-            return results
+            # Dynamically add filters based on the properties of the SmartPayTrainingReportFilter
+            if filter.bureau_id is not None:
+                query = query.filter(models.User.agency_id == filter.bureau_id)
+            elif filter.agency_id is not None:
+                query = query.filter(models.User.agency_id == filter.agency_id)
+            else:
+                allowed_agency_ids = [obj.id for obj in report_user.report_agencies]
+                query = query.filter(models.User.agency_id.in_(allowed_agency_ids))
+
+            if filter.completion_date_start is not None:
+                query = query.filter(models.QuizCompletion.submit_ts >= filter.completion_date_start)
+
+            if filter.completion_date_end is not None:
+                query = query.filter(models.QuizCompletion.submit_ts <= filter.completion_date_end)
+
+            if filter.quiz_names:
+                query = query.filter(models.Quiz.name.in_(filter.quiz_names))
+
+            raw_results = query.order_by(
+                models.Agency.name.asc(),
+                nullsfirst(models.Agency.bureau.asc()),
+                models.QuizCompletion.submit_ts.desc()
+            ).all()
+
+            # Map the results to the Pydantic model using the `ReportData` namedtuple
+            result = [
+                UserQuizCompletionReportData(
+                    name=row.name,
+                    email=row.email,
+                    agency=row.agency,
+                    bureau=row.bureau,
+                    quiz=row.quiz,
+                    completion_date=row.completion_date
+                )
+                for row in map(report_data._make, raw_results)
+            ]
+
+            return result
         else:
             raise ValueError("Invalid Report User")
 
-    def get_admin_smartpay_training_report(self, filter: AdminSmartPayTrainingReportFilter) -> list[UserQuizCompletionReportData]:
+    def get_admin_smartpay_training_report(self, filter: SmartPayTrainingReportFilter) -> list[UserQuizCompletionReportData]:
         report_data = namedtuple("ReportData", ["name", "email", "agency", "bureau", "quiz", "completion_date"])
 
         # Build the query
@@ -90,7 +137,7 @@ def get_admin_smartpay_training_report(self, filter: AdminSmartPayTrainingReport
             .filter(models.QuizCompletion.passed)
         )
 
-        # Dynamically add filters based on the properties of the AdminSmartPayTrainingReportFilter
+        # Dynamically add filters based on the properties of the SmartPayTrainingReportFilter
         if filter.bureau_id is not None:
             query = query.filter(models.User.agency_id == filter.bureau_id)
         elif filter.agency_id is not None:
diff --git a/training/schemas/__init__.py b/training/schemas/__init__.py
index c6e28bec..b5553152 100644
--- a/training/schemas/__init__.py
+++ b/training/schemas/__init__.py
@@ -18,4 +18,4 @@
 from .report_user_x_agency import ReportUserXAgency
 from .role import Role, RoleCreate
 from .reports import UserQuizCompletionReportData, GspcCompletionReportData
-from .admin_smartpay_training_report_filter import AdminSmartPayTrainingReportFilter
+from .smartpay_training_report_filter import SmartPayTrainingReportFilter
diff --git a/training/schemas/smartpay_training_report_filter.py b/training/schemas/smartpay_training_report_filter.py
new file mode 100644
index 00000000..9e0b23f5
--- /dev/null
+++ b/training/schemas/smartpay_training_report_filter.py
@@ -0,0 +1,12 @@
+from pydantic import ConfigDict, BaseModel
+from datetime import datetime
+from typing import List, Optional
+
+
+class SmartPayTrainingReportFilter(BaseModel):
+    agency_id: Optional[int] = None
+    bureau_id: Optional[int] = None
+    completion_date_start: Optional[datetime] = None
+    completion_date_end: Optional[datetime] = None
+    quiz_names: Optional[List[str]] = None
+    model_config = ConfigDict(from_attributes=True)
diff --git a/training/tests/conftest.py b/training/tests/conftest.py
index 826254da..5ebfd041 100644
--- a/training/tests/conftest.py
+++ b/training/tests/conftest.py
@@ -5,6 +5,7 @@
 import pytest
 import yaml
 import pathlib
+from datetime import datetime
 from training.api.deps import agency_repository, quiz_repository, quiz_service, user_repository
 from training.database import engine
 from training import models, schemas
@@ -90,11 +91,13 @@ def db_with_data(db: Session, testdata: dict):
         db.refresh(quiz)
         quiz_ids.append(quiz.id)
 
-    quiz_completion_pass = models.QuizCompletion(user_id=user_ids[-1], quiz_id=quiz_ids[-1], passed=True)
+    quiz_completion_pass = models.QuizCompletion(user_id=user_ids[-1], quiz_id=quiz_ids[-1], passed=True,
+                                                 submit_ts=datetime(2024, 1, 24))
     db.add(quiz_completion_pass)
     db.commit()
 
-    quiz_completion_fail = models.QuizCompletion(user_id=user_ids[-1], quiz_id=quiz_ids[-1], passed=False)
+    quiz_completion_fail = models.QuizCompletion(user_id=user_ids[-1], quiz_id=quiz_ids[-1], passed=False,
+                                                 submit_ts=datetime(2024, 1, 24))
     db.add(quiz_completion_fail)
     db.commit()
     for role in testdata["roles"]:
diff --git a/training/tests/test_api_users.py b/training/tests/test_api_users.py
index 9789cecd..d7c1409b 100644
--- a/training/tests/test_api_users.py
+++ b/training/tests/test_api_users.py
@@ -27,6 +27,21 @@ def adminJWT(admin_user):
     return jwt.encode(admin_user, settings.JWT_SECRET, algorithm="HS256")
 
 
+@pytest.fixture
+def report_user():
+    return {
+        'id': 50,
+        'name': 'Harry Potter',
+        'email': 'potter@hogwarts.edu',
+        'roles': ['Report']
+    }
+
+
+@pytest.fixture
+def reportJWT(report_user):
+    return jwt.encode(report_user, settings.JWT_SECRET, algorithm="HS256")
+
+
 client = TestClient(app)
 
 
@@ -167,3 +182,39 @@ def test_get_admin_smartpay_training_report(adminJWT):
         lines = csv_output.readlines()
         assert lines[0].strip() == 'Full Name,Email Address,Agency,Bureau,Quiz Name,Quiz Completion Date and Time'
         assert lines[1].strip() == 'John Doe,john.doe@example.com,Agency X,Bureau Y,Sample Quiz,10/11/2024 12:00:00'
+
+
+@patch('training.config.settings', 'JWT_SECRET', 'super_secret')
+def test_get_smartpay_training_report(reportJWT):
+    mock_report_data = [
+        UserQuizCompletionReportData(
+            name='John Doe',
+            email='john.doe@example.com',
+            agency='Agency X',
+            bureau='Bureau Y',
+            quiz='Sample Quiz',
+            completion_date=datetime(2024, 10, 11, 12, 0, 0)
+        )
+    ]
+
+    mock_filter_info = {
+        # props are allowed to be null
+    }
+
+    # Mock the repo and RequireRole dependencies
+    with patch('training.repositories.UserRepository.get_user_quiz_completion_report', return_value=mock_report_data):
+
+        response = client.post(
+            "/api/v1/users/download-smartpay-training-report",
+            json=mock_filter_info,
+            headers={"Authorization": f"Bearer {reportJWT}"}
+        )
+
+        assert response.status_code == 200
+        assert response.headers['Content-Disposition'] == 'attachment; filename="SmartPayTrainingQuizCompletionReport.csv"'
+
+        # Check if the response body contains correct CSV content
+        csv_output = StringIO(response.text)
+        lines = csv_output.readlines()
+        assert lines[0].strip() == 'Full Name,Email Address,Agency,Bureau,Quiz Name,Quiz Completion Date and Time'
+        assert lines[1].strip() == 'John Doe,john.doe@example.com,Agency X,Bureau Y,Sample Quiz,10/11/2024 12:00:00'
diff --git a/training/tests/test_user_repository.py b/training/tests/test_user_repository.py
index f2f399e5..8b83788f 100644
--- a/training/tests/test_user_repository.py
+++ b/training/tests/test_user_repository.py
@@ -1,8 +1,11 @@
 from typing import List
+from unittest.mock import patch
 import pytest
 from training import models, schemas
 from training.repositories import UserRepository, AgencyRepository
 from datetime import datetime, timedelta
+from training.schemas import Agency, AgencyCreate
+from training.tests.factories import UserSchemaFactory
 
 
 def test_create(user_repo_empty: UserRepository, agency_repo_with_data: AgencyRepository):
@@ -163,7 +166,7 @@ def test_get_admin_smartpay_training_report_no_filters(user_repo_with_data: User
     """
     Test fetching report data without any filters applied.
     """
-    report_filter = schemas.AdminSmartPayTrainingReportFilter()
+    report_filter = schemas.SmartPayTrainingReportFilter()
     results = user_repo_with_data.get_admin_smartpay_training_report(report_filter)
     assert len(results) > 0  # Check that we get results back
     assert all(isinstance(result, schemas.UserQuizCompletionReportData) for result in results)  # Verify type
@@ -175,7 +178,7 @@ def test_get_admin_smartpay_training_report_filter_by_date_range(user_repo_with_
     """
     start_date = datetime(2023, 1, 1)
     end_date = datetime(2024, 12, 31)
-    report_filter = schemas.AdminSmartPayTrainingReportFilter(completion_date_start=start_date, completion_date_end=end_date)
+    report_filter = schemas.SmartPayTrainingReportFilter(completion_date_start=start_date, completion_date_end=end_date)
     results = user_repo_with_data.get_admin_smartpay_training_report(report_filter)
 
     assert len(results) > 0
@@ -188,8 +191,81 @@ def test_get_admin_smartpay_training_report_filter_by_quiz_name(user_repo_with_d
     Test fetching report data by filtering with specific quiz names.
     """
     quiz_names = ["Travel Training for Ministry of Magic"]
-    report_filter = schemas.AdminSmartPayTrainingReportFilter(quiz_names=quiz_names)
+    report_filter = schemas.SmartPayTrainingReportFilter(quiz_names=quiz_names)
     results = user_repo_with_data.get_admin_smartpay_training_report(report_filter)
 
     assert len(results) > 0
     assert all(result.quiz in quiz_names for result in results)
+
+
+def test_get_smartpay_training_report_no_filters(user_repo_with_data: UserRepository, agency_repo_with_data: AgencyRepository):
+    """
+    Test fetching report data without any filters applied.
+    """
+    valid_agency = agency_repo_with_data.find_by_name(AgencyCreate(name="Department of Mysteries"))
+    mock_user = UserSchemaFactory.build(roles=[])
+    agency = Agency(id=valid_agency.id, name=valid_agency.name)
+    mock_user.report_agencies.append(agency)
+
+    # Mock the repo and RequireRole dependencies
+    with patch('training.repositories.UserRepository.find_by_id', return_value=mock_user):
+
+        report_filter = schemas.SmartPayTrainingReportFilter()
+        results = user_repo_with_data.get_user_quiz_completion_report(report_filter, 1)
+        assert len(results) > 0  # Check that we get results back
+        assert all(isinstance(result, schemas.UserQuizCompletionReportData) for result in results)  # Verify type
+
+
+def test_get_smartpay_training_report_with_filter_by_quiz_name(user_repo_with_data: UserRepository, agency_repo_with_data: AgencyRepository):
+    """
+    Test fetching report data with filters applied.
+    """
+    valid_agency = agency_repo_with_data.find_by_name(AgencyCreate(name="Department of Mysteries"))
+    mock_user = UserSchemaFactory.build(roles=[])
+    agency = Agency(id=valid_agency.id, name=valid_agency.name)
+    mock_user.report_agencies.append(agency)
+
+    # Mock the repo and RequireRole dependencies
+    with patch('training.repositories.UserRepository.find_by_id', return_value=mock_user):
+
+        quiz_names = ["Travel Training for Ministry of Magic"]
+        report_filter = schemas.SmartPayTrainingReportFilter(quiz_names=quiz_names)
+        results = user_repo_with_data.get_user_quiz_completion_report(report_filter, 1)
+        assert len(results) > 0  # Check that we get results back
+        assert all(result.quiz in quiz_names for result in results)
+
+
+def test_get_smartpay_training_report_with_filter_by_date_range(user_repo_with_data: UserRepository, agency_repo_with_data: AgencyRepository):
+    """
+    Test fetching report data with filters applied.
+    """
+    valid_agency = agency_repo_with_data.find_by_name(AgencyCreate(name="Department of Mysteries"))
+    mock_user = UserSchemaFactory.build(roles=[])
+    agency = Agency(id=valid_agency.id, name=valid_agency.name)
+    mock_user.report_agencies.append(agency)
+
+    # Mock the repo and RequireRole dependencies
+    with patch('training.repositories.UserRepository.find_by_id', return_value=mock_user):
+
+        start_date = datetime(2023, 1, 1)
+        end_date = datetime(2024, 12, 31)
+        report_filter = schemas.SmartPayTrainingReportFilter(completion_date_start=start_date, completion_date_end=end_date)
+        results = user_repo_with_data.get_user_quiz_completion_report(report_filter, 1)
+        assert len(results) > 0  # Check that we get results back
+        for result in results:
+            assert start_date <= result.completion_date <= end_date
+
+
+def test_get_smartpay_training_report_with_no_report_agencies(user_repo_with_data: UserRepository):
+    """
+    Test fetching report data with no reporting agency for user
+    """
+    mock_user = UserSchemaFactory.build(roles=[])
+    mock_user.report_agencies = []
+
+    # Mock the repo and RequireRole dependencies
+    with patch('training.repositories.UserRepository.find_by_id', return_value=mock_user):
+
+        report_filter = schemas.SmartPayTrainingReportFilter()
+        with pytest.raises(Exception):
+            user_repo_with_data.get_user_quiz_completion_report(report_filter, 1)

From 879a0e56a08a0fed14baef3ac83306b9d0c9cc5a Mon Sep 17 00:00:00 2001
From: Dan Felder <d.felder@kunzleigh.com>
Date: Thu, 9 Jan 2025 15:36:31 -0500
Subject: [PATCH 2/4] Fixed merge issue

---
 .../schemas/admin_smartpay_training_report_filter.py | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 training/schemas/admin_smartpay_training_report_filter.py

diff --git a/training/schemas/admin_smartpay_training_report_filter.py b/training/schemas/admin_smartpay_training_report_filter.py
deleted file mode 100644
index 7b0ed224..00000000
--- a/training/schemas/admin_smartpay_training_report_filter.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from pydantic import ConfigDict, BaseModel
-from datetime import datetime
-from typing import List, Optional
-
-
-class AdminSmartPayTrainingReportFilter(BaseModel):
-    agency_id: Optional[int] = None
-    bureau_id: Optional[int] = None
-    completion_date_start: Optional[datetime] = None
-    completion_date_end: Optional[datetime] = None
-    quiz_names: Optional[List[str]] = None
-    model_config = ConfigDict(from_attributes=True)

From 442b14ae25ec5c35d95c748fa9c490bb25ebc3f6 Mon Sep 17 00:00:00 2001
From: Dan Felder <d.felder@kunzleigh.com>
Date: Fri, 10 Jan 2025 15:55:28 -0500
Subject: [PATCH 3/4] Added finally block to reset loading and show spinner
 boolean value

---
 .../src/components/TrainingReportDownload.vue               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/training-front-end/src/components/TrainingReportDownload.vue b/training-front-end/src/components/TrainingReportDownload.vue
index a52ef862..54de0a78 100644
--- a/training-front-end/src/components/TrainingReportDownload.vue
+++ b/training-front-end/src/components/TrainingReportDownload.vue
@@ -93,10 +93,10 @@ async function downloadReport() {
 
   } catch (error) {
     setError(error)
+  } finally {
+    isLoading.value = false
+    showSpinner.value = false
   }
-
-  isLoading.value = false
-  showSpinner.value = false
 }
 
 </script>

From 2ec8200f12e17634b0ead8a66e5ad9d4bfac5553 Mon Sep 17 00:00:00 2001
From: Dan Felder <d.felder@kunzleigh.com>
Date: Mon, 13 Jan 2025 09:25:55 -0500
Subject: [PATCH 4/4] Update Fedrooms broken link

---
 training-front-end/src/content/training_travel/lesson06.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/training-front-end/src/content/training_travel/lesson06.mdx b/training-front-end/src/content/training_travel/lesson06.mdx
index 151d6748..60155a64 100644
--- a/training-front-end/src/content/training_travel/lesson06.mdx
+++ b/training-front-end/src/content/training_travel/lesson06.mdx
@@ -17,7 +17,7 @@ At most agencies, you will make travel reservations through your agency's Travel
 There are several benefits to having the TMC/CTO make your reservations:
 - Compliance with the [Fly America Act](https://www.gsa.gov/policy-regulations/policy/travel-management-policy/fly-america-act), governmentwide travel policies, contract city pair fares, electronic ticketing and ticket delivery.
 - Compliance with the [Hotel/Motel Fire Safety Act](https://www.congress.gov/bill/101st-congress/house-bill/94).
-- [FedRooms](https://www.fedrooms.com/) consideration and benefits:
+- [FedRooms](https://www.gsa.gov/travel/plan-a-trip/lodging/fedrooms) consideration and benefits:
   - Provides Federal Travel Regulation (FTR), Federal Emergency Management Agency (FEMA) and Americans with Disabilities Act (ADA) compliant hotel rooms for federal government travelers on official business.
   - Customers receive benefits such as best price/value (at or below per diem), policy compliant hotels, flexibility when canceling, a variety of booking channels and quality lodging worldwide.
   - Hotels are educated in state tax exempt policy and procedures.