From 479bcaa0fdcff7b28934aa282def955afe086652 Mon Sep 17 00:00:00 2001
From: Dan Felder <30899941+felder101@users.noreply.github.com>
Date: Fri, 26 Jul 2024 09:16:19 -0400
Subject: [PATCH] Production Release (#609)

Includes sprint 34 and 34 issues

Link Checker #369
Adding Drone Content to all Trainings #599
Adding FASCSA Order Check to all Trainings #598
Accessibility Bug: Buttons without Accessible Names on all Trainings Print Training Functionality #591
Admin Panel - Display Completed Quizzes/Certificates for Users #317
Research solutions for implementing audit fields #451
Update GSPC Image #601
Log Tracking Editing of User Records #443
---
 .github/workflows/frontend-tests.yaml         |   3 +
 .../291331bea272_user_audit_fields.py         |  31 +++
 data/seedsdata.yaml                           |   1 -
 training-front-end/linkinator-config.json     |  17 ++
 training-front-end/package-lock.json          | 182 +++++++++++++++++-
 training-front-end/package.json               |   7 +-
 training-front-end/public/images/gspc.svg     |   1 +
 .../src/components/AdminEditReporting.vue     | 118 +++++++++++-
 .../AdminViewUserCertificateTable.vue         | 128 ++++++++++++
 .../src/components/CertificateTable.vue       |   2 +-
 .../__tests__/AdminEditReporting.spec.js      |  15 +-
 .../AdminViewUserCertificateTable.spec.js     | 131 +++++++++++++
 .../content/training_fleet_pc/lesson03.mdx    |  51 +++++
 .../content/training_purchase/lesson05.mdx    |  52 +++++
 .../content/training_purchase_pc/lesson03.mdx |  52 +++++
 .../src/content/training_travel/lesson03.mdx  |  52 +++++
 .../content/training_travel_pc/lesson03.mdx   |  52 +++++
 .../pages/training_fleet_pc/printable.astro   |   6 +-
 .../pages/training_purchase/printable.astro   |   5 +-
 .../training_purchase_pc/printable.astro      |   5 +-
 .../src/pages/training_travel/printable.astro |   5 +-
 .../pages/training_travel_pc/printable.astro  |   5 +-
 training/api/api_v1/certificates.py           |  23 ++-
 training/api/api_v1/users.py                  |   7 +-
 training/api/deps.py                          |   4 +-
 training/models/user.py                       |   7 +-
 training/repositories/certificate.py          |   2 +-
 training/repositories/user.py                 |  11 +-
 training/schemas/user.py                      |  22 +++
 training/tests/conftest.py                    |   2 +-
 training/tests/test_api_certificates.py       |  42 +++-
 training/tests/test_api_loginless_flow.py     |   6 +-
 training/tests/test_certificate_repository.py |   4 +-
 training/tests/test_user_repository.py        |  20 +-
 training/tests/testdata.yaml                  |   3 +
 35 files changed, 1022 insertions(+), 52 deletions(-)
 create mode 100644 alembic/versions/291331bea272_user_audit_fields.py
 create mode 100644 training-front-end/linkinator-config.json
 create mode 100644 training-front-end/public/images/gspc.svg
 create mode 100644 training-front-end/src/components/AdminViewUserCertificateTable.vue
 create mode 100644 training-front-end/src/components/__tests__/AdminViewUserCertificateTable.spec.js

diff --git a/.github/workflows/frontend-tests.yaml b/.github/workflows/frontend-tests.yaml
index 7a087443..ab2523fb 100644
--- a/.github/workflows/frontend-tests.yaml
+++ b/.github/workflows/frontend-tests.yaml
@@ -34,3 +34,6 @@ jobs:
 
       - name: Run pa11y 
         run: npm run pa11y-ci:gh 
+
+      - name: Run broken link checker 
+        run: npm run link-checker:pipeline 
diff --git a/alembic/versions/291331bea272_user_audit_fields.py b/alembic/versions/291331bea272_user_audit_fields.py
new file mode 100644
index 00000000..ebeb99b7
--- /dev/null
+++ b/alembic/versions/291331bea272_user_audit_fields.py
@@ -0,0 +1,31 @@
+"""user-audit-fields
+
+Revision ID: 291331bea272
+Revises: a5fbdcd0e719
+Create Date: 2024-07-19 09:06:27.754024
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '291331bea272'
+down_revision = 'a5fbdcd0e719'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column('users', sa.Column('created_on', sa.DateTime, nullable=False, server_default=sa.func.current_timestamp()))
+    op.add_column('users', sa.Column('created_by', sa.String(), nullable=False, server_default='Migrated'))
+    op.alter_column('users', 'created_by', server_default=None)
+    op.add_column('users', sa.Column('modified_on', sa.DateTime, nullable=True))
+    op.add_column('users', sa.Column('modified_by', sa.String(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column('users', 'created_on')
+    op.drop_column('users', 'created_by')
+    op.drop_column('users', 'modified_on')
+    op.drop_column('users', 'modified_by')
diff --git a/data/seedsdata.yaml b/data/seedsdata.yaml
index 08c5236f..dc93f6ca 100644
--- a/data/seedsdata.yaml
+++ b/data/seedsdata.yaml
@@ -966,7 +966,6 @@ AOPSs:
     email: stcdirector@sierratribal.org
     agency: Native American Tribal Governments
     bureau: Sierra Tribal Consortium, INC.
-    bureau: null
     reporting_agencies:
       - report_agency: Native American Tribal Governments
         report_bureau: Sierra Tribal Consortium, INC.
diff --git a/training-front-end/linkinator-config.json b/training-front-end/linkinator-config.json
new file mode 100644
index 00000000..009c9c22
--- /dev/null
+++ b/training-front-end/linkinator-config.json
@@ -0,0 +1,17 @@
+{
+    "recurse": true,
+    "headers": {
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:126.0) Gecko/20100101 Firefox/126.0",
+        "Referer": "http://localhost:4321/"
+    },
+    "skip": [
+        "https://www.fpds.gov/",
+        "https://www.congress.gov/bill/101st-congress/house-bill/94",
+        "/printable/printable/$",
+        "http://www.energystar.gov/",
+        "http://www.biopreferred.gov/BioPreferred/",
+        "https://www.gsaadvantage.gov/advantage/ws/main/start_page\\?store=ADVANTAGE",
+        "https://www.congress.gov/bill/118th-congress/house-bill/2670"
+    ],
+    "verbosity": "debug"
+}
\ No newline at end of file
diff --git a/training-front-end/package-lock.json b/training-front-end/package-lock.json
index b2ed8cb5..249d62a1 100644
--- a/training-front-end/package-lock.json
+++ b/training-front-end/package-lock.json
@@ -39,6 +39,7 @@
         "eslint-plugin-vue": "^9.11.0",
         "eslint-plugin-vuejs-accessibility": "^2.1.0",
         "jsdom": "^21.1.1",
+        "linkinator": "^6.0.5",
         "pa11y-ci": "^3.0.1",
         "start-server-and-test": "^2.0.3",
         "vitest": "^1.5.3"
@@ -9069,8 +9070,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
@@ -10793,6 +10793,72 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/gaxios": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.6.0.tgz",
+      "integrity": "sha512-bpOZVQV5gthH/jVCSuYuokRo2bTKOcuBiVWpjmTn6C5Agl5zclGfTljuGsQZxwwDBkli+YhZhP4TdlqTnhOezQ==",
+      "dev": true,
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^7.0.1",
+        "is-stream": "^2.0.0",
+        "node-fetch": "^2.6.9",
+        "uuid": "^9.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/gaxios/node_modules/agent-base": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
+      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/gaxios/node_modules/https-proxy-agent": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
+      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^7.0.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/gaxios/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gaxios/node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -14318,6 +14384,61 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
+    "node_modules/linkinator": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/linkinator/-/linkinator-6.0.5.tgz",
+      "integrity": "sha512-LRMHgO/29gk2WQzdj4cFcFHGKPhYPGBWVZOayATP6j3159ubonGJizObNRvgA5qDnrkqsRwJT7p4Tq97pC9GeA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^5.0.0",
+        "escape-html": "^1.0.3",
+        "gaxios": "^6.0.0",
+        "glob": "^10.3.10",
+        "htmlparser2": "^9.0.0",
+        "marked": "^12.0.1",
+        "meow": "^13.0.0",
+        "mime": "^4.0.0",
+        "server-destroy": "^1.0.1",
+        "srcset": "^5.0.0"
+      },
+      "bin": {
+        "linkinator": "build/src/cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/linkinator/node_modules/chalk": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+      "dev": true,
+      "engines": {
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/linkinator/node_modules/htmlparser2": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
+      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.1.0",
+        "entities": "^4.5.0"
+      }
+    },
     "node_modules/load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -14905,6 +15026,18 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/marked": {
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-12.0.2.tgz",
+      "integrity": "sha512-qXUm7e/YKFoqFPYPa3Ukg9xlI5cyAtGmyEIzMfW//m6kXwCy2Ps9DYf5ioijFKQ8qyuscrHoY04iJGctu2Kg0Q==",
+      "dev": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/matchdep": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
@@ -15671,6 +15804,18 @@
         "timers-ext": "^0.1.7"
       }
     },
+    "node_modules/meow": {
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-13.2.0.tgz",
+      "integrity": "sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -16788,6 +16933,21 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/mime": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.3.tgz",
+      "integrity": "sha512-KgUb15Oorc0NEKPbvfa0wRU+PItIEZmiv+pyAO2i0oTIVTJhlzMclU7w4RXWQrSOVH5ax/p/CkIO7KI4OyFJTQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa"
+      ],
+      "bin": {
+        "mime": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -23679,6 +23839,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/server-destroy": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
+      "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==",
+      "dev": true
+    },
     "node_modules/set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -24326,6 +24492,18 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
     },
+    "node_modules/srcset": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/srcset/-/srcset-5.0.1.tgz",
+      "integrity": "sha512-/P1UYbGfJVlxZag7aABNRrulEXAwCSDo7fklafOQrantuPTDmYgijJMks2zusPCVzgW9+4P69mq7w6pYuZpgxw==",
+      "dev": true,
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
diff --git a/training-front-end/package.json b/training-front-end/package.json
index a8b15681..f1482371 100644
--- a/training-front-end/package.json
+++ b/training-front-end/package.json
@@ -15,7 +15,9 @@
     "pa11y-ci": "npm run pa11y-ci:desktop && npm run pa11y-ci:mobile",
     "pa11y-ci:desktop": "pa11y-ci --config ./.pa11yci-desktop --sitemap http://localhost:8080/sitemap-0.xml   --sitemap-find \"^https://training.smartpay.gsa.gov/\" --sitemap-replace \"http://localhost:8080/\"",
     "pa11y-ci:mobile": "pa11y-ci --config ./.pa11yci-mobile --sitemap http://localhost:8080/sitemap-0.xml   --sitemap-find \"^https://training.smartpay.gsa.gov\" --sitemap-replace \"http://localhost:8080/\"",
-    "pa11y-ci:gh": "npx start-server-and-test serve http://localhost:8080 pa11y-ci"
+    "pa11y-ci:gh": "npx start-server-and-test serve http://localhost:8080 pa11y-ci",
+    "link-checker": "npx linkinator http://localhost:4321/ --config linkinator-config.json",
+    "link-checker:pipeline": "npx start-server-and-test serve http://localhost:8080 'npx linkinator http://localhost:8080 --config linkinator-config.json'"
   },
   "dependencies": {
     "@astrojs/mdx": "^3.0.1",
@@ -51,7 +53,8 @@
     "jsdom": "^21.1.1",
     "pa11y-ci": "^3.0.1",
     "start-server-and-test": "^2.0.3",
-    "vitest": "^1.5.3"
+    "vitest": "^1.5.3",
+    "linkinator": "^6.0.5"
   },
   "overrides": {
     "glob-parent": "^5.1.2"
diff --git a/training-front-end/public/images/gspc.svg b/training-front-end/public/images/gspc.svg
new file mode 100644
index 00000000..a13b2a4c
--- /dev/null
+++ b/training-front-end/public/images/gspc.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="uuid-efae806c-cd17-44a1-affe-9917ed281473" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 611.09 382.53"><defs><style>.uuid-cc786aca-d15e-45af-b664-a231f6d0bf78{fill:#00467f;}.uuid-cc786aca-d15e-45af-b664-a231f6d0bf78,.uuid-4e40b6d2-fd22-49fc-a5e8-2eec58b1f82c,.uuid-b2547011-f8e7-4670-b9be-53b75ca72300{stroke-width:0px;}.uuid-4e40b6d2-fd22-49fc-a5e8-2eec58b1f82c{fill:#feedbc;fill-rule:evenodd;}.uuid-b2547011-f8e7-4670-b9be-53b75ca72300{fill:#fff;}</style></defs><g id="uuid-1ed0759e-974a-4833-82dd-04c970d1298d"><rect class="uuid-cc786aca-d15e-45af-b664-a231f6d0bf78" width="611.09" height="382.53"/><path class="uuid-b2547011-f8e7-4670-b9be-53b75ca72300" d="M166.99,339.88c-9.88,3.45-28.96,7.95-48.34,7.95-25.39,0-45.08-6.15-59.76-19.74-14.74-13.5-23.3-35.18-23.17-60.71.27-53.82,37.63-83.48,87.16-83.48,18.28,0,32.43,3.47,39.58,6.71l-6.38,23.14c-7.92-3.39-17.8-5.93-33.03-5.93-32,0-56.04,18.8-56.04,58.58s22.06,58.24,52.11,58.24c9.27,0,15.95-1.16,19.18-2.63v-41.58h-26.51v-22.43h55.18v81.88Z"/><path class="uuid-b2547011-f8e7-4670-b9be-53b75ca72300" d="M200.62,315.7c8.94,4.9,22.97,9.09,36.79,9.09,18.91,0,29.42-8.92,29.42-22.07,0-12.4-8.56-19.6-27.86-27.49-25.38-10.02-41.96-24.8-41.96-46.14,0-25.99,21.79-45.81,57.24-45.81,16.24,0,28.68,3.52,36.26,7.31l-6.72,23.15c-5.71-2.99-16.2-6.99-30.17-6.99-18.45,0-26.51,9.89-26.51,19.41,0,12.38,8.95,18.14,30.1,27.04,27.25,11.44,39.8,25.93,39.8,47.3,0,26.74-21.06,47.96-61.01,47.96-16.48,0-33.43-4.41-41.55-9.17l6.18-23.59Z"/><path class="uuid-b2547011-f8e7-4670-b9be-53b75ca72300" d="M328.24,187.61c10.53-1.85,24.64-3.24,42.93-3.24,21.3,0,37.27,4.09,47.9,12.85,9.89,7.93,15.79,20.52,15.79,35.24,0,15.54-4.97,27.69-13.95,36.31-11.79,11.57-30.24,17.09-50.02,17.09-4.9,0-9.27-.2-12.95-.85v61.27h-29.71v-158.66ZM357.94,262.57c3.36.79,7.41,1.07,12.64,1.07,21.63,0,34.54-11.1,34.54-29.84,0-16.95-11.18-27.44-31.74-27.44-7.11,0-12.44.64-15.44,1.34v54.87Z"/><path class="uuid-b2547011-f8e7-4670-b9be-53b75ca72300" d="M574.38,342.18c-6.66,3.13-20.72,6.28-38.51,6.28-49.55,0-79.29-31.41-79.29-80.59,0-55.57,37.8-84.59,83.41-84.59,17.69,0,30.18,3.37,35.6,6.2l-6.23,22.86c-6.77-2.92-15.98-5.4-28.14-5.4-29.91,0-53.12,19.14-53.12,59.38,0,37.8,20.49,58.16,52.88,58.16,10.72,0,21.87-2.06,28.84-4.93l4.56,22.63Z"/><path class="uuid-4e40b6d2-fd22-49fc-a5e8-2eec58b1f82c" d="M92.65,32.19l8.37,12.08,12.56-7.63c1.43-.87,3.29-.04,3.6,1.6l2.73,14.44,14.58-1.86c1.66-.21,3.02,1.3,2.63,2.93l-3.38,14.31,14.08,4.23c1.6.48,2.23,2.41,1.22,3.74l-8.9,11.7,11.14,9.59c1.27,1.09,1.05,3.11-.41,3.91l-12.89,7.06,6.28,13.29c.71,1.51-.3,3.27-1.97,3.41l-14.65,1.21.33,14.7c.04,1.67-1.61,2.87-3.18,2.31l-13.87-4.85-5.68,13.56c-.65,1.54-2.63,1.96-3.85.82l-10.7-10.08-10.7,10.08c-1.22,1.15-3.2.72-3.85-.82l-5.68-13.56-13.87,4.85c-1.58.55-3.22-.64-3.18-2.31l.33-14.7-14.65-1.21c-1.67-.14-2.68-1.9-1.97-3.41l6.28-13.29-12.89-7.06c-1.47-.8-1.68-2.82-.41-3.91l11.14-9.59-8.9-11.7c-1.01-1.33-.38-3.26,1.22-3.74l14.08-4.23-3.38-14.31c-.38-1.63.98-3.14,2.63-2.93l14.58,1.86,2.73-14.44c.31-1.64,2.17-2.47,3.6-1.6l12.56,7.63,8.37-12.08c.95-1.37,2.98-1.37,3.94,0Z"/></g></svg>
\ No newline at end of file
diff --git a/training-front-end/src/components/AdminEditReporting.vue b/training-front-end/src/components/AdminEditReporting.vue
index 003b2c15..07a51f79 100644
--- a/training-front-end/src/components/AdminEditReporting.vue
+++ b/training-front-end/src/components/AdminEditReporting.vue
@@ -6,6 +6,7 @@ import USWDSComboBox from "./USWDSComboBox.vue";
 import {agencyList, bureauList, selectedAgencyId, setSelectedAgencyId} from '../stores/agencies'
 import {useStore} from '@nanostores/vue'
 import AdminEditUserDetails from "./AdminEditUserDetails.vue";
+import AdminViewUserCertificateTable from "./AdminViewUserCertificateTable.vue"
 
 const props = defineProps({
   user: {
@@ -59,6 +60,41 @@ async function updateUser(successMessage) {
 function cancelUpdate() {
   editing.value = false;
 }
+
+function formatDate(dateStr) {
+  // Check if the string is null, undefined, or empty
+  if (!dateStr || dateStr.trim() === '') {
+    return 'N/A';
+  }  
+  
+  const date = new Date(dateStr);
+
+  // Check if the date is valid
+  if (isNaN(date.getTime())) {
+    return 'N/A';
+  }
+
+  //doing it this way to reduce dependancies 
+  const monthNames = [
+    'January', 'February', 'March', 'April', 'May', 'June',
+    'July', 'August', 'September', 'October', 'November', 'December'
+  ];
+
+  const month = monthNames[date.getMonth()];
+  const day = date.getDate();
+  const year = date.getFullYear();
+
+  return `${month} ${day}, ${year}`;
+}
+
+  function formatString(str) {
+    // Check if the string is null, undefined, or empty
+    if (!str || str.trim() === '') {
+        return 'N/A';
+    }
+
+    return str;
+}
 </script>
 
 <template>
@@ -72,9 +108,9 @@ function cancelUpdate() {
   </button>
   <div v-if="!editing">
     <div class="usa-prose">
-      <h3>
+      <h2>
         User Profile
-      </h3>
+      </h2>
     </div>
     <div class="grid-row grid-gap padding-top-4">
       <div class="tablet:grid-col">
@@ -89,6 +125,20 @@ function cancelUpdate() {
           {{ user.name }}
         </dd>
       </div>
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">
+          Created By
+        </dt>
+        <dd
+          id="user-created-by-value"
+          :aria-label="'Created By: ' + user.created_by"
+          class="margin-left-0 text-bold font-sans-sm"
+        >
+          {{ user.created_by }}
+        </dd>
+      </div>
+    </div>
+    <div class="grid-row grid-gap padding-top-2">
       <div class="tablet:grid-col">
         <dt class="font-sans-xs">
           Email
@@ -101,6 +151,18 @@ function cancelUpdate() {
           {{ user.email }}
         </dd>
       </div>
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">
+          Created On
+        </dt>
+        <dd
+          id="user-created-on-value"
+          :aria-label="'Created On: ' + formatDate(user.created_on)"
+          class="margin-left-0 text-bold font-sans-sm"
+        >
+          {{ formatDate(user.created_on) }}
+        </dd>
+      </div>
     </div>
     <div class="grid-row grid-gap padding-top-2">
       <div class="tablet:grid-col">
@@ -115,6 +177,20 @@ function cancelUpdate() {
           {{ user.agency.name }}
         </dd>
       </div>
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">
+          Last Modified By
+        </dt>
+        <dd
+          id="user-modified-by-value"
+          :aria-label="'Last Modified By: ' + formatString(user.modified_by)"
+          class="margin-left-0 text-bold font-sans-sm"
+        >
+          {{ formatString(user.modified_by) }}
+        </dd>
+      </div>
+    </div>
+    <div class="grid-row grid-gap padding-top-2">
       <div class="tablet:grid-col">
         <dt class="font-sans-xs">
           Sub-Agency, Organization, or Bureau
@@ -127,6 +203,18 @@ function cancelUpdate() {
           {{ user.agency.bureau }}
         </dd>
       </div>
+      <div class="tablet:grid-col">
+        <dt class="font-sans-xs">
+          Last Modified On
+        </dt>
+        <dd
+          id="user-modified-on-value"
+          :aria-label="'Last Modified On: ' + formatDate(user.modified_on)"
+          class="margin-left-0 text-bold font-sans-sm"
+        >
+          {{ formatDate(user.modified_on) }}
+        </dd>
+      </div>
     </div>
     <div class="margin-top-3">
       <button
@@ -151,9 +239,9 @@ function cancelUpdate() {
   >
     <hr class="margin-bottom-5">
     <div class="usa-prose">
-      <h4>
+      <h3>
         Add Reporting Access
-      </h4>
+      </h3>
     </div>
     <div class="grid-row grid-gap">
       <div>
@@ -193,11 +281,14 @@ function cancelUpdate() {
   >
     <div>
       <div class="usa-prose">
-        <h4>
+        <h3>
           Granted Reporting Access
-        </h4>
+        </h3>
       </div>
-      <table class="usa-table usa-table--borderless width-full">
+      <table
+        id="user-reporting-access-table"
+        class="usa-table usa-table--borderless width-full"
+      >
         <thead>
           <tr>
             <th
@@ -247,4 +338,17 @@ function cancelUpdate() {
       </table>
     </div>
   </section>
+  <section
+    v-if="!editing"
+    class="margin-top-5"
+  >
+    <hr class="margin-bottom-5">
+    <div>
+      <div class="usa-prose">
+        <AdminViewUserCertificateTable 
+          :user="props.user"
+        />
+      </div>
+    </div>
+  </section>
 </template>
\ No newline at end of file
diff --git a/training-front-end/src/components/AdminViewUserCertificateTable.vue b/training-front-end/src/components/AdminViewUserCertificateTable.vue
new file mode 100644
index 00000000..30a44444
--- /dev/null
+++ b/training-front-end/src/components/AdminViewUserCertificateTable.vue
@@ -0,0 +1,128 @@
+<script setup>
+  import { onMounted, ref } from "vue"
+  import FileDownLoad from "./icons/FileDownload.vue"
+  import { useStore } from '@nanostores/vue'
+  import { profile} from '../stores/user'
+
+  const props = defineProps({
+    user: {
+      type: Object,
+      required: true,
+    }
+  })
+
+
+  const base_url = import.meta.env.BASE_URL
+  const api_url = import.meta.env.PUBLIC_API_BASE_URL
+  const adminUser = useStore(profile)
+
+
+  const cert_icons = {
+    'Travel Training for Card/Account Holders and Approving Officials': 'smartpay-blue-travel-plain.svg',
+    'Travel Training for Agency/Organization Program Coordinators': 'smartpay-blue-travel-plain.svg',
+    'Purchase Training for Card/Account Holders and Approving Officials': 'smartpay-red-purchase-plain.svg',
+    'Purchase Training For Program Coordinators': 'smartpay-red-purchase-plain.svg',
+    'Fleet Training For Program Coordinators': 'smartpay-green-fleet-plain.svg',
+    'GSA SmartPay Program Certification (GSPC)': 'gspc.svg'
+  }
+
+  const certificates = ref([]) 
+ 
+  onMounted(async() => {
+      certificates.value = await fetch(`${api_url}/api/v1/certificates/${props.user.id}`, {
+        method: 'GET',
+        headers: {'Authorization': `Bearer ${adminUser.value.jwt}`}
+      }
+       ).then((r) => r.json())
+    })
+
+  const data_format = { year:"numeric", month:"long", day:"numeric"}
+  const formatted_date = date => new Date(date).toLocaleDateString('en-US', data_format)
+  const formatted_time = date => new Date(date).toLocaleTimeString('en-US')
+  const cert_img_src = cert => `${base_url}images/${cert_icons[cert]}`
+
+</script>
+
+<template>
+  <table 
+    v-if="certificates.length" 
+    class="usa-table usa-table--borderless width-full"
+  >
+    <caption>
+      <span class="font-sans-lg">View Certificates</span>
+    </caption>
+    <thead>
+      <tr>
+        <th
+          scope="col"
+          style="padding-left: 0;"
+        >
+          Certificate Name
+        </th>
+        <th scope="col">
+          Date Earned
+        </th>
+        <th scope="col">
+          Time Earned
+        </th>
+        <th scope="col">
+          Certificate
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr 
+        v-for="(cert, index) in certificates" 
+        :key="index"
+      >
+        <td>
+          <div class="grid-row">
+            <div class="grid-col flex-auto">          
+              <img
+                width="38.5"
+                height="24"
+                :src="cert_img_src(cert.cert_title)" 
+                class="text-middle margin-right-1"
+                aria-hidden="true" 
+                alt=""
+              >
+            </div>
+            <div class="grid-col">
+              {{ cert.cert_title }}
+            </div>
+          </div>
+        </td>
+        <td>
+          {{ formatted_date(cert.completion_date) }}
+        </td>
+        <td>
+          {{ formatted_time(cert.completion_date) }}
+        </td>
+        <td>
+          <form
+            :action="`${api_url}/api/v1/certificate/${cert.certificate_type}/${cert.id}`" 
+            method="post"
+          >
+            <input 
+              type="hidden"
+              name="jwtToken"
+              :value="adminUser.jwt"
+            >
+            <button
+              class="usa-button usa-button--unstyled"
+              type="submit"
+            >
+              <FileDownLoad /> Download
+            </button>
+          </form>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  <div v-else>
+    <h3>
+      Certificates
+    </h3>
+    User has not earned any certificates yet.
+  </div>
+</template>
diff --git a/training-front-end/src/components/CertificateTable.vue b/training-front-end/src/components/CertificateTable.vue
index fe994029..a9d8b49c 100644
--- a/training-front-end/src/components/CertificateTable.vue
+++ b/training-front-end/src/components/CertificateTable.vue
@@ -15,7 +15,7 @@
     'Purchase Training for Card/Account Holders and Approving Officials': 'smartpay-red-purchase-plain.svg',
     'Purchase Training For Program Coordinators': 'smartpay-red-purchase-plain.svg',
     'Fleet Training For Program Coordinators': 'smartpay-green-fleet-plain.svg',
-    'GSA SmartPay Program Certification (GSPC)': 'smartpay-green-fleet-plain.svg'
+    'GSA SmartPay Program Certification (GSPC)': 'gspc.svg'
   }
 
   const certificates = ref([]) 
diff --git a/training-front-end/src/components/__tests__/AdminEditReporting.spec.js b/training-front-end/src/components/__tests__/AdminEditReporting.spec.js
index 0679c26a..71062212 100644
--- a/training-front-end/src/components/__tests__/AdminEditReporting.spec.js
+++ b/training-front-end/src/components/__tests__/AdminEditReporting.spec.js
@@ -94,8 +94,8 @@ describe('AdminAgencySelect', async () => {
   })
 
   it("adds/removes agency when user marks check boxes", async () => {
-    const props = {user: users[0]}
-    const wrapper = mount(AdminEditReporting, {props})
+    const props = { user: users[0] }
+    const wrapper = mount(AdminEditReporting, { props })
 
     const agencySelect = wrapper.find('select')
     await agencySelect.setValue(20)
@@ -103,17 +103,18 @@ describe('AdminAgencySelect', async () => {
     const checkbox = wrapper.find('input[type="checkbox"]')
 
     await checkbox.setChecked()
-    let table_rows = wrapper.findAll('tr')
+    let table_rows = wrapper.findAll('#user-reporting-access-table tr')
     expect(table_rows.length).toBe(4)
     expect(table_rows[3].text()).toContain("Enfield Tennis Academy")
     
     await checkbox.setChecked(false)
-    table_rows = wrapper.findAll('tr')
+    table_rows = wrapper.findAll('#user-reporting-access-table tr')
     expect(table_rows.length).toBe(3)
   })
+
   it("adds agency without bureau when user marks check boxes", async () => {
-    const props = {user: users[0]}
-    const wrapper = mount(AdminEditReporting, {props})
+    const props = { user: users[0] }
+    const wrapper = mount(AdminEditReporting, { props })
 
     const agencySelect = wrapper.find('select')
     await agencySelect.setValue(10)
@@ -121,7 +122,7 @@ describe('AdminAgencySelect', async () => {
     const checkbox = wrapper.find('input[type="checkbox"]')
 
     await checkbox.setChecked()
-    let table_rows = wrapper.findAll('tr')
+    let table_rows = wrapper.findAll('#user-reporting-access-table tr')
     expect(table_rows.length).toBe(4)
     expect(table_rows[3].text()).toContain("Ennet House")
   })
diff --git a/training-front-end/src/components/__tests__/AdminViewUserCertificateTable.spec.js b/training-front-end/src/components/__tests__/AdminViewUserCertificateTable.spec.js
new file mode 100644
index 00000000..067554e8
--- /dev/null
+++ b/training-front-end/src/components/__tests__/AdminViewUserCertificateTable.spec.js
@@ -0,0 +1,131 @@
+import { describe, it, expect, afterEach, vi} from 'vitest'
+import { mount, flushPromises } from '@vue/test-utils'
+import AdminViewUserCertificateTable from '../AdminViewUserCertificateTable.vue'
+
+const API_RESPONSE = [
+  {
+    "id": 2,
+    "user_id": 1,
+    "user_name": "Becky Sharp",
+    "cert_title": "Travel Training for Card/Account Holders and Approving Officials",
+    "completion_date": "2023-04-17T15:02:02.814004",
+    "certificate_type": 1
+  },
+  {
+    "id": 68,
+    "user_id": 1,
+    "user_name": "Becky Sharp",
+    "cert_title": "Travel Training for Agency/Organization Program Coordinators",
+    "completion_date": "2023-04-25T18:03:45.134752",
+    "certificate_type": 1
+  },
+  {
+    "id": 99,
+    "user_id": 1,
+    "user_name": "Becky Sharp",
+    "cert_title": "GSPC",
+    "completion_date": "2023-07-25T18:03:45.134752",
+    "certificate_type": 2
+  }
+]
+
+const user = {
+  "id": 0, 
+  }
+
+describe('CertificateTable', async () => {
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('shows training names in table', async () => {
+    vi.spyOn(global, 'fetch').mockImplementation(() => {
+      return Promise.resolve({ok: true,  status:200, json: () => Promise.resolve(API_RESPONSE) })
+    })
+    const wrapper = await mount(AdminViewUserCertificateTable, {
+      props: { user }
+    })
+    await flushPromises()
+    const rows = wrapper.findAll('tr') 
+    expect(rows.length).toBe(API_RESPONSE.length + 1)
+
+    const rowOne = rows[1].findAll('td')
+    API_RESPONSE[0].cert_title
+    expect(rowOne[0].text()).toBe(API_RESPONSE[0].cert_title)
+
+    const rowTwo = rows[2].findAll('td')
+    expect(rowTwo[0].text()).toBe(API_RESPONSE[1].cert_title)
+
+    const rowThree = rows[3].findAll('td')
+    expect(rowThree[0].text()).toBe(API_RESPONSE[2].cert_title)
+  })
+
+  it('displays formatted dates', async () => {
+    vi.spyOn(global, 'fetch').mockImplementation(() => {
+      return Promise.resolve({ok: true, status:200, json: () => Promise.resolve(API_RESPONSE) })
+    })
+    const wrapper = await mount(AdminViewUserCertificateTable, {
+      props: { user }
+    })
+    await flushPromises()
+    const rows = wrapper.findAll('tr') 
+
+    const rowOne = rows[1].findAll('td')
+    expect(rowOne[1].text()).toBe('April 17, 2023')
+
+    const rowTwo = rows[2].findAll('td')
+    expect(rowTwo[1].text()).toBe('April 25, 2023')
+  })
+
+  it('displays formatted times', async () => {
+    vi.spyOn(global, 'fetch').mockImplementation(() => {
+      return Promise.resolve({ok: true, status:200, json: () => Promise.resolve(API_RESPONSE) })
+    })
+    const wrapper = await mount(AdminViewUserCertificateTable, {
+      props: { user }
+    })
+    await flushPromises()
+    const rows = wrapper.findAll('tr') 
+
+    const rowOne = rows[1].findAll('td')
+    expect(rowOne[2].text()).toBe('3:02:02 PM')
+
+    const rowTwo = rows[2].findAll('td')
+    expect(rowTwo[2].text()).toBe('6:03:45 PM')
+  })
+
+  it('has links to certificate with cert type and id', async () => {
+    vi.spyOn(global, 'fetch').mockImplementation(() => {
+      return Promise.resolve({ok: true, status:200, json: () => Promise.resolve(API_RESPONSE) })
+    })
+    const wrapper = await mount(AdminViewUserCertificateTable, {
+      props: { user }
+    })
+    await flushPromises()
+    const rows = wrapper.findAll('tr') 
+
+    const anchorOne = rows[1].find('form')
+    expect(anchorOne.attributes('action')).toBe("http://localhost:8000/api/v1/certificate/1/2")
+
+    const anchorTwo = rows[2].find('form')
+    expect(anchorTwo.attributes('action')).toBe("http://localhost:8000/api/v1/certificate/1/68")
+
+    const anchorThree = rows[3].find('form')
+    expect(anchorThree.attributes('action')).toBe("http://localhost:8000/api/v1/certificate/2/99")
+  })
+
+  it('show correct message when the user has not taken a quiz', async () => {
+    vi.spyOn(global, 'fetch').mockImplementation(() => {
+      return Promise.resolve({ok: true, status:200, json: () => Promise.resolve([]) })
+    })
+    const wrapper = await mount(AdminViewUserCertificateTable, {
+      props: { user }
+    })
+    await flushPromises()
+
+    const table = wrapper.find('table') 
+    expect(table.exists()).toBe(false)
+
+    expect(wrapper.text()).toContain('User has not earned any certificates yet.')
+  })
+})
\ No newline at end of file
diff --git a/training-front-end/src/content/training_fleet_pc/lesson03.mdx b/training-front-end/src/content/training_fleet_pc/lesson03.mdx
index 78757cc6..1f235f12 100644
--- a/training-front-end/src/content/training_fleet_pc/lesson03.mdx
+++ b/training-front-end/src/content/training_fleet_pc/lesson03.mdx
@@ -85,3 +85,54 @@ Strategic payment solutions offered under the [GSA SmartPay 3 Master Contract](h
 ## What is Section 889 and how does it apply to purchases?
 Section 889 of the John S. McCain National Defense Authorization Act (NDAA) for Fiscal Year 2019 ([P.L. 115-232 [PDF, 789 pages]](https://www.congress.gov/115/plaws/publ232/PLAW-115publ232.pdf)) and the [Federal Acquisition Regulation (FAR) Case 2018-017](https://www.federalregister.gov/documents/2019/08/13/2019-17201/federal-acquisition-regulation-prohibition-on-contracting-for-certain-telecommunications-and-video) prohibit the purchase of covered telecommunications equipment and services from merchants who sell products containing spyware. These devices could pose a threat to U.S. security by spying on or disrupting communications within the U.S. Therefore, purchase card/account holders should follow their agency’s policy regarding Section 889 compliance.
 
+### FASCSA Order Check
+Before making any purchase, buyers should review Federal Acquisition Supply Chain Security Act (FASCSA) orders.
+
+The federal government issued an [interim rule](https://www.federalregister.gov/documents/2023/10/05/2023-21320/federal-acquisition-regulation-implementation-of-federal-acquisition-supply-chain-security-act) that amends the Federal Acquisition Regulation (FAR) to implement supply chain risk information sharing and FASCSA orders. This rule became effective on December 4, 2023.
+
+#### Accessing FASCSA Orders
+[The System for Award Management (SAM)](https://sam.gov/) is an official website of the U.S. Government that helps users navigate the federal award lifecycle.
+
+The site stores FASCSA order data entered by the Department of Homeland Security (DHS), the Department of Defense (DoD), and the Director of National Intelligence (DNI).
+
+Before making any purchase, including GSA SmartPay Purchase card/account transactions, agency officials should go to [SAM.gov](https://sam.gov/) and select the “View FASCSA Orders” button to download and review a complete list of the FASCSA orders.
+
+Buyers should:
+
+- Be sure to follow their agency rules and procedures for compliance with applicable FASCSA orders to determine whether the purchase should be made.
+- Keep in mind that the FASCSA order review should take place for all purchases at any dollar threshold.
+- Note that until DHS, DoD, or DNI create the first FASCSA order in [SAM.gov](https://sam.gov/), the downloaded file will be empty.
+
+### American Security Drone Act Of 2023
+On December 22, 2023, the President signed the [National Defense Authorization Act for Fiscal Year 2024 (NDAA)](https://www.congress.gov/bill/118th-congress/house-bill/2670).
+
+As part of the NDAA, Sections 1821 and 1826 contain prohibitions on using the GSA SmartPay purchase card to buy any covered unmanned aircraft systems from covered foreign entities.
+
+**Section 1821** - THE AMERICAN SECURITY DRONE ACT OF 2023 <br/>
+**Section 1822** - Defines covered foreign entities and covered unmanned aircraft systems.
+<ul class="usa-list">
+    <li>
+        The term COVERED FOREIGN ENTITY means an entity included on a list developed and maintained by the Federal Acquisition Security Council and published in the System for Award Management (SAM). This list will include entities in the following categories:
+        <ol type="A" class="usa-list">
+            <li>An entity included on the Consolidated Screening List.</li>
+            <li>Any entity that is subject to extrajudicial direction from a foreign government
+                as determined by the Secretary of Homeland Security.</li>
+            <li>Any entity the Secretary of Homeland Security, in coordination with the
+                Attorney General, Director of National Intelligence, and the Secretary of
+                Defense, determines poses a national security risk.</li>
+            <li>Any entity domiciled in the People’s Republic of China or subject to influence
+                or control by the Government of the People’s Republic of China or the
+                Communist Party of the People’s Republic of China, as determined by the
+                Secretary of Homeland Security.</li>
+            <li>Any subsidiary or affiliate of an entity described in subparagraphs (A) through (D).</li>
+        </ol>
+    </li>
+    <li>The term COVERED UNMANNED AIRCRAFT SYSTEM has the meaning given the term ‘‘unmanned aircraft system’’ in section 44801 of title 49, United States Code.</li>
+</ul>  
+
+**Section 1826** - PROHIBITION ON USE OF GOVERNMENT-ISSUED PURCHASE CARDS TO PURCHASE COVERED UNMANNED AIRCRAFT SYSTEMS FROM COVERED FOREIGN ENTITIES
+- Effective immediately, Government-issued Purchase Cards may not be used to procure any covered unmanned aircraft system from a covered foreign entity.
+
+#### Cleared Drone Vendors
+- A cleared list of drone vendors is available from the Defense Innovation Unit.
+- https://www.diu.mil/blue-uas-cleared-list
diff --git a/training-front-end/src/content/training_purchase/lesson05.mdx b/training-front-end/src/content/training_purchase/lesson05.mdx
index 576fad89..a0dbe26b 100644
--- a/training-front-end/src/content/training_purchase/lesson05.mdx
+++ b/training-front-end/src/content/training_purchase/lesson05.mdx
@@ -86,6 +86,58 @@ POS is the point where a transaction is finalized or the moment where a customer
 
 Section 889 of the John S. McCain National Defense Authorization Act (NDAA) for Fiscal Year 2019 ([P.L. 115-232 [PDF, 789 pages]](https://www.congress.gov/115/plaws/publ232/PLAW-115publ232.pdf)) and the[ Federal Acquisition Regulation (FAR) Case 2018-017](https://www.federalregister.gov/documents/2019/08/13/2019-17201/federal-acquisition-regulation-prohibition-on-contracting-for-certain-telecommunications-and-video) prohibit the purchase of covered telecommunications equipment and services from vendors who sell products containing spyware. These devices could pose a threat to U.S. security by spying on or disrupting communications within the U.S. Therefore, purchase card/account holders should follow their agency’s policy regarding Section 889 compliance.
 
+### FASCSA Order Check
+Before making any purchase, buyers should review Federal Acquisition Supply Chain Security Act (FASCSA) orders.
+
+The federal government issued an [interim rule](https://www.federalregister.gov/documents/2023/10/05/2023-21320/federal-acquisition-regulation-implementation-of-federal-acquisition-supply-chain-security-act) that amends the Federal Acquisition Regulation (FAR) to implement supply chain risk information sharing and FASCSA orders. This rule became effective on December 4, 2023.
+
+#### Accessing FASCSA Orders
+[The System for Award Management (SAM)](https://sam.gov/) is an official website of the U.S. Government that helps users navigate the federal award lifecycle.
+
+The site stores FASCSA order data entered by the Department of Homeland Security (DHS), the Department of Defense (DoD), and the Director of National Intelligence (DNI).
+
+Before making any purchase, including GSA SmartPay Purchase card/account transactions, agency officials should go to [SAM.gov](https://sam.gov/) and select the “View FASCSA Orders” button to download and review a complete list of the FASCSA orders.
+
+Buyers should:
+
+- Be sure to follow their agency rules and procedures for compliance with applicable FASCSA orders to determine whether the purchase should be made.
+- Keep in mind that the FASCSA order review should take place for all purchases at any dollar threshold.
+- Note that until DHS, DoD, or DNI create the first FASCSA order in [SAM.gov](https://sam.gov/), the downloaded file will be empty.
+
+### American Security Drone Act Of 2023
+On December 22, 2023, the President signed the [National Defense Authorization Act for Fiscal Year 2024 (NDAA)](https://www.congress.gov/bill/118th-congress/house-bill/2670).
+
+As part of the NDAA, Sections 1821 and 1826 contain prohibitions on using the GSA SmartPay purchase card to buy any covered unmanned aircraft systems from covered foreign entities.
+
+**Section 1821** - THE AMERICAN SECURITY DRONE ACT OF 2023 <br/>
+**Section 1822** - Defines covered foreign entities and covered unmanned aircraft systems.
+<ul class="usa-list">
+    <li>
+        The term COVERED FOREIGN ENTITY means an entity included on a list developed and maintained by the Federal Acquisition Security Council and published in the System for Award Management (SAM). This list will include entities in the following categories:
+        <ol type="A" class="usa-list">
+            <li>An entity included on the Consolidated Screening List.</li>
+            <li>Any entity that is subject to extrajudicial direction from a foreign government
+                as determined by the Secretary of Homeland Security.</li>
+            <li>Any entity the Secretary of Homeland Security, in coordination with the
+                Attorney General, Director of National Intelligence, and the Secretary of
+                Defense, determines poses a national security risk.</li>
+            <li>Any entity domiciled in the People’s Republic of China or subject to influence
+                or control by the Government of the People’s Republic of China or the
+                Communist Party of the People’s Republic of China, as determined by the
+                Secretary of Homeland Security.</li>
+            <li>Any subsidiary or affiliate of an entity described in subparagraphs (A) through (D).</li>
+        </ol>
+    </li>
+    <li>The term COVERED UNMANNED AIRCRAFT SYSTEM has the meaning given the term ‘‘unmanned aircraft system’’ in section 44801 of title 49, United States Code.</li>
+</ul>  
+
+**Section 1826** - PROHIBITION ON USE OF GOVERNMENT-ISSUED PURCHASE CARDS TO PURCHASE COVERED UNMANNED AIRCRAFT SYSTEMS FROM COVERED FOREIGN ENTITIES
+- Effective immediately, Government-issued Purchase Cards may not be used to procure any covered unmanned aircraft system from a covered foreign entity.
+
+#### Cleared Drone Vendors
+- A cleared list of drone vendors is available from the Defense Innovation Unit.
+- https://www.diu.mil/blue-uas-cleared-list
+
 ## What are convenience checks?
 Some agencies allow for the use of convenience checks. 
 
diff --git a/training-front-end/src/content/training_purchase_pc/lesson03.mdx b/training-front-end/src/content/training_purchase_pc/lesson03.mdx
index dcba97a9..447a1f0e 100644
--- a/training-front-end/src/content/training_purchase_pc/lesson03.mdx
+++ b/training-front-end/src/content/training_purchase_pc/lesson03.mdx
@@ -78,6 +78,58 @@ Strategic payment solutions offered under the [GSA SmartPay 3 Master Contract](h
 ## What is Section 889 and how does it apply to purchases?
 Section 889 of the John S. McCain National Defense Authorization Act (NDAA) for Fiscal Year 2019 ([P.L. 115-232 [PDF, 789 pages]](https://www.congress.gov/115/plaws/publ232/PLAW-115publ232.pdf)) and the [Federal Acquisition Regulation (FAR) Case 2018-017](https://www.federalregister.gov/documents/2019/08/13/2019-17201/federal-acquisition-regulation-prohibition-on-contracting-for-certain-telecommunications-and-video) prohibit the purchase of covered telecommunications equipment and services from merchants who sell products containing spyware. These devices could pose a threat to U.S. security by spying on or disrupting communications within the U.S. Therefore, purchase card/account holders should follow their agency’s policy regarding Section 889 compliance.
 
+### FASCSA Order Check
+Before making any purchase, buyers should review Federal Acquisition Supply Chain Security Act (FASCSA) orders.
+
+The federal government issued an [interim rule](https://www.federalregister.gov/documents/2023/10/05/2023-21320/federal-acquisition-regulation-implementation-of-federal-acquisition-supply-chain-security-act) that amends the Federal Acquisition Regulation (FAR) to implement supply chain risk information sharing and FASCSA orders. This rule became effective on December 4, 2023.
+
+#### Accessing FASCSA Orders
+[The System for Award Management (SAM)](https://sam.gov/) is an official website of the U.S. Government that helps users navigate the federal award lifecycle.
+
+The site stores FASCSA order data entered by the Department of Homeland Security (DHS), the Department of Defense (DoD), and the Director of National Intelligence (DNI).
+
+Before making any purchase, including GSA SmartPay Purchase card/account transactions, agency officials should go to [SAM.gov](https://sam.gov/) and select the “View FASCSA Orders” button to download and review a complete list of the FASCSA orders.
+
+Buyers should:
+
+- Be sure to follow their agency rules and procedures for compliance with applicable FASCSA orders to determine whether the purchase should be made.
+- Keep in mind that the FASCSA order review should take place for all purchases at any dollar threshold.
+- Note that until DHS, DoD, or DNI create the first FASCSA order in [SAM.gov](https://sam.gov/), the downloaded file will be empty.
+
+### American Security Drone Act Of 2023
+On December 22, 2023, the President signed the [National Defense Authorization Act for Fiscal Year 2024 (NDAA)](https://www.congress.gov/bill/118th-congress/house-bill/2670).
+
+As part of the NDAA, Sections 1821 and 1826 contain prohibitions on using the GSA SmartPay purchase card to buy any covered unmanned aircraft systems from covered foreign entities.
+
+**Section 1821** - THE AMERICAN SECURITY DRONE ACT OF 2023 <br/>
+**Section 1822** - Defines covered foreign entities and covered unmanned aircraft systems.
+<ul class="usa-list">
+    <li>
+        The term COVERED FOREIGN ENTITY means an entity included on a list developed and maintained by the Federal Acquisition Security Council and published in the System for Award Management (SAM). This list will include entities in the following categories:
+        <ol type="A" class="usa-list">
+            <li>An entity included on the Consolidated Screening List.</li>
+            <li>Any entity that is subject to extrajudicial direction from a foreign government
+                as determined by the Secretary of Homeland Security.</li>
+            <li>Any entity the Secretary of Homeland Security, in coordination with the
+                Attorney General, Director of National Intelligence, and the Secretary of
+                Defense, determines poses a national security risk.</li>
+            <li>Any entity domiciled in the People’s Republic of China or subject to influence
+                or control by the Government of the People’s Republic of China or the
+                Communist Party of the People’s Republic of China, as determined by the
+                Secretary of Homeland Security.</li>
+            <li>Any subsidiary or affiliate of an entity described in subparagraphs (A) through (D).</li>
+        </ol>
+    </li>
+    <li>The term COVERED UNMANNED AIRCRAFT SYSTEM has the meaning given the term ‘‘unmanned aircraft system’’ in section 44801 of title 49, United States Code.</li>
+</ul>  
+
+**Section 1826** - PROHIBITION ON USE OF GOVERNMENT-ISSUED PURCHASE CARDS TO PURCHASE COVERED UNMANNED AIRCRAFT SYSTEMS FROM COVERED FOREIGN ENTITIES
+- Effective immediately, Government-issued Purchase Cards may not be used to procure any covered unmanned aircraft system from a covered foreign entity.
+
+#### Cleared Drone Vendors
+- A cleared list of drone vendors is available from the Defense Innovation Unit.
+- https://www.diu.mil/blue-uas-cleared-list
+
 ## What are convenience checks?
 Some agencies allow for the use of convenience checks. 
 
diff --git a/training-front-end/src/content/training_travel/lesson03.mdx b/training-front-end/src/content/training_travel/lesson03.mdx
index 3939b7be..c5fa759d 100644
--- a/training-front-end/src/content/training_travel/lesson03.mdx
+++ b/training-front-end/src/content/training_travel/lesson03.mdx
@@ -46,3 +46,55 @@ The GSA SmartPay Travel card/account may be used for authorized official travel
 
 ## What is Section 889 and how does it apply to purchases?
 Section 889 of the John S. McCain National Defense Authorization Act (NDAA) for Fiscal Year 2019 ([P.L. 115-232 [PDF, 789 pages]](https://www.congress.gov/115/plaws/publ232/PLAW-115publ232.pdf)) and the [Federal Acquisition Regulation (FAR) Case 2018-017](https://www.federalregister.gov/documents/2019/08/13/2019-17201/federal-acquisition-regulation-prohibition-on-contracting-for-certain-telecommunications-and-video) prohibit the purchase of covered telecommunications equipment and services from merchants who sell products containing spyware. These devices could pose a threat to U.S. security by spying on or disrupting communications within the U.S. Therefore, GSA SmartPay card/account holders should follow their agency’s policy regarding Section 889 compliance.
+
+### FASCSA Order Check
+Before making any purchase, buyers should review Federal Acquisition Supply Chain Security Act (FASCSA) orders.
+
+The federal government issued an [interim rule](https://www.federalregister.gov/documents/2023/10/05/2023-21320/federal-acquisition-regulation-implementation-of-federal-acquisition-supply-chain-security-act) that amends the Federal Acquisition Regulation (FAR) to implement supply chain risk information sharing and FASCSA orders. This rule became effective on December 4, 2023.
+
+#### Accessing FASCSA Orders
+[The System for Award Management (SAM)](https://sam.gov/) is an official website of the U.S. Government that helps users navigate the federal award lifecycle.
+
+The site stores FASCSA order data entered by the Department of Homeland Security (DHS), the Department of Defense (DoD), and the Director of National Intelligence (DNI).
+
+Before making any purchase, including GSA SmartPay Purchase card/account transactions, agency officials should go to [SAM.gov](https://sam.gov/) and select the “View FASCSA Orders” button to download and review a complete list of the FASCSA orders.
+
+Buyers should:
+
+- Be sure to follow their agency rules and procedures for compliance with applicable FASCSA orders to determine whether the purchase should be made.
+- Keep in mind that the FASCSA order review should take place for all purchases at any dollar threshold.
+- Note that until DHS, DoD, or DNI create the first FASCSA order in [SAM.gov](https://sam.gov/), the downloaded file will be empty.
+
+### American Security Drone Act Of 2023
+On December 22, 2023, the President signed the [National Defense Authorization Act for Fiscal Year 2024 (NDAA)](https://www.congress.gov/bill/118th-congress/house-bill/2670).
+
+As part of the NDAA, Sections 1821 and 1826 contain prohibitions on using the GSA SmartPay purchase card to buy any covered unmanned aircraft systems from covered foreign entities.
+
+**Section 1821** - THE AMERICAN SECURITY DRONE ACT OF 2023 <br/>
+**Section 1822** - Defines covered foreign entities and covered unmanned aircraft systems.
+<ul class="usa-list">
+    <li>
+        The term COVERED FOREIGN ENTITY means an entity included on a list developed and maintained by the Federal Acquisition Security Council and published in the System for Award Management (SAM). This list will include entities in the following categories:
+        <ol type="A" class="usa-list">
+            <li>An entity included on the Consolidated Screening List.</li>
+            <li>Any entity that is subject to extrajudicial direction from a foreign government
+                as determined by the Secretary of Homeland Security.</li>
+            <li>Any entity the Secretary of Homeland Security, in coordination with the
+                Attorney General, Director of National Intelligence, and the Secretary of
+                Defense, determines poses a national security risk.</li>
+            <li>Any entity domiciled in the People’s Republic of China or subject to influence
+                or control by the Government of the People’s Republic of China or the
+                Communist Party of the People’s Republic of China, as determined by the
+                Secretary of Homeland Security.</li>
+            <li>Any subsidiary or affiliate of an entity described in subparagraphs (A) through (D).</li>
+        </ol>
+    </li>
+    <li>The term COVERED UNMANNED AIRCRAFT SYSTEM has the meaning given the term ‘‘unmanned aircraft system’’ in section 44801 of title 49, United States Code.</li>
+</ul>  
+
+**Section 1826** - PROHIBITION ON USE OF GOVERNMENT-ISSUED PURCHASE CARDS TO PURCHASE COVERED UNMANNED AIRCRAFT SYSTEMS FROM COVERED FOREIGN ENTITIES
+- Effective immediately, Government-issued Purchase Cards may not be used to procure any covered unmanned aircraft system from a covered foreign entity.
+
+#### Cleared Drone Vendors
+- A cleared list of drone vendors is available from the Defense Innovation Unit.
+- https://www.diu.mil/blue-uas-cleared-list
\ No newline at end of file
diff --git a/training-front-end/src/content/training_travel_pc/lesson03.mdx b/training-front-end/src/content/training_travel_pc/lesson03.mdx
index 9d09956f..513f63c7 100644
--- a/training-front-end/src/content/training_travel_pc/lesson03.mdx
+++ b/training-front-end/src/content/training_travel_pc/lesson03.mdx
@@ -107,3 +107,55 @@ The GSA SmartPay Travel card/account may be used for authorized official travel
 
 ## What is Section 889 and how does it apply to purchases?
 Section 889 of the John S. McCain National Defense Authorization Act (NDAA) for Fiscal Year 2019 ([P.L. 115-232 [PDF, 789 pages]](https://www.congress.gov/115/plaws/publ232/PLAW-115publ232.pdf)) and the [Federal Acquisition Regulation (FAR) Case 2018-017](https://www.federalregister.gov/documents/2019/08/13/2019-17201/federal-acquisition-regulation-prohibition-on-contracting-for-certain-telecommunications-and-video) prohibit the purchase of covered telecommunications equipment and services from merchants who sell products containing spyware. These devices could pose a threat to U.S. security by spying on or disrupting communications within the U.S. Therefore, GSA SmartPay card/account holders should follow their agency’s policy regarding Section 889 compliance.
+
+### FASCSA Order Check
+Before making any purchase, buyers should review Federal Acquisition Supply Chain Security Act (FASCSA) orders.
+
+The federal government issued an [interim rule](https://www.federalregister.gov/documents/2023/10/05/2023-21320/federal-acquisition-regulation-implementation-of-federal-acquisition-supply-chain-security-act) that amends the Federal Acquisition Regulation (FAR) to implement supply chain risk information sharing and FASCSA orders. This rule became effective on December 4, 2023.
+
+#### Accessing FASCSA Orders
+[The System for Award Management (SAM)](https://sam.gov/) is an official website of the U.S. Government that helps users navigate the federal award lifecycle.
+
+The site stores FASCSA order data entered by the Department of Homeland Security (DHS), the Department of Defense (DoD), and the Director of National Intelligence (DNI).
+
+Before making any purchase, including GSA SmartPay Purchase card/account transactions, agency officials should go to [SAM.gov](https://sam.gov/) and select the “View FASCSA Orders” button to download and review a complete list of the FASCSA orders.
+
+Buyers should:
+
+- Be sure to follow their agency rules and procedures for compliance with applicable FASCSA orders to determine whether the purchase should be made.
+- Keep in mind that the FASCSA order review should take place for all purchases at any dollar threshold.
+- Note that until DHS, DoD, or DNI create the first FASCSA order in [SAM.gov](https://sam.gov/), the downloaded file will be empty.
+
+### American Security Drone Act Of 2023
+On December 22, 2023, the President signed the [National Defense Authorization Act for Fiscal Year 2024 (NDAA)](https://www.congress.gov/bill/118th-congress/house-bill/2670).
+
+As part of the NDAA, Sections 1821 and 1826 contain prohibitions on using the GSA SmartPay purchase card to buy any covered unmanned aircraft systems from covered foreign entities.
+
+**Section 1821** - THE AMERICAN SECURITY DRONE ACT OF 2023 <br/>
+**Section 1822** - Defines covered foreign entities and covered unmanned aircraft systems.
+<ul class="usa-list">
+    <li>
+        The term COVERED FOREIGN ENTITY means an entity included on a list developed and maintained by the Federal Acquisition Security Council and published in the System for Award Management (SAM). This list will include entities in the following categories:
+        <ol type="A" class="usa-list">
+            <li>An entity included on the Consolidated Screening List.</li>
+            <li>Any entity that is subject to extrajudicial direction from a foreign government
+                as determined by the Secretary of Homeland Security.</li>
+            <li>Any entity the Secretary of Homeland Security, in coordination with the
+                Attorney General, Director of National Intelligence, and the Secretary of
+                Defense, determines poses a national security risk.</li>
+            <li>Any entity domiciled in the People’s Republic of China or subject to influence
+                or control by the Government of the People’s Republic of China or the
+                Communist Party of the People’s Republic of China, as determined by the
+                Secretary of Homeland Security.</li>
+            <li>Any subsidiary or affiliate of an entity described in subparagraphs (A) through (D).</li>
+        </ol>
+    </li>
+    <li>The term COVERED UNMANNED AIRCRAFT SYSTEM has the meaning given the term ‘‘unmanned aircraft system’’ in section 44801 of title 49, United States Code.</li>
+</ul>  
+
+**Section 1826** - PROHIBITION ON USE OF GOVERNMENT-ISSUED PURCHASE CARDS TO PURCHASE COVERED UNMANNED AIRCRAFT SYSTEMS FROM COVERED FOREIGN ENTITIES
+- Effective immediately, Government-issued Purchase Cards may not be used to procure any covered unmanned aircraft system from a covered foreign entity.
+
+#### Cleared Drone Vendors
+- A cleared list of drone vendors is available from the Defense Innovation Unit.
+- https://www.diu.mil/blue-uas-cleared-list
diff --git a/training-front-end/src/pages/training_fleet_pc/printable.astro b/training-front-end/src/pages/training_fleet_pc/printable.astro
index ab0ea534..d0b26b5e 100644
--- a/training-front-end/src/pages/training_fleet_pc/printable.astro
+++ b/training-front-end/src/pages/training_fleet_pc/printable.astro
@@ -21,7 +21,11 @@ const entries = await Promise.all(content_components)
     <div class="grid-container">
       <section class="usa-prose">
         
-        <button id="print_button" class="usa-button usa-button--outline" onclick="window.print()">
+        <button 
+          id="print_button"
+          class="usa-button usa-button--outline"
+          aria-label="print"
+          onclick="window.print()">
           <span class="display-block" aria-hidden="true">
           <PrintIcon /> Print Training
           </span>
diff --git a/training-front-end/src/pages/training_purchase/printable.astro b/training-front-end/src/pages/training_purchase/printable.astro
index 41a793a9..156a05ac 100644
--- a/training-front-end/src/pages/training_purchase/printable.astro
+++ b/training-front-end/src/pages/training_purchase/printable.astro
@@ -21,7 +21,10 @@ const entries = await Promise.all(content_components)
     <div class="grid-container">
       <section class="usa-prose">
         
-        <button id="print_button" class="usa-button usa-button--outline" onclick="window.print()">
+        <button id="print_button"
+          class="usa-button usa-button--outline"
+          aria-label="print"
+          onclick="window.print()">
           <span class="display-block" aria-hidden="true">
           <PrintIcon /> Print Training
           </span>
diff --git a/training-front-end/src/pages/training_purchase_pc/printable.astro b/training-front-end/src/pages/training_purchase_pc/printable.astro
index 2c5bd8d6..f6a6a26e 100644
--- a/training-front-end/src/pages/training_purchase_pc/printable.astro
+++ b/training-front-end/src/pages/training_purchase_pc/printable.astro
@@ -21,7 +21,10 @@ const entries = await Promise.all(content_components)
     <div class="grid-container">
       <section class="usa-prose">
         
-        <button id="print_button" class="usa-button usa-button--outline" onclick="window.print()">
+        <button id="print_button"
+          class="usa-button usa-button--outline"
+          aria-label="print"
+          onclick="window.print()">
           <span class="display-block" aria-hidden="true">
           <PrintIcon /> Print Training
           </span>
diff --git a/training-front-end/src/pages/training_travel/printable.astro b/training-front-end/src/pages/training_travel/printable.astro
index 9e4e77be..6912fe24 100644
--- a/training-front-end/src/pages/training_travel/printable.astro
+++ b/training-front-end/src/pages/training_travel/printable.astro
@@ -21,7 +21,10 @@ const entries = await Promise.all(content_components)
     <div class="grid-container">
       <section class="usa-prose">
         
-        <button id="print_button" class="usa-button usa-button--outline" onclick="window.print()">
+        <button id="print_button"
+          class="usa-button usa-button--outline"
+          aria-label="print"
+          onclick="window.print()">
           <span class="display-block" aria-hidden="true">
           <PrintIcon /> Print Training
           </span>
diff --git a/training-front-end/src/pages/training_travel_pc/printable.astro b/training-front-end/src/pages/training_travel_pc/printable.astro
index fe39d3cd..3cb85bdc 100644
--- a/training-front-end/src/pages/training_travel_pc/printable.astro
+++ b/training-front-end/src/pages/training_travel_pc/printable.astro
@@ -21,7 +21,10 @@ const entries = await Promise.all(content_components)
     <div class="grid-container">
       <section class="usa-prose">
         
-        <button id="print_button" class="usa-button usa-button--outline" onclick="window.print()">
+        <button id="print_button"
+          class="usa-button usa-button--outline"
+          aria-label="print"
+          onclick="window.print()">
           <span class="display-block" aria-hidden="true">
           <PrintIcon /> Print Training
           </span>
diff --git a/training/api/api_v1/certificates.py b/training/api/api_v1/certificates.py
index 23ed277c..bd479991 100644
--- a/training/api/api_v1/certificates.py
+++ b/training/api/api_v1/certificates.py
@@ -5,20 +5,37 @@
 from training.api.deps import certificate_repository
 from training.services.certificate import Certificate
 from training.api.auth import JWTUser, user_from_form
+from training.api.auth import RequireRole
 
 
 router = APIRouter()
 
 
+@router.get("/certificates/{userId}", response_model=List[CertificateListValue])
+def get_certificates_by_userId(
+    userId: int,
+    user=Depends(RequireRole(["Admin"])),
+    repo: CertificateRepository = Depends(certificate_repository),
+):
+    '''
+    Returns a list of certificates for `userId`
+    '''
+    db_user_certificates = repo.get_all_certificates_by_userId(userId)
+
+    if db_user_certificates is None:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
+    return db_user_certificates
+
+
 @router.get("/certificates/", response_model=List[CertificateListValue])
-def get_certificates_by_userid(
+def get_certificates_by_user(
     repo: CertificateRepository = Depends(certificate_repository),
     user: dict[str, Any] = Depends(JWTUser())
 ):
     '''
-    Returns a list of certificates for `user`
+    Returns a list of certificates for current `user`
     '''
-    db_user_certificates = repo.get_all_certificates_by_userid(user["id"])
+    db_user_certificates = repo.get_all_certificates_by_userId(user["id"])
 
     if db_user_certificates is None:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
diff --git a/training/api/api_v1/users.py b/training/api/api_v1/users.py
index 359ed8be..3460dce8 100644
--- a/training/api/api_v1/users.py
+++ b/training/api/api_v1/users.py
@@ -37,9 +37,9 @@ def edit_user_for_reporting(
         user=Depends(RequireRole(["Admin"]))
 ):
     try:
-        updated_user = repo.edit_user_for_reporting(user_id, agency_id_list)
+        updated_user = repo.edit_user_for_reporting(user_id, agency_id_list, user['name'])
         logging.info(f"{user['email']} granted user {updated_user.email} reporting for agencies: {agency_id_list}")
-        return updated_user
+        return User.model_validate(updated_user)
     except ValueError:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
@@ -109,7 +109,8 @@ def update_user_by_id(
         )
     try:
         logging.info(f"{user['email']} updated user {updated_user.email} user profile")
-        return repo.update_user(user_id, updated_user)
+        db_user = repo.update_user(user_id, updated_user, user["name"])
+        return User.model_validate(db_user)
     except ValueError:
         raise HTTPException(
             status_code=status.HTTP_400_BAD_REQUEST,
diff --git a/training/api/deps.py b/training/api/deps.py
index 00dd1548..4f203cbb 100644
--- a/training/api/deps.py
+++ b/training/api/deps.py
@@ -4,6 +4,7 @@
 from training.services import QuizService, GspcService
 from training.database import SessionLocal
 from sqlalchemy.orm import Session
+import logging
 
 
 def db() -> Generator[Session, None, None]:
@@ -15,7 +16,8 @@ def db() -> Generator[Session, None, None]:
     try:
         yield session
         session.commit()
-    except Exception:
+    except Exception as e:
+        logging.error(f"Error in DB session: {e}")
         session.rollback()
     finally:
         session.close()
diff --git a/training/models/user.py b/training/models/user.py
index 4d3e66e9..fef50f97 100644
--- a/training/models/user.py
+++ b/training/models/user.py
@@ -1,9 +1,10 @@
 from training.models import Base
 from sqlalchemy.orm import Mapped, mapped_column
-from sqlalchemy import ForeignKey
+from sqlalchemy import ForeignKey, DateTime, func
 from sqlalchemy.orm import relationship
 from training.models.agency import Agency
 from training.models.role import Role
+from datetime import datetime
 
 
 class User(Base):
@@ -16,3 +17,7 @@ class User(Base):
     agency: Mapped[Agency] = relationship()
     roles: Mapped[list[Role]] = relationship(secondary="users_x_roles")
     report_agencies: Mapped[list[Agency]] = relationship(secondary="report_users_x_agencies")
+    created_on: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=func.now(), nullable=False)
+    created_by: Mapped[str] = mapped_column(nullable=False)
+    modified_on: Mapped[datetime] = mapped_column(DateTime(timezone=True))
+    modified_by: Mapped[str] = mapped_column()
diff --git a/training/repositories/certificate.py b/training/repositories/certificate.py
index 069d0a48..0d450ea2 100644
--- a/training/repositories/certificate.py
+++ b/training/repositories/certificate.py
@@ -24,7 +24,7 @@ def get_certificate_by_id(self, id: int) -> UserCertificate | None:
                                .first())
         return result
 
-    def get_all_certificates_by_userid(self, user_id: int) -> list[CertificateListValue]:
+    def get_all_certificates_by_userId(self, user_id: int) -> list[CertificateListValue]:
         quiz_results = (self._session.query(models.QuizCompletion.id.label("id"), models.User.id.label("user_id"),
                                             models.User.name.label("user_name"), models.Quiz.name.label("cert_title"),
                                             models.QuizCompletion.submit_ts.label("completion_date"),
diff --git a/training/repositories/user.py b/training/repositories/user.py
index 9f62e903..616b2689 100644
--- a/training/repositories/user.py
+++ b/training/repositories/user.py
@@ -3,6 +3,7 @@
 from training import models, schemas
 from training.schemas import UserQuizCompletionReportData, UserSearchResult
 from .base import BaseRepository
+from datetime import datetime
 
 
 class UserRepository(BaseRepository[models.User]):
@@ -11,7 +12,7 @@ def __init__(self, session: Session):
         super().__init__(session, models.User)
 
     def create(self, user: schemas.UserCreate) -> models.User:
-        return self.save(models.User(email=user.email.lower(), name=user.name, agency_id=user.agency_id))
+        return self.save(models.User(email=user.email.lower(), name=user.name, agency_id=user.agency_id, created_by=user.name))
 
     def find_by_email(self, email: str) -> models.User | None:
         return self._session.query(models.User).filter(models.User.email == email.lower()).first()
@@ -19,7 +20,7 @@ def find_by_email(self, email: str) -> models.User | None:
     def find_by_agency(self, agency_id: int) -> list[models.User]:
         return self._session.query(models.User).filter(models.User.agency_id == agency_id).all()
 
-    def edit_user_for_reporting(self, user_id: int, report_agencies_list: list[int]) -> models.User:
+    def edit_user_for_reporting(self, user_id: int, report_agencies_list: list[int], modified_by: str) -> models.User:
         # edit_user_for_reporting allow admin to assign report role and associate report agencies to specific user
         db_user = self._session.query(models.User).filter(models.User.id == user_id).first()
         if db_user is None:
@@ -47,6 +48,8 @@ def edit_user_for_reporting(self, user_id: int, report_agencies_list: list[int])
                 db_user.report_agencies.append(agency)
             else:
                 raise ValueError("invalid agency associated with this user")
+        db_user.modified_by = modified_by
+        db_user.modified_on = datetime.now()
         self._session.commit()
         return db_user
 
@@ -77,7 +80,7 @@ def get_users(self, searchText: str, page_number: int) -> UserSearchResult:
             user_search_result = UserSearchResult(users=search_results, total_count=count)
             return user_search_result
 
-    def update_user(self, user_id: int, user: schemas.UserUpdate) -> models.User:
+    def update_user(self, user_id: int, user: schemas.UserUpdate, modified_by: str) -> models.User:
         """
         Updates user name and agency values
         :param user_id: User's ID to update
@@ -89,5 +92,7 @@ def update_user(self, user_id: int, user: schemas.UserUpdate) -> models.User:
             raise ValueError("invalid user id")
         db_user.name = user.name
         db_user.agency_id = user.agency_id
+        db_user.modified_by = modified_by
+        db_user.modified_on = datetime.now()
         self._session.commit()
         return db_user
diff --git a/training/schemas/user.py b/training/schemas/user.py
index 4760567c..71c5b585 100644
--- a/training/schemas/user.py
+++ b/training/schemas/user.py
@@ -1,6 +1,8 @@
 from pydantic import ConfigDict, BaseModel, EmailStr, field_validator
 from training.schemas.agency import Agency
 from training.schemas.role import Role
+from typing import Optional
+from datetime import datetime
 
 
 class UserBase(BaseModel):
@@ -23,6 +25,10 @@ class User(UserBase):
     agency: Agency
     roles: list[Role]
     report_agencies: list[Agency]
+    created_on: str
+    created_by: str
+    modified_on: Optional[str] = None
+    modified_by: Optional[str] = None
 
     def is_admin(self) -> bool:
         role_names = [role.name.upper() for role in self.roles]
@@ -30,6 +36,12 @@ def is_admin(self) -> bool:
 
     model_config = ConfigDict(from_attributes=True)
 
+    @field_validator('created_on', 'modified_on', mode='before')
+    def convert_datetime(cls, input):
+        if isinstance(input, datetime):
+            return input.isoformat()
+        return input
+
 
 class UserJWT(User):
     # Provides a user object that is appropriate for encoding into a JWT.
@@ -45,4 +57,14 @@ def convert_roles(cls, input) -> list[str]:
 class UserSearchResult(BaseModel):
     users: list[User]
     total_count: int
+
+    @field_validator('users', mode='before')
+    def convert_user_datetimes(cls, input):
+        for user in input:
+            if isinstance(user.created_on, datetime):
+                user.created_on = user.created_on.isoformat()
+            if user.modified_on and isinstance(user.modified_on, datetime):
+                user.modified_on = user.modified_on.isoformat()
+        return input
+
     model_config = ConfigDict(from_attributes=True)
diff --git a/training/tests/conftest.py b/training/tests/conftest.py
index 0fc83e70..826254da 100644
--- a/training/tests/conftest.py
+++ b/training/tests/conftest.py
@@ -71,7 +71,7 @@ def db_with_data(db: Session, testdata: dict):
         agency_ids.append(agency.id)
 
     for index, user in enumerate(testdata["users"]):
-        user = models.User(email=user["email"], name=user["name"], agency_id=agency_ids[index % 2])
+        user = models.User(email=user["email"], name=user["name"], agency_id=agency_ids[index % 2], created_by=user["created_by"])
         db.add(user)
         db.commit()
         db.refresh(user)
diff --git a/training/tests/test_api_certificates.py b/training/tests/test_api_certificates.py
index 94a5d7c7..f8a047a5 100644
--- a/training/tests/test_api_certificates.py
+++ b/training/tests/test_api_certificates.py
@@ -51,6 +51,20 @@ def cert_list_value():
     }
 
 
