Correction enumérations

nupes/models/base.py

@@ -1,5 +1,23 @@
+import enum
+
 from sqlalchemy.orm import DeclarativeBase
 
 
 class Base(DeclarativeBase):
     pass
+
+
+class Genre(enum.Enum):
+    MASCULIN = "M"
+    FEMININ = "F"
+
+
+class Personnalite(enum.Enum):
+    DEFAUT = ""
+    EURODEPUTE = "RPE"
+    DEPUTE = "DEP"
+    SENATEUR = "SEN"
+    MINISTRE = "MIN"
+    PRESIDENT_CONSEIL_REGIONAL = "PCR"
+    PRESIDENT_CONSEIL_DEPARTEMENTAL = "PCD"
+    MAIRE = "MAI"

nupes/models/europeennes2024.py

@@ -6,6 +6,7 @@ from sqlalchemy import Boolean, Date, Enum, ForeignKey, Integer, String
 from sqlalchemy.orm import mapped_column, Mapped, relationship
 
 from nupes.models import Base, Region, Departement, Commune
+from nupes.models.base import Genre, Personnalite
 
 
 class BlocEuropeennes2024(Base):
@@ -59,20 +60,6 @@ class ListeEuropeennes2024(Base):
 
 
 class CandidatEuropeennes2024(Base):
-    class Genre(enum.Enum):
-        MASCULIN = "M"
-        FEMININ = "F"
-
-    class Personnalite(enum.Enum):
-        DEFAUT = ""
-        EURODEPUTE = "RPE"
-        DEPUTE = "DEP"
-        SENATEUR = "SEN"
-        MINISTRE = "MIN"
-        PRESIDENT_CONSEIL_REGIONAL = "PCR"
-        PRESIDENT_CONSEIL_DEPARTEMENTAL = "PCD"
-        MAIRE = "MAI"
-
     __tablename__ = "europeennes_2024_candidat"
 
     id: Mapped[int] = mapped_column(primary_key=True)

nupes/models/legislatives2022.py

@@ -6,6 +6,7 @@ from sqlalchemy import Boolean, Date, Enum, ForeignKey, Integer, String
 from sqlalchemy.orm import mapped_column, Mapped, relationship
 
 from nupes.models import Base, Region, Departement, Commune, Circonscription
+from nupes.models.base import Genre
 
 
 class BlocLegislatives2022(Base):
@@ -46,10 +47,6 @@ class NuanceLegislatives2022(Base):
 
 
 class CandidatLegislatives2022(Base):
-    class Genre(enum.Enum):
-        MASCULIN = "M"
-        FEMININ = "F"
-
     __tablename__ = "legislatives_2022_candidat"
 
     id: Mapped[int] = mapped_column(primary_key=True)

nupes/models/legislatives2024.py

@@ -5,7 +5,7 @@ from typing import List
 from sqlalchemy import Boolean, Date, Enum, ForeignKey, Integer, String
 from sqlalchemy.orm import mapped_column, Mapped, relationship
 
-from nupes.models import Base, Region, Departement, Commune, Circonscription
+from nupes.models import Base, Region, Departement, Commune, Circonscription, Genre
 
 
 class BlocLegislatives2024(Base):
@@ -46,10 +46,6 @@ class NuanceLegislatives2024(Base):
 
 
 class CandidatLegislatives2024(Base):
-    class Genre(enum.Enum):
-        MASCULIN = "M"
-        FEMININ = "F"
-
     __tablename__ = "legislatives_2024_candidat"
 
     id: Mapped[int] = mapped_column(primary_key=True)