wip endorsements

vatger · May 30, 2024 · ce47a8d · ce47a8d
1 parent fca2cff
commit ce47a8d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 6 deletions.
diff --git a/backend/.env.example b/backend/.env.example
@@ -21,6 +21,7 @@ FILE_TMP_LOCATION=./storage/tmp/
 # API ENDPOINT BASE URIs #
 ##########################
 VATSIM_API_BASE=https://api.vatsim.net/api/v2
+VATEUD_API_USE=false
 VATEUD_API_BASE=https://core.vateud.net/api
 VATEUD_API_KEY=
 VATGER_API_BASE=https://vatsim-germany.org/api

diff --git a/backend/src/Router.ts b/backend/src/Router.ts
@@ -324,6 +324,7 @@ router.use(
             "/endorsement",
             routerGroup((r: Router) => {
                 r.post("/", UserEndorsementAdminController.addEndorsement);
+                r.delete("/", UserEndorsementAdminController.deleteEndorsement);
             })
         );
 

diff --git a/backend/src/controllers/user/UserEndorsementAdminController.ts b/backend/src/controllers/user/UserEndorsementAdminController.ts
@@ -45,20 +45,25 @@ async function addEndorsement(request: Request, response: Response, next: NextFu
         });
 
 
-        /*
+
         if (!(await createEndorsement(userEndorsement, endorsementGroup))) {
             await userEndorsement.destroy();
-            throw new Error();
+            throw new Error("Could not create endorsement in VATEUD CORE.");
         }
-        */
+
 
         response.status(HttpStatusCode.Created).send(endorsementGroup);
     } catch (e) {
         next(e);
     }
 }
 
-// TODO: Paul (keine Ahnung, was du hier probierst :D)
+/**
+ * Deletes an endorsement to a user
+ * @param request
+ * @param response
+ * @param next
+ */
 async function deleteEndorsement(request: Request, response: Response, next: NextFunction) {
     try {
         const requestingUser: User = response.locals.user;

diff --git a/backend/src/core/Config.ts b/backend/src/core/Config.ts
@@ -25,6 +25,7 @@ const required_env: Array<string> = [
     "FRONTEND_URI",
     "SESSION_COOKIE_NAME",
     "VATSIM_API_BASE",
+    "VATEUD_API_USE",
     "VATEUD_API_BASE",
     "VATEUD_API_KEY",
     "VATGER_API_BASE",
@@ -78,6 +79,7 @@ export const Config = {
     },
 
     VATEUD_CORE_CONFIG: {
+        USE: process.env.VATEUD_API_USE,
         API_KEY: process.env.VATEUD_API_KEY,
     },
 

diff --git a/backend/src/libraries/vateud/VateudCoreLibrary.ts b/backend/src/libraries/vateud/VateudCoreLibrary.ts
@@ -133,6 +133,11 @@ export async function removeSolo(userSolo: UserSolo) {
  * On success, it updates the corresponding endorsement with the returned VATEUD ID
  */
 export async function createEndorsement(userEndorsement: EndorsementGroupsBelongsToUsers, endorsementGroup: EndorsementGroup | null) {
+
+    if(!Config.VATEUD_CORE_CONFIG.USE) {
+        return true;
+    }
+
     if (!endorsementGroup) return false;
     const endorsementInfo: VateudCoreEndorsementCreateT = {
         local_id: userEndorsement.id,

diff --git a/...tend/src/pages/administration/lm/endorsement-group/create/EndorsementGroupCreate.view.tsx b/...tend/src/pages/administration/lm/endorsement-group/create/EndorsementGroupCreate.view.tsx
@@ -129,6 +129,7 @@ export function EndorsementGroupCreateView() {
                                 description={"Dieser Wert kann NICHT mehr geändert werden."}>
                                 <option value={"1"}>Tier 1</option>
                                 <option value={"2"}>Tier 2</option>
+                                <option value={"0"}>nur Solo</option>
                             </Select>
 
                             <Separator />

diff --git a/...tend/src/pages/administration/lm/endorsement-group/view/_subpages/EGVSettings.subpage.tsx b/...tend/src/pages/administration/lm/endorsement-group/view/_subpages/EGVSettings.subpage.tsx
@@ -75,7 +75,7 @@ export function EGVSettingsSubpage() {
                         className={"mt-5"}
                         disabled
                         preIcon={<TbListNumbers size={ICON_SIZE_OPTS.MD} />}
-                        value={endorsementGroup?.tier.toString()}
+                        value={Number(endorsementGroup?.tier) > 0 ? `Tier ${endorsementGroup?.tier}` : 'Solo only'}
                     />
 
                     <Separator />

diff --git a/frontend/src/pages/administration/mentor/users/view/_modals/UVAddEndorsement.modal.tsx b/frontend/src/pages/administration/mentor/users/view/_modals/UVAddEndorsement.modal.tsx
@@ -67,7 +67,7 @@ export function UVAddEndorsementModal({
                 onClose();
             })
             .catch(() => {
-                ToastHelper.error("Fehler beim erstellen der Freigabe");
+                ToastHelper.error("Fehler beim Erstellen der Freigabe");
             })
             .finally(() => setSubmitting(false));
     }