+@pytest.fixture
+def admin_user():
+    return {
+        'name': 'Albus Dumbledore',
+        'email': 'dumbledore@hogwarts.edu',
+        'roles': ['Admin']
+    }
+
+
+@pytest.fixture
+def adminJWT(admin_user):
+    return jwt.encode(admin_user, settings.JWT_SECRET, algorithm="HS256")
+
+
 @pytest.fixture
 def fake_cert_repo():
     mock = MagicMock()
@@ -80,7 +94,7 @@ def test_get_certificates_no_auth(self, fake_cert_repo):
         assert response.status_code == status.HTTP_403_FORBIDDEN
 
     def test_get_no_certificates(self, fake_cert_repo, goodJWT):
-        fake_cert_repo.get_all_certificates_by_userid.return_value = None
+        fake_cert_repo.get_all_certificates_by_userId.return_value = None
         response = client.get(
             "/api/v1/certificates",
             headers={"Authorization": f"Bearer {goodJWT}"}
@@ -88,22 +102,38 @@ def test_get_no_certificates(self, fake_cert_repo, goodJWT):
         assert response.status_code == status.HTTP_404_NOT_FOUND
 
     def test_gets_certificates_by_type_and_id(self, fake_cert_repo, goodJWT):
-        fake_cert_repo.get_all_certificates_by_userid.return_value = None
+        fake_cert_repo.get_all_certificates_by_userId.return_value = None
         client.get(
             "/api/v1/certificates",
             headers={"Authorization": f"Bearer {goodJWT}"}
         )
-        fake_cert_repo.get_all_certificates_by_userid.assert_called_once_with(1)
+        fake_cert_repo.get_all_certificates_by_userId.assert_called_once_with(1)
 
     def test_gets_certificates(self, fake_cert_repo, goodJWT, cert_list_value):
         cert = CertificateListValue.model_validate(cert_list_value)
-        fake_cert_repo.get_all_certificates_by_userid.return_value = [cert]
+        fake_cert_repo.get_all_certificates_by_userId.return_value = [cert]
         response = client.get(
             "/api/v1/certificates",
             headers={"Authorization": f"Bearer {goodJWT}"}
         )
         assert response.json() == [cert_list_value]
 
+    def test_gets_certificates_by_userId(self, fake_cert_repo, adminJWT, cert_list_value):
+        cert = CertificateListValue.model_validate(cert_list_value)
+        fake_cert_repo.get_all_certificates_by_userId.return_value = [cert]
+        response = client.get(
+            "/api/v1/certificates/2",
+            headers={"Authorization": f"Bearer {adminJWT}"}
+        )
+        assert response.json() == [cert_list_value]
+
+    def test_gets_certificates_by_userId_no_admin_role(self, goodJWT):
+        response = client.get(
+            "/api/v1/certificates/2",
+            headers={"Authorization": f"Bearer {goodJWT}"}
+        )
+        assert response.status_code == status.HTTP_401_UNAUTHORIZED
+
     def test_get_specific_certificate_not_found(self, fake_cert_repo, goodJWT):
         fake_cert_repo.get_certificate_by_id.return_value = None
         response = client.post(
@@ -144,12 +174,12 @@ def test_get_specific_quiz_certificate(self, fake_cert_repo, goodJWT, user_cert,
         assert response.text == "some bytes"
 
     def test_gets_certificates_unknown_type(self, fake_cert_repo, goodJWT):
-        fake_cert_repo.get_certificates_by_userid.return_value = None
+        fake_cert_repo.get_certificates_by_userId.return_value = None
         response = client.get(
             "/api/v1/certificates/new-type",
             headers={"Authorization": f"Bearer {goodJWT}"}
         )
-        assert response.status_code == status.HTTP_404_NOT_FOUND
+        assert response.status_code == status.HTTP_401_UNAUTHORIZED
 
     def test_get_specific_gspc_certificate(self, fake_cert_repo, goodJWT, gspc_cert, fake_cert_service_repo):
         gspc_cert['user_id'] = 1
diff --git a/training/tests/test_api_loginless_flow.py b/training/tests/test_api_loginless_flow.py
index 4a8452c3..05765b0a 100644
--- a/training/tests/test_api_loginless_flow.py
+++ b/training/tests/test_api_loginless_flow.py
@@ -48,7 +48,7 @@ def fake_user_repo():
 @pytest.fixture
 def user_complete():
     return {"name": "Stephen Dedalus", "email": "test@example.com", "agency_id": 3, "agency": {"name": 'test name', "id": 3, "bureau": None}, "roles": [],
-            "report_agencies": []}
+            "report_agencies": [], "created_on": "2024-07-19T13:46:23.004418", "created_by": "Stephen Dedalus"}
 
 
 @pytest.fixture
@@ -61,7 +61,9 @@ def authorized_complete():
         agency_id=3,
         agency=Agency(id=3, name='test name', bureau="test"),
         roles=[Role(id=1, name='Wizard')],
-        report_agencies=[]
+        report_agencies=[],
+        created_on="2024-07-19T13:46:23.004418",
+        created_by="Stephen Dedalus"
     )
 
 
diff --git a/training/tests/test_certificate_repository.py b/training/tests/test_certificate_repository.py
index 04267545..23899b58 100644
--- a/training/tests/test_certificate_repository.py
+++ b/training/tests/test_certificate_repository.py
@@ -2,10 +2,10 @@
 from training.repositories import CertificateRepository
 
 
-def test_get_certificates_by_userid(cert_repo_with_data: CertificateRepository, valid_user_ids: List[int]):
+def test_get_certificates_by_userId(cert_repo_with_data: CertificateRepository, valid_user_ids: List[int]):
 
     user_id = valid_user_ids[-1]
-    result = cert_repo_with_data.get_all_certificates_by_userid(user_id)
+    result = cert_repo_with_data.get_all_certificates_by_userId(user_id)
     assert result is not None
     assert len(result) == 1
 
diff --git a/training/tests/test_user_repository.py b/training/tests/test_user_repository.py
index f357190f..538aed83 100644
--- a/training/tests/test_user_repository.py
+++ b/training/tests/test_user_repository.py
@@ -2,6 +2,7 @@
 import pytest
 from training import models, schemas
 from training.repositories import UserRepository, AgencyRepository
+from datetime import datetime, timedelta
 
 
 def test_create(user_repo_empty: UserRepository, agency_repo_with_data: AgencyRepository):
@@ -44,6 +45,7 @@ def test_save(user_repo_empty: UserRepository, agency_repo_with_data: AgencyRepo
         email="newuser@example.com",
         name="New User",
         agency_id=agency_id,
+        created_by="New User"
     ))
     assert result.id
     retrieved_result = user_repo_empty.find_by_id(result.id)
