From 03f2204cb3c4c9f88125ad3df8e6a266d2d56da9 Mon Sep 17 00:00:00 2001 From: Jordweinstein Date: Mon, 25 Mar 2024 19:29:37 -0400 Subject: [PATCH] separated user enum into its own file --- backend/entities/resource_entity.py | 2 +- backend/entities/serivce_entity.py | 2 +- backend/entities/user_entity.py | 13 +++---------- backend/entities/user_enum.py | 9 +++++++++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/backend/entities/resource_entity.py b/backend/entities/resource_entity.py index d5eb75b..da7b4e0 100644 --- a/backend/entities/resource_entity.py +++ b/backend/entities/resource_entity.py @@ -18,7 +18,7 @@ from sqlalchemy import Enum # Import self for to model from typing import Self -from programtype_enum import ProgramType +from backend.entities.program_type_enum import ProgramType class ResourceEntity(EntityBase): diff --git a/backend/entities/serivce_entity.py b/backend/entities/serivce_entity.py index 4616d7d..10325eb 100644 --- a/backend/entities/serivce_entity.py +++ b/backend/entities/serivce_entity.py @@ -17,7 +17,7 @@ import enum from sqlalchemy import Enum # Import ProgramType enumeration -from programtype_enum import ProgramType +from backend.entities.program_type_enum import ProgramType class ResourceEntity(EntityBase): diff --git a/backend/entities/user_entity.py b/backend/entities/user_entity.py index 16c89ab..8347d00 100644 --- a/backend/entities/user_entity.py +++ b/backend/entities/user_entity.py @@ -15,15 +15,8 @@ from datetime import datetime # Import enums for Role and Program import enum from sqlalchemy import Enum -from programtype_enumeration import ProgramType - - -class RoleEnum(enum.Enum): - """Determine role for User""" - - ADMIN = "ADMIN" - EMPLOYEE = "EMPLOYEE" - VOLUNTEER = "VOLUNTEER" +from program_type_enum import ProgramType +from user_enum import RoleType class UserEntity(EntityBase): @@ -38,7 +31,7 @@ class UserEntity(EntityBase): username: Mapped[str] = mapped_column( String(32), nullable=False, default="", unique=True ) - role: Mapped[RoleEnum] = mapped_column(Enum(RoleEnum), nullable=False) + role: Mapped[RoleType] = mapped_column(Enum(RoleType), nullable=False) email: Mapped[str] = mapped_column(String(50), nullable=False, unique=True) program: Mapped[list[ProgramType]] = mapped_column( ARRAY(Enum(ProgramType)), nullable=False diff --git a/backend/entities/user_enum.py b/backend/entities/user_enum.py index e69de29..f89e0b7 100644 --- a/backend/entities/user_enum.py +++ b/backend/entities/user_enum.py @@ -0,0 +1,9 @@ +import enum + + +class RoleType(enum.Enum): + """Determine role for User""" + + ADMIN = "ADMIN" + EMPLOYEE = "EMPLOYEE" + VOLUNTEER = "VOLUNTEER"