From ca8788cc6c48a7b73de1d750d88b6894bc9a4e14 Mon Sep 17 00:00:00 2001
From: Cliff Hill <Clifford.hill@gsa.gov>
Date: Fri, 17 Nov 2023 15:37:38 -0500
Subject: [PATCH] Tweaked where Agreement is at.

Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
---
 app/models.py | 66 ++++++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/app/models.py b/app/models.py
index 1345028e6..46d3d69bf 100644
--- a/app/models.py
+++ b/app/models.py
@@ -361,47 +361,6 @@ class Domain(db.Model):
     )
 
 
-class AgreementType(Enum):
-    MOU = "MOU"
-    IAA = "IAA"
-
-
-class AgreementStatus(Enum):
-    ACTIVE = "active"
-    EXPIRED = "expired"
-
-
-class Agreement(db.Model):
-    __tablename__ = "agreements"
-
-    id = db.Column(
-        UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=False
-    )
-    type = db.Column(
-        db.Enum(AgreementType, name="agreement_types"),
-        index=False,
-        unique=False,
-        nullable=False,
-    )
-    partner_name = db.Column(db.String(255), primary_key=True)
-    status = db.Column(
-        db.Enum(AgreementStatus, name="agreement_statuses"),
-        index=False,
-        unique=False,
-        nullable=False,
-    )
-    start = db.Column(db.DateTime, nullable=False)
-    end = db.Column(db.DateTime, nullable=False)
-    url = db.Column(db.String(2000), nullable=True)
-    budget_amount = db.Column(db.Float, nullable=True)
-    organization_id = db.Column(
-        UUID(as_uuid=True),
-        db.ForeignKey("organization.id"),
-        nullable=True,
-    )
-    organization = db.relationship("Organization", backref="agreements")
-
-
 ORGANIZATION_TYPES = ["federal", "state", "other"]
 
 
@@ -2395,14 +2354,34 @@ class WebauthnCredential(db.Model):
         }
 
 
+class AgreementType(Enum):
+    MOU = "MOU"
+    IAA = "IAA"
+
+
+class AgreementStatus(Enum):
+    ACTIVE = "active"
+    EXPIRED = "expired"
+
+
 class Agreement(db.Model):
     __tablename__ = "agreements"
     id = db.Column(
         UUID(as_uuid=True), primary_key=True, default=uuid.uuid4, unique=False
     )
-    type = db.Column(db.String(3), nullable=False, unique=True, index=True)
+    type = db.Column(
+        db.Enum(AgreementType, name="agreement_types"),
+        index=False,
+        unique=False,
+        nullable=False,
+    )
     partner_name = db.Column(db.String(255), nullable=False, unique=True, index=True)
-    status = db.Column(db.String(255), nullable=False, unique=True, index=True)
+    status = db.Column(
+        db.Enum(AgreementStatus, name="agreement_statuses"),
+        index=False,
+        unique=False,
+        nullable=False,
+    )
     start_time = db.Column(db.DateTime, nullable=True)
     end_time = db.Column(db.DateTime, nullable=True)
     url = db.Column(db.String(255), nullable=False, unique=True, index=True)
@@ -2412,6 +2391,7 @@ class Agreement(db.Model):
         db.ForeignKey("organization.id"),
         nullable=True,
     )
+    organization = db.relationship("Organization", backref="agreements")
 
     def serialize(self):
         return {