@@ -85,13 +87,15 @@ def test_edit_user_for_reporting(user_repo_with_data: UserRepository, valid_user
     valid_user_id = valid_user_ids[0]
     valid_agency = user_repo_with_data._session.query(models.Agency).first()
     valid_agency_list = [valid_agency.id]
-    result = user_repo_with_data.edit_user_for_reporting(valid_user_id, valid_agency_list)
+    result = user_repo_with_data.edit_user_for_reporting(valid_user_id, valid_agency_list, "test_user")
     assert result is not None
     assert result.roles is not None and any(role.name == "Report" for role in result.roles)
     assert result.report_agencies is not None and any(agency.id == valid_agency.id for agency in result.report_agencies)
+    assert_within_one_minute(result.modified_on)
+    assert result.modified_by == "test_user"
 
 
-def test_invalid_edit_user_for_reporting(user_repo_with_data: UserRepository):
+def test_invalid_create(user_repo_with_data: UserRepository):
     invalid_user_id = 0
     invalid_agency_id_list = [0]
 
@@ -119,6 +123,12 @@ def test_get_users_by_email(user_repo_with_data: UserRepository, valid_user_ids:
         assert search_criteria in item.email
 
 
+def assert_within_one_minute(given_datetime):
+    current_datetime = datetime.now()
+    difference = abs(current_datetime - given_datetime)
+    assert difference < timedelta(minutes=1), f"The datetime {given_datetime} is not within one minute of the current time {current_datetime}"
+
+
 def test_update_user_passing(user_repo_with_data: UserRepository, agency_repo_with_data: AgencyRepository):
     agency_id = agency_repo_with_data.find_all()[0].id
     user_id = user_repo_with_data.find_all()[0]
@@ -128,11 +138,13 @@ def test_update_user_passing(user_repo_with_data: UserRepository, agency_repo_wi
         agency_id=agency_id,
     )
 
-    result = user_repo_with_data.update_user(user_id.id, updated_user)
+    result = user_repo_with_data.update_user(user_id.id, updated_user, "test_user")
     assert result is not None
     assert result.name == "Updated User"
     assert result.agency_id == agency_id
     assert result.email != "updateduser@example.com"
+    assert_within_one_minute(result.modified_on)
+    assert result.modified_by == "test_user"
 
 
 def test_update_user_invalid_user(user_repo_with_data: UserRepository):
@@ -144,4 +156,4 @@ def test_update_user_invalid_user(user_repo_with_data: UserRepository):
     )
 
     with pytest.raises(Exception):
-        user_repo_with_data.update_user(invalid_user_id, updated_user)
+        user_repo_with_data.update_user(invalid_user_id, updated_user, "test_user")
diff --git a/training/tests/testdata.yaml b/training/tests/testdata.yaml
index c1f01207..69652276 100644
--- a/training/tests/testdata.yaml
+++ b/training/tests/testdata.yaml
@@ -21,10 +21,13 @@ agencies:
 users:
   - email: test1@example.com
     name: Test One
+    created_by: Test One
   - email: test2@example.com
     name: Test Two
+    created_by: Test Two
   - email: test3@example.com
     name: Test Three
+    created_by: Test Three
     
 roles:
   - name: test role