Api create moharana (#53)

* Add create user endpoint and update model/entity

* Add next route for adding user and add functionality for user table

* Connect create item to backend and add associated frontend routes

backend/api/resource.py

@@ -19,7 +19,10 @@ openapi_tags = {
 # TODO: Create custom exceptions
 @api.post("", response_model=Resource, tags=["Resource"])
 def create(
-    uuid: str, resource: Resource, user_svc: UserService = Depends(), resource_svc: ResourceService = Depends()
+    uuid: str,
+    resource: Resource,
+    user_svc: UserService = Depends(),
+    resource_svc: ResourceService = Depends(),
 ):
     subject = user_svc.get_user_by_uuid(uuid)
     return resource_svc.create(subject, resource)
@@ -27,14 +30,20 @@ def create(
 
 @api.get("", response_model=List[Resource], tags=["Resource"])
 def get_all(
-    uuid: str, user_svc: UserService = Depends(), resource_svc: ResourceService = Depends()
+    uuid: str,
+    user_svc: UserService = Depends(),
+    resource_svc: ResourceService = Depends(),
 ):
     subject = user_svc.get_user_by_uuid(uuid)
     return resource_svc.get_resource_by_user(subject)
 
+
 @api.get("/{name}", response_model=Resource, tags=["Resource"])
 def get_by_name(
-    name:str, uuid:str, user_svc: UserService = Depends(), resource_svc: ResourceService = Depends()
+    name: str,
+    uuid: str,
+    user_svc: UserService = Depends(),
+    resource_svc: ResourceService = Depends(),
 ):
     subject = user_svc.get_user_by_uuid(uuid)
     return resource_svc.get_resource_by_name(name, subject)
@@ -42,7 +51,10 @@ def get_by_name(
 
 @api.put("", response_model=Resource, tags=["Resource"])
 def update(
-    uuid: str, resource: Resource, user_svc: UserService = Depends(), resource_svc: ResourceService = Depends()
+    uuid: str,
+    resource: Resource,
+    user_svc: UserService = Depends(),
+    resource_svc: ResourceService = Depends(),
 ):
     subject = user_svc.get_user_by_uuid(uuid)
     return resource_svc.update(subject, resource)
@@ -50,7 +62,10 @@ def update(
 
 @api.delete("", response_model=None, tags=["Resource"])
 def delete(
-    uuid: str, resource: Resource, user_svc: UserService = Depends(), resource_svc: ResourceService = Depends()
+    uuid: str,
+    resource: Resource,
+    user_svc: UserService = Depends(),
+    resource_svc: ResourceService = Depends(),
 ):
     subject = user_svc.get_user_by_uuid(uuid)
     resource_svc.delete(subject, resource)

backend/api/user.py

@@ -16,8 +16,8 @@ openapi_tags = {
 # TODO: Enable authorization by passing user uuid to API
 # TODO: Create custom exceptions
 @api.get("/all", response_model=List[User], tags=["Users"])
-def get_all(user_id: str, user_svc: UserService = Depends()):
+def get_all(uuid: str, user_svc: UserService = Depends()):
-    subject = user_svc.get_user_by_uuid(user_id)
+    subject = user_svc.get_user_by_uuid(uuid)
 
     if subject.role != UserTypeEnum.ADMIN:
         raise Exception(f"Insufficient permissions for user {subject.uuid}")
@@ -28,3 +28,12 @@ def get_all(user_id: str, user_svc: UserService = Depends()):
 @api.get("/{user_id}", response_model=User, tags=["Users"])
 def get_by_uuid(user_id: str, user_svc: UserService = Depends()):
     return user_svc.get_user_by_uuid(user_id)
+
+
+@api.post("/", response_model=User, tags=["Users"])
+def create_user(uuid: str, user: User, user_svc: UserService = Depends()):
+    subject = user_svc.get_user_by_uuid(uuid)
+    if subject.role != UserTypeEnum.ADMIN:
+        raise Exception(f"Insufficient permissions for user {subject.uuid}")
+
+    return user_svc.create(user)

backend/entities/user_entity.py

@@ -38,8 +38,8 @@ class UserEntity(EntityBase):
     program: Mapped[list[ProgramTypeEnum]] = mapped_column(
         ARRAY(Enum(ProgramTypeEnum)), nullable=False
     )
-    experience: Mapped[int] = mapped_column(Integer, nullable=False)
+    experience: Mapped[int] = mapped_column(Integer, nullable=True)
-    group: Mapped[str] = mapped_column(String(50))
+    group: Mapped[str] = mapped_column(String(50), nullable=True)
     uuid: Mapped[str] = mapped_column(String, nullable=True)
 
     @classmethod

backend/models/user_model.py

@@ -10,9 +10,9 @@ class User(BaseModel):
     id: int | None = None
     username: str = Field(..., description="The username of the user")
     email: str = Field(..., description="The e-mail of the user")
-    experience: int = Field(..., description="Years of Experience of the User")
+    experience: int | None = Field(None, description="Years of Experience of the User")
-    group: str
+    group: str | None = Field(None, description="The group of the user")
-    program: List[ProgramTypeEnum]
+    program: List[ProgramTypeEnum] | None = None
-    role: UserTypeEnum
+    role: UserTypeEnum | None = None
     created_at: Optional[datetime] = datetime.now()
     uuid: str | None = None

backend/services/user.py

@@ -61,22 +61,21 @@ class UserService:
 
         """
         try:
-            if (user.id != None):
+            if user.id != None:
                 user = self.get_user_by_id(user.id)
+            else:
+                user_entity = UserEntity.from_model(user)
+                # add new user to table
+                self._session.add(user_entity)
+                self._session.commit()
         except:
-            # if does not exist, create new object
+            raise Exception(f"Failed to create user")
-            user_entity = UserEntity.from_model(user)
 
-            # add new user to table
+        return user
-            self._session.add(user_entity)
+
-            self._session.commit()
+    def delete(self, user: User) -> None:
-        finally:
-            # return added object
-            return user
-        
-    def delete(self, user: User) -> None:   
         """
-        Delete a user 
+        Delete a user
 
         Args: the user to delete
 
@@ -86,25 +85,23 @@ class UserService:
 
         if obj is None:
             raise Exception(f"No matching user found")
-        
+
         self._session.delete(obj)
         self._session.commit()
 
-
+    def update(self, user: User) -> User:
-
-    def update(self, user: User) -> User: 
         """
         Updates a user
 
         Args: User to be updated
 
         Returns: The updated User
-        """   
+        """
         obj = self._session.get(UserEntity, user.id)
 
         if obj is None:
             raise Exception(f"No matching user found")
-        
+
         obj.username = user.username
         obj.role = user.role
         obj.email = user.email
@@ -115,5 +112,3 @@ class UserService:
         self._session.commit()
 
         return obj.to_model()
-
-

compass/app/admin/page.tsx

@@ -10,6 +10,7 @@ import { useEffect, useState } from "react";
 
 export default function Page() {
     const [users, setUsers] = useState<User[]>([]);
+    const [uuid, setUuid] = useState<string>("");
 
     useEffect(() => {
         async function getUser() {
@@ -22,8 +23,10 @@ export default function Page() {
                 return;
             }
 
+            setUuid(data.user.id);
+
             const userListData = await fetch(
-                `${process.env.NEXT_PUBLIC_HOST}/api/user/all?uuid=${data.user.id}`
+                `/api/user/all?uuid=${data.user.id}`
             );
 
             const users: User[] = await userListData.json();
@@ -38,7 +41,8 @@ export default function Page() {
         <div className="min-h-screen flex flex-col">
             {/* icon + title  */}
             <PageLayout title="Users" icon={<UsersIcon />}>
-                <UserTable data={users} setData={setUsers} />
+                {/* TODO: REPLACE UUID WITH HTTP BEARER TOKEN */}
+                <UserTable data={users} setData={setUsers} uuid={uuid} />
             </PageLayout>
         </div>
     );

compass/app/api/resource/create/route.ts

@@ -0,0 +1,37 @@
+import { NextResponse } from "next/server";
+import User from "@/utils/models/User";
+
+export async function POST(request: Request) {
+    const apiEndpoint = `${process.env.NEXT_PUBLIC_API_HOST}/api/resource`;
+
+    try {
+        const resourceData = await request.json();
+
+        console.log("RESOURCE DATA", JSON.stringify(resourceData));
+
+        const { searchParams } = new URL(request.url);
+        const uuid = searchParams.get("uuid");
+
+        // Send the POST request to the backend
+        const response = await fetch(`${apiEndpoint}?uuid=${uuid}`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify(resourceData),
+        });
+
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+
+        const createdResource: User = await response.json();
+        return NextResponse.json(createdResource, { status: response.status });
+    } catch (error) {
+        console.error("Error creating resource:", error);
+        return NextResponse.json(
+            { error: "Failed to create resource" },
+            { status: 500 }
+        );
+    }
+}

compass/app/api/service/create/route.ts

@@ -0,0 +1,37 @@
+import { NextResponse } from "next/server";
+import User from "@/utils/models/User";
+
+export async function POST(request: Request) {
+    const apiEndpoint = `${process.env.NEXT_PUBLIC_API_HOST}/api/service`;
+
+    try {
+        const serviceData = await request.json();
+
+        console.log("SERVICE DATA", JSON.stringify(serviceData));
+
+        const { searchParams } = new URL(request.url);
+        const uuid = searchParams.get("uuid");
+
+        // Send the POST request to the backend
+        const response = await fetch(`${apiEndpoint}?uuid=${uuid}`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify(serviceData),
+        });
+
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+
+        const createdService: User = await response.json();
+        return NextResponse.json(createdService, { status: response.status });
+    } catch (error) {
+        console.error("Error creating service:", error);
+        return NextResponse.json(
+            { error: "Failed to create service" },
+            { status: 500 }
+        );
+    }
+}

compass/app/api/user/all/route.ts

@@ -9,7 +9,7 @@ export async function GET(request: Request) {
     const { searchParams } = new URL(request.url);
     const uuid = searchParams.get("uuid");
 
-    const data = await fetch(`${apiEndpoint}?user_id=${uuid}`);
+    const data = await fetch(`${apiEndpoint}?uuid=${uuid}`);
 
     const userData: User[] = await data.json();
     // TODO: Remove make every user visible

compass/app/api/user/create/route.ts

@@ -0,0 +1,37 @@
+import { NextResponse } from "next/server";
+import User from "@/utils/models/User";
+
+export async function POST(request: Request) {
+    const apiEndpoint = `${process.env.NEXT_PUBLIC_API_HOST}/api/user`;
+
+    try {
+        const userData = await request.json();
+
+        console.log("USER DATA", JSON.stringify(userData));
+
+        const { searchParams } = new URL(request.url);
+        const uuid = searchParams.get("uuid");
+
+        // Send the POST request to the backend
+        const response = await fetch(`${apiEndpoint}?uuid=${uuid}`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify(userData),
+        });
+
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+
+        const createdUser: User = await response.json();
+        return NextResponse.json(createdUser, { status: response.status });
+    } catch (error) {
+        console.error("Error creating user:", error);
+        return NextResponse.json(
+            { error: "Failed to create user" },
+            { status: 500 }
+        );
+    }
+}

compass/app/resource/page.tsx

@@ -10,6 +10,7 @@ import { useEffect, useState } from "react";
 
 export default function Page() {
     const [resources, setResources] = useState<Resource[]>([]);
+    const [uuid, setUuid] = useState<string>("");
 
     useEffect(() => {
         async function getResources() {
@@ -22,6 +23,8 @@ export default function Page() {
                 return;
             }
 
+            setUuid(data.user.id);
+
             const userListData = await fetch(
                 `${process.env.NEXT_PUBLIC_HOST}/api/resource/all?uuid=${data.user.id}`
             );
@@ -38,7 +41,11 @@ export default function Page() {
         <div className="min-h-screen flex flex-col">
             {/* icon + title  */}
             <PageLayout title="Resources" icon={<BookmarkIcon />}>
-                <ResourceTable data={resources} setData={setResources} />
+                <ResourceTable
+                    data={resources}
+                    setData={setResources}
+                    uuid={uuid}
+                />
             </PageLayout>
         </div>
     );

compass/app/service/page.tsx

@@ -10,6 +10,7 @@ import { useEffect, useState } from "react";
 
 export default function Page() {
     const [services, setServices] = useState<Service[]>([]);
+    const [uuid, setUuid] = useState<string>("");
 
     useEffect(() => {
         async function getServices() {
@@ -22,6 +23,8 @@ export default function Page() {
                 return;
             }
 
+            setUuid(data.user.id);
+
             const serviceListData = await fetch(
                 `${process.env.NEXT_PUBLIC_HOST}/api/service/all?uuid=${data.user.id}`
             );
@@ -37,7 +40,11 @@ export default function Page() {
         <div className="min-h-screen flex flex-col">
             {/* icon + title  */}
             <PageLayout title="Services" icon={<ClipboardIcon />}>
-                <ServiceTable data={services} setData={setServices} />
+                <ServiceTable
+                    data={services}
+                    setData={setServices}
+                    uuid={uuid}
+                />
             </PageLayout>
         </div>
     );

compass/components/Drawer/CreateDrawer.tsx

@@ -26,8 +26,6 @@ const CreateDrawer: FunctionComponent<CreateDrawerProps> = ({
         e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
     ) => {
         const { name, value } = e.target;
-        console.log(newItemContent);
-        console.log(Object.keys(newItemContent).length);
         setNewItemContent((prev: any) => ({
             ...prev,
             [name]: value,
@@ -45,6 +43,7 @@ const CreateDrawer: FunctionComponent<CreateDrawerProps> = ({
 
     const handleCreate = () => {
         if (onCreate(newItemContent)) {
+            console.log("newItemContent", newItemContent);
             setNewItemContent({});
             setIsOpen(false);
         }

compass/components/Drawer/Drawer.tsx

@@ -79,13 +79,14 @@ const Drawer: FunctionComponent<DrawerProps> = ({
                     return row;
                 });
             });
+
+            console.log("Send API request to update row content");
         }
 
         setIsOpen(!isOpen);
         if (isFull) {
             setIsFull(!isFull);
         }
-        console.log("Send API request to update row content");
     };
 
     const toggleDrawerFullScreen = () => setIsFull(!isFull);

compass/components/Table/ResourceTable.tsx

@@ -18,6 +18,7 @@ import { Tag } from "../TagsInput/Tag";
 type ResourceTableProps = {
     data: Resource[];
     setData: Dispatch<SetStateAction<Resource[]>>;
+    uuid: string;
 };
 
 /**
@@ -25,13 +26,17 @@ type ResourceTableProps = {
  * @param props.data Stateful list of resources to be displayed by the table
  * @param props.setData State setter for the list of resources
  */
-export default function ResourceTable({ data, setData }: ResourceTableProps) {
+export default function ResourceTable({
+    data,
+    setData,
+    uuid,
+}: ResourceTableProps) {
     const columnHelper = createColumnHelper<Resource>();
 
     const [programPresets, setProgramPresets] = useState([
-        "domestic",
+        "DOMESTIC",
-        "community",
+        "COMMUNITY",
-        "economic",
+        "ECONOMIC",
     ]);
 
     const resourceDetails: Details[] = [
@@ -137,6 +142,7 @@ export default function ResourceTable({ data, setData }: ResourceTableProps) {
             setData={setData}
             columns={columns}
             details={resourceDetails}
+            createEndpoint={`/api/resource/create?uuid=${uuid}`}
         />
     );
 }

compass/components/Table/ServiceTable.tsx

@@ -16,6 +16,7 @@ import { Tag } from "../TagsInput/Tag";
 type ServiceTableProps = {
     data: Service[];
     setData: Dispatch<SetStateAction<Service[]>>;
+    uuid: string;
 };
 
 /**
@@ -23,23 +24,27 @@ type ServiceTableProps = {
  * @param props.data Stateful list of services to be displayed by the table
  * @param props.setData State setter for the list of services
  */
-export default function ServiceTable({ data, setData }: ServiceTableProps) {
+export default function ServiceTable({
+    data,
+    setData,
+    uuid,
+}: ServiceTableProps) {
     const columnHelper = createColumnHelper<Service>();
 
     const [programPresets, setProgramPresets] = useState([
-        "domestic",
+        "DOMESTIC",
-        "community",
+        "COMMUNITY",
-        "economic",
+        "ECONOMIC",
     ]);
 
     const [requirementPresets, setRequirementPresets] = useState([
-        "anonymous",
+        "ANONYMOUS",
-        "confidential",
+        "CONFIDENTIAL",
-        "referral required",
+        "REFERRAL REQUIRED",
-        "safety assessment",
+        "SAFETY ASSESSMENT",
-        "intake required",
+        "INTAKE REQUIRED",
-        "income eligibility",
+        "INCOME ELIGIBILITY",
-        "initial assessment",
+        "INITIAL ASSESSMENT",
     ]);
 
     const serviceDetails: Details[] = [
@@ -165,6 +170,7 @@ export default function ServiceTable({ data, setData }: ServiceTableProps) {
             setData={setData}
             columns={columns}
             details={serviceDetails}
+            createEndpoint={`/api/service/create?uuid=${uuid}`}
         />
     );
 }

compass/components/Table/Table.tsx

@@ -27,6 +27,7 @@ type TableProps<T extends DataPoint> = {
     setData: Dispatch<SetStateAction<T[]>>;
     columns: ColumnDef<T, any>[];
     details: Details[];
+    createEndpoint: string;
 };
 
 /** Validates that all required fields in a new item have values */
@@ -76,9 +77,22 @@ export default function Table<T extends DataPoint>({
     setData,
     columns,
     details,
+    createEndpoint,
 }: TableProps<T>) {
     const columnHelper = createColumnHelper<T>();
 
+    const createRow = async (newItem: any) => {
+        const response = await fetch(createEndpoint, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify(newItem),
+        });
+
+        return response;
+    };
+
     // /** Sorting function based on visibility */
     // const visibilitySort = (a: T, b: T) =>
     //     a.visible === b.visible ? 0 : a.visible ? -1 : 1;
@@ -224,8 +238,16 @@ export default function Table<T extends DataPoint>({
                                         return false;
                                     }
 
-                                    newItem.visible = true;
+                                    createRow(newItem).then((response) => {
-                                    setData((prev) => [...prev, newItem]);
+                                        if (response.ok) {
+                                            newItem.visible = true;
+                                            setData((prev) => [
+                                                ...prev,
+                                                newItem,
+                                            ]);
+                                        }
+                                    });
+
                                     return true;
                                 }}
                             />

compass/components/Table/UserTable.tsx

@@ -19,6 +19,7 @@ import { Tag } from "../TagsInput/Tag";
 type UserTableProps = {
     data: User[];
     setData: Dispatch<SetStateAction<User[]>>;
+    uuid: string;
 };
 
 /**
@@ -26,19 +27,19 @@ type UserTableProps = {
  * @param props.data Stateful list of users to be displayed by the table
  * @param props.setData State setter for the list of users
  */
-export default function UserTable({ data, setData }: UserTableProps) {
+export default function UserTable({ data, setData, uuid }: UserTableProps) {
     const columnHelper = createColumnHelper<User>();
 
     const [rolePresets, setRolePresets] = useState([
-        "admin",
+        "ADMIN",
-        "volunteer",
+        "VOLUNTEER",
-        "employee",
+        "EMPLOYEE",
     ]);
 
     const [programPresets, setProgramPresets] = useState([
-        "domestic",
+        "DOMESTIC",
-        "community",
+        "COMMUNITY",
-        "economic",
+        "ECONOMIC",
     ]);
 
     const userDetails: Details[] = [
@@ -144,6 +145,7 @@ export default function UserTable({ data, setData }: UserTableProps) {
             setData={setData}
             columns={columns}
             details={userDetails}
+            createEndpoint={`/api/user/create?uuid=${uuid}`}
         />
     );
 }

compass/components/TagsInput/Index.tsx

@@ -23,12 +23,8 @@ const TagsInput: React.FC<TagsInputProps> = ({
     const [cellSelected, setCellSelected] = useState(false);
 
     // TODO: Add tags to the database and remove the presetValue and lowercasing
-    const [tags, setTags] = useState<Set<string>>(
+    const [tags, setTags] = useState<Set<string>>(new Set(presetValue));
-        new Set(presetValue.map((tag) => tag.toLowerCase()))
+    const [options, setOptions] = useState<Set<string>>(new Set(presetOptions));
-    );
-    const [options, setOptions] = useState<Set<string>>(
-        new Set(presetOptions.map((option) => option.toLowerCase()))
-    );
     const [filteredOptions, setFilteredOptions] = useState<Set<string>>(
         new Set(presetOptions)
     );
@@ -44,7 +40,6 @@ const TagsInput: React.FC<TagsInputProps> = ({
     };
 
     const handleOutsideClick = (event: MouseEvent) => {
-        console.log(dropdown.current);
         if (
             dropdown.current &&
             !dropdown.current.contains(event.target as Node)

compass/components/TagsInput/Tag.tsx

@@ -11,6 +11,7 @@ export const Tag = ({ children, handleDelete, active = false }: TagProps) => {
     return (
         <span
             className={`font-normal bg-purple-100 text-gray-800 flex flex-row p-1 px-2 rounded-lg`}
+            style={{ textTransform: "none" }}
         >
             {children}
             {active && handleDelete && (