Update for 2024 (#6)

.deployment

@@ -0,0 +1,2 @@
+[config]
+SCM_DO_BUILD_DURING_DEPLOYMENT=true

.github/workflows/master_mapleriverbasketball.yml

@@ -87,7 +87,6 @@ jobs:
           AUTH0_API_CLIENT_ID: ${{ secrets.AUTH0_API_CLIENT_ID }}
           AUTH0_API_CLIENT_SECRET: ${{ secrets.AUTH0_API_CLIENT_SECRET }}
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
-          ELEPHANT_SQL_API: ${{ secrets.ELEPHANT_SQL_API }}
 
       - name: Upload
         uses: actions/upload-artifact@v3

client/src/components/pages/shared/Profile/Profile.tsx

@@ -33,6 +33,8 @@ export default function Profile() {
 
   const token = useStoreAuthentication((state) => state.token);
 
+  const currentYear = (new Date()).getFullYear();
+
   const mutation = useMutation({
     mutationFn: () => UserRequests.updateUser(token, updatedUser),
     onSuccess: () => {
@@ -88,7 +90,7 @@ export default function Profile() {
     setUpdatedUser(user);
 
     const year = graduationYear ? graduationYear : 0;
-    if (year !== 0 && (year < 2023 || year > 2032)) {
+    if (year !== 0 && (year < currentYear - 1 || year > currentYear + 10)) {
       setValidGraduationYear(false);
     } else {
       setValidGraduationYear(true);
@@ -241,7 +243,7 @@ export default function Profile() {
               }
             />
             <Form.Control.Feedback type="invalid">
-              Please enter a value between 2023 and 2032.
+              Please enter a value between {currentYear - 1} and {currentYear + 10}.
             </Form.Control.Feedback>
           </Form.Group>
         )}

server/src/controllers/UserController.ts

@@ -162,7 +162,8 @@ export default class UserController {
       return;
     }
 
-    if (graduationYear && graduationYear !== 0 && (graduationYear < 2023 || graduationYear > 2032)) {
+    const currentYear = (new Date()).getFullYear();
+    if (graduationYear && graduationYear !== 0 && (graduationYear < currentYear - 1 || graduationYear > currentYear + 10)) {
       response.status(400).json("Invalid Graduation Year");
       return;
     }

server/src/server.ts

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-import axios from "axios";
 import express, { Request, Response } from "express";
 import path from "path";
 
@@ -65,24 +64,6 @@ app.get(
   }
 );
 
-// This route requests ElephantSQL to create a database backup.
-app.get("/api/v1/backup-database", (req: any, res: Response) => {
-  const data = {
-    db: "ybqbejar"
-  };
-  const config: any = {
-    auth: {
-      username: "",
-      password: process.env.ELEPHANT_SQL_API
-    },
-  };
-  axios.post("https://api.elephantsql.com/api/backup", data, config);
-  res.json({
-    message:
-      "ElephantSQL database backup requested.",
-  });
-});
-
 // Downloads
 app.get("/api/v1/download-player-stats", AuthController.jwtCheck, DownloadController.downloadPlayerStats);
 

sql/entries.sql

@@ -5,7 +5,9 @@
 CREATE TABLE IF NOT EXISTS entries (
     id SERIAL PRIMARY KEY,
     auth_id VARCHAR REFERENCES users (auth_id),
-    activity_type SMALLINT NOT NULL CHECK (activity_type >= 0) REFERENCES activity_types (activity_id),
+    activity_type SMALLINT NOT NULL CHECK (
+        activity_type >= 0
+    ) REFERENCES activity_types (activity_id),
     activity_date DATE NOT NULL DEFAULT CURRENT_DATE,
     activity_duration INTEGER NOT NULL CHECK (activity_duration >= 0),
     date_created DATE NOT NULL DEFAULT CURRENT_TIMESTAMP
@@ -15,7 +17,7 @@ ALTER TABLE entries
 ADD date_created DATE NOT NULL DEFAULT CURRENT_TIMESTAMP;
 
 ALTER TABLE entries
-ADD constraint entries_activity_type_fkey FOREIGN KEY (activity_type)
+ADD CONSTRAINT entries_activity_type_fkey FOREIGN KEY (activity_type)
 REFERENCES activity_types (activity_id);
 
 -- Insert into the entries table
@@ -37,7 +39,7 @@ SELECT
     users.first_name,
     users.last_name
 FROM entries
-LEFT JOIN users ON users.auth_id = entries.auth_id
+LEFT JOIN users ON entries.auth_id = users.auth_id
 ORDER BY entries.auth_id ASC,
     entries.activity_date DESC,
     entries.activity_duration DESC;