refactor: make use of enums

simonknittel · Dec 19, 2024 · 58818ff · 58818ff
1 parent e96c417
commit 58818ff
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 37 deletions.
diff --git a/app/src/app/api/spynet/organization/[organizationId]/membership/[citizenId]/route.ts b/app/src/app/api/spynet/organization/[organizationId]/membership/[citizenId]/route.ts
@@ -1,7 +1,7 @@
 import { authenticateApi } from "@/auth/server";
 import { prisma } from "@/db";
 import { updateActiveMembership } from "@/organizations/utils/updateActiveMembership";
-import { ConfirmationStatus } from "@prisma/client";
+import { ConfirmationStatus, OrganizationMembershipType } from "@prisma/client";
 import { NextResponse } from "next/server";
 import { z } from "zod";
 import apiErrorHandler from "../../../../../../../lib/apiErrorHandler";
@@ -57,7 +57,7 @@ export async function DELETE(request: Request, { params }: { params: Params }) {
             id: paramsData.citizenId,
           },
         },
-        type: "LEFT",
+        type: OrganizationMembershipType.LEFT,
         visibility: membership.visibility,
         createdBy: {
           connect: {

diff --git a/app/src/app/api/spynet/organization/route.ts b/app/src/app/api/spynet/organization/route.ts
@@ -1,6 +1,7 @@
 import { authenticateApi } from "@/auth/server";
 import { prisma } from "@/db";
 import { log } from "@/logging";
+import { ConfirmationStatus } from "@prisma/client";
 import { NextResponse } from "next/server";
 import { serializeError } from "serialize-error";
 import { z } from "zod";
@@ -76,7 +77,7 @@ export async function POST(request: Request) {
             },
             attributeKey: "name",
             newValue: data.name,
-            confirmed: "CONFIRMED",
+            confirmed: ConfirmationStatus.CONFIRMED,
             confirmedAt: new Date(),
             confirmedBy: {
               connect: {

diff --git a/app/src/app/app/spynet/_components/ActivityTile/mapOrganizationMembershipHistoryEntries.tsx b/app/src/app/app/spynet/_components/ActivityTile/mapOrganizationMembershipHistoryEntries.tsx
@@ -1,5 +1,7 @@
 import { requireAuthentication } from "@/auth/server";
 import {
+  OrganizationMembershipType,
+  OrganizationMembershipVisibility,
   type Entity,
   type Organization,
   type OrganizationMembershipHistoryEntry,
@@ -35,13 +37,17 @@ export const mapOrganizationMembershipHistoryEntries = async (
 
   return entries
     .filter((entry) =>
-      (alsoVisibilityRedacted ? ["PUBLIC", "REDACTED"] : ["PUBLIC"]).includes(
-        entry.visibility,
-      ),
+      (alsoVisibilityRedacted
+        ? [
+            OrganizationMembershipVisibility.PUBLIC,
+            OrganizationMembershipVisibility.REDACTED,
+          ]
+        : [OrganizationMembershipVisibility.PUBLIC]
+      ).includes(entry.visibility),
     )
     .map((entry) => {
       switch (entry.type) {
-        case "MAIN":
+        case OrganizationMembershipType.MAIN:
           return {
             key: entry.id,
             date: entry.createdAt,
@@ -76,7 +82,7 @@ export const mapOrganizationMembershipHistoryEntries = async (
             ),
           };
 
-        case "AFFILIATE":
+        case OrganizationMembershipType.AFFILIATE:
           return {
             key: entry.id,
             date: entry.createdAt,
@@ -101,7 +107,7 @@ export const mapOrganizationMembershipHistoryEntries = async (
             ),
           };
 
-        case "LEFT":
+        case OrganizationMembershipType.LEFT:
           return {
             key: entry.id,
             date: entry.createdAt,

diff --git a/app/src/app/app/spynet/entity/[id]/_components/CreateOrganizationMembership.tsx b/app/src/app/app/spynet/entity/[id]/_components/CreateOrganizationMembership.tsx
@@ -2,8 +2,9 @@
 
 import { useAuthentication } from "@/auth/client";
 import {
-  type OrganizationMembershipType,
-  type OrganizationMembershipVisibility,
+  ConfirmationStatus,
+  OrganizationMembershipType,
+  OrganizationMembershipVisibility,
 } from "@prisma/client";
 import { useRouter } from "next/navigation";
 import { useId, useState } from "react";
@@ -35,7 +36,7 @@ export const CreateOrganizationMembership = ({
   const router = useRouter();
   const { register, handleSubmit, reset } = useForm<FormValues>({
     defaultValues: {
-      type: "MAIN",
+      type: OrganizationMembershipType.MAIN,
     },
   });
   const [isLoading, setIsLoading] = useState(false);
@@ -62,7 +63,7 @@ export const CreateOrganizationMembership = ({
             redacted: data.visibility || false,
             confirmed:
               e.nativeEvent.submitter.name === "confirmed"
-                ? "CONFIRMED"
+                ? ConfirmationStatus.CONFIRMED
                 : undefined,
           }),
         },
@@ -108,7 +109,7 @@ export const CreateOrganizationMembership = ({
 
         <form onSubmit={handleSubmit(onSubmit)}>
           <label className="mt-6 block" htmlFor={organizationIdInputId}>
-            Organisation
+            Organisation (Sinister ID)
           </label>
 
           <input
@@ -127,8 +128,10 @@ export const CreateOrganizationMembership = ({
             id={typeInputId}
             {...register("type", { required: true })}
           >
-            <option value="MAIN">Main</option>
-            <option value="AFFILIATE">Affiliate</option>
+            <option value={OrganizationMembershipType.MAIN}>Main</option>
+            <option value={OrganizationMembershipType.AFFILIATE}>
+              Affiliate
+            </option>
           </select>
 
           <div className="mt-6 flex justify-between items-center">
@@ -137,7 +140,7 @@ export const CreateOrganizationMembership = ({
             <YesNoCheckbox
               {...register("visibility")}
               id={visibilityInputId}
-              value="REDACTED"
+              value={OrganizationMembershipVisibility.REDACTED}
             />
           </div>
 

diff --git a/app/src/app/app/spynet/entity/[id]/_components/OrganizationMembershipsTile.tsx b/app/src/app/app/spynet/entity/[id]/_components/OrganizationMembershipsTile.tsx
@@ -1,5 +1,6 @@
 import { requireAuthentication } from "@/auth/server";
 import { prisma } from "@/db";
+import { OrganizationMembershipVisibility } from "@prisma/client";
 import clsx from "clsx";
 import Image from "next/image";
 import Link from "next/link";
@@ -33,17 +34,16 @@ export const OrganizationMembershipsTile = async ({ className, id }: Props) => {
       where: {
         citizenId: id,
         visibility: {
-          in: alsoVisibilityRedacted ? ["PUBLIC", "REDACTED"] : ["PUBLIC"],
+          in: alsoVisibilityRedacted
+            ? [
+                OrganizationMembershipVisibility.PUBLIC,
+                OrganizationMembershipVisibility.REDACTED,
+              ]
+            : [OrganizationMembershipVisibility.PUBLIC],
         },
       },
-      select: {
-        organization: {
-          select: {
-            id: true,
-            name: true,
-            logo: true,
-          },
-        },
+      include: {
+        organization: true,
       },
     });
 

diff --git a/app/src/app/app/spynet/organization/[id]/_components/ActivityTile.tsx b/app/src/app/app/spynet/organization/[id]/_components/ActivityTile.tsx
@@ -2,6 +2,7 @@ import { requireAuthentication } from "@/auth/server";
 import { prisma } from "@/db";
 import {
   ConfirmationStatus,
+  OrganizationMembershipType,
   OrganizationMembershipVisibility,
 } from "@prisma/client";
 import clsx from "clsx";
@@ -116,7 +117,7 @@ export const ActivityTile = async ({ className, id }: Props) => {
       }),
     ...organization.membershipHistoryEntries.map((entry) => {
       switch (entry.type) {
-        case "MAIN":
+        case OrganizationMembershipType.MAIN:
           return {
             key: entry.id,
             date: entry.createdAt,
@@ -135,7 +136,7 @@ export const ActivityTile = async ({ className, id }: Props) => {
             ),
           };
 
-        case "AFFILIATE":
+        case OrganizationMembershipType.AFFILIATE:
           return {
             key: entry.id,
             date: entry.createdAt,
@@ -154,7 +155,7 @@ export const ActivityTile = async ({ className, id }: Props) => {
             ),
           };
 
-        case "LEFT":
+        case OrganizationMembershipType.LEFT:
           return {
             key: entry.id,
             date: entry.createdAt,

diff --git a/app/src/app/app/spynet/organization/[id]/_components/CreateMembership.tsx b/app/src/app/app/spynet/organization/[id]/_components/CreateMembership.tsx
@@ -2,8 +2,9 @@
 
 import { useAuthentication } from "@/auth/client";
 import {
-  type OrganizationMembershipType,
-  type OrganizationMembershipVisibility,
+  ConfirmationStatus,
+  OrganizationMembershipType,
+  OrganizationMembershipVisibility,
 } from "@prisma/client";
 import { useRouter } from "next/navigation";
 import { useId, useState } from "react";
@@ -32,7 +33,7 @@ export const CreateMembership = ({ className, organizationId }: Props) => {
   const router = useRouter();
   const { register, handleSubmit, reset } = useForm<FormValues>({
     defaultValues: {
-      type: "MAIN",
+      type: OrganizationMembershipType.MAIN,
     },
   });
   const [isLoading, setIsLoading] = useState(false);
@@ -59,7 +60,7 @@ export const CreateMembership = ({ className, organizationId }: Props) => {
             redacted: data.visibility || false,
             confirmed:
               e.nativeEvent.submitter.name === "confirmed"
-                ? "CONFIRMED"
+                ? ConfirmationStatus.CONFIRMED
                 : undefined,
           }),
         },
@@ -124,8 +125,10 @@ export const CreateMembership = ({ className, organizationId }: Props) => {
             id={typeInputId}
             {...register("type", { required: true })}
           >
-            <option value="MAIN">Main</option>
-            <option value="AFFILIATE">Affiliate</option>
+            <option value={OrganizationMembershipType.MAIN}>Main</option>
+            <option value={OrganizationMembershipType.AFFILIATE}>
+              Affiliate
+            </option>
           </select>
 
           <div className="mt-6 flex justify-between items-center">
@@ -134,7 +137,7 @@ export const CreateMembership = ({ className, organizationId }: Props) => {
             <YesNoCheckbox
               {...register("visibility")}
               id={visibilityInputId}
-              value="REDACTED"
+              value={OrganizationMembershipVisibility.REDACTED}
             />
           </div>
 

diff --git a/app/src/app/app/spynet/organization/[id]/_components/MembershipsTile.tsx b/app/src/app/app/spynet/organization/[id]/_components/MembershipsTile.tsx
@@ -1,5 +1,6 @@
 import { requireAuthentication } from "@/auth/server";
 import { prisma } from "@/db";
+import { OrganizationMembershipVisibility } from "@prisma/client";
 import clsx from "clsx";
 import Link from "next/link";
 import { FaExternalLinkAlt, FaUsers } from "react-icons/fa";
@@ -32,7 +33,12 @@ export const MembershipsTile = async ({ className, id }: Props) => {
       where: {
         organizationId: id,
         visibility: {
-          in: alsoVisibilityRedacted ? ["PUBLIC", "REDACTED"] : ["PUBLIC"],
+          in: alsoVisibilityRedacted
+            ? [
+                OrganizationMembershipVisibility.PUBLIC,
+                OrganizationMembershipVisibility.REDACTED,
+              ]
+            : [OrganizationMembershipVisibility.PUBLIC],
         },
       },
       select: {