Merge pull request #44 from jadmsaadaot/SUBMIT-task#29-C

Add ea certificate to Project model
bcgov · Aug 26, 2024 · d749b34 · d749b34
2 parents 9574df4 + 7794757
commit d749b34
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 9 deletions.
diff --git a/submit-api/migrations/versions/0eabfcf062e3_.py b/submit-api/migrations/versions/0eabfcf062e3_.py
@@ -5,10 +5,11 @@
 Create Date: 2024-08-22 12:20:35.863982
 
 """
-from alembic import op
-import sqlalchemy as sa
 from datetime import datetime
 
+import sqlalchemy as sa
+from alembic import op
+
 
 # revision identifiers, used by Alembic.
 revision = '0eabfcf062e3'

diff --git a/submit-api/migrations/versions/41e672288201_.py b/submit-api/migrations/versions/41e672288201_.py
@@ -0,0 +1,32 @@
+"""Add EA certificate column
+
+Revision ID: 41e672288201
+Revises: 646de6f8c38b
+Create Date: 2024-08-23 16:01:10.236907
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '41e672288201'
+down_revision = '646de6f8c38b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('projects', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('ea_certificate', sa.String(length=255), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('projects', schema=None) as batch_op:
+        batch_op.drop_column('ea_certificate')
+
+    # ### end Alembic commands ###
diff --git a/submit-api/migrations/versions/646de6f8c38b_.py b/submit-api/migrations/versions/646de6f8c38b_.py
@@ -5,10 +5,11 @@
 Create Date: 2024-08-23 11:32:52.949718
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy.dialects import postgresql
 
+
 # revision identifiers, used by Alembic.
 revision = '646de6f8c38b'
 down_revision = '0eabfcf062e3'

diff --git a/submit-api/migrations/versions/b573a1a7347f_.py b/submit-api/migrations/versions/b573a1a7347f_.py
@@ -5,8 +5,8 @@
 Create Date: 2024-08-22 12:13:06.001628
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 # revision identifiers, used by Alembic.

diff --git a/submit-api/migrations/versions/b79603b76ea0_.py b/submit-api/migrations/versions/b79603b76ea0_.py
@@ -5,8 +5,8 @@
 Create Date: 2024-08-20 15:17:44.896108
 
 """
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 
 
 # revision identifiers, used by Alembic.

diff --git a/submit-api/src/submit_api/models/item.py b/submit-api/src/submit_api/models/item.py
@@ -6,7 +6,7 @@
 
 import enum
 
-from sqlalchemy import Column, ForeignKey, Enum
+from sqlalchemy import Column, Enum, ForeignKey
 
 from .base_model import BaseModel
 from .db import db

diff --git a/submit-api/src/submit_api/models/package.py b/submit-api/src/submit_api/models/package.py
@@ -6,7 +6,7 @@
 
 import enum
 
-from sqlalchemy import Column, ForeignKey, Enum
+from sqlalchemy import Column, Enum, ForeignKey
 
 from .base_model import BaseModel
 from .db import db

diff --git a/submit-api/src/submit_api/models/project.py b/submit-api/src/submit_api/models/project.py
@@ -21,6 +21,7 @@ class Project(db.Model):
     name = Column(db.String(), nullable=False)
     proponent_id = Column(db.Integer(), nullable=False, unique=True)
     proponent_name = Column(db.String(), nullable=False)
+    ea_certificate = Column(db.String(255), nullable=True, default=None)
 
     def __init__(self, **kwargs):
         """Initialize the Project entity."""

diff --git a/submit-api/src/submit_api/schemas/project.py b/submit-api/src/submit_api/schemas/project.py
@@ -21,6 +21,7 @@ class Meta:  # pylint: disable=too-few-public-methods
     name = fields.Str(data_key="name")
     proponent_id = fields.Int(data_key="proponent_id")
     proponent_name = fields.Str(data_key="proponent_name")
+    ea_certificate = fields.Str(data_key="ea_certificate")
 
 
 class AddProjectSchema(Schema):

diff --git a/submit-web/src/components/Projects/Project.tsx b/submit-web/src/components/Projects/Project.tsx
@@ -30,6 +30,8 @@ export const Project = ({ accountProject }: ProjectParam) => {
     (subPackage) => subPackage.status !== PACKAGE_STATUS.IN_REVIEW.value,
   );
 
+  const { name, ea_certificate } = accountProject.project;
+
   return (
     <Paper
       sx={{
@@ -55,7 +57,7 @@ export const Project = ({ accountProject }: ProjectParam) => {
           px={2}
           color={BCDesignTokens.typographyColorPrimary}
         >
-          {accountProject.project.name}
+          {name}
         </Typography>
         <Typography
           variant="h4"
@@ -65,7 +67,7 @@ export const Project = ({ accountProject }: ProjectParam) => {
             fontWeight: 400,
           }}
         >
-          EAC #1234567
+          {ea_certificate ? `EAC #${ea_certificate}` : ""}
         </Typography>
       </Box>