Guidance table update (canada-ca#854)

* Update guidance table

* Revised version file

Author: Ethanljf

scripts/insert_csv.py

@@ -210,19 +210,22 @@
     "guidance",
     metadata,
     sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
+    sqlalchemy.Column("tag_id", sqlalchemy.String),
     sqlalchemy.Column("tag_name", sqlalchemy.String),
     sqlalchemy.Column("guidance", sqlalchemy.String),
-    sqlalchemy.Column("ref_links", sqlalchemy.String),
+    sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
 )
 
-Classification = sqlalchemy.Table(
-    "classification",
+Summaries = sqlalchemy.Table(
+    "summaries",
     metadata,
     sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
-    sqlalchemy.Column("UNCLASSIFIED", sqlalchemy.String),
+    sqlalchemy.Column("name", sqlalchemy.String),
+    sqlalchemy.Column("count", sqlalchemy.Integer),
+    sqlalchemy.Column("percentage", sqlalchemy.Float),
+    sqlalchemy.Column("type", sqlalchemy.String),
 )
 
-
 async def insert():
 
     # Establish DB connection

services/auto-scan/autoscan.py

@@ -214,9 +214,20 @@
     "guidance",
     metadata,
     sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
+    sqlalchemy.Column("tag_id", sqlalchemy.String),
     sqlalchemy.Column("tag_name", sqlalchemy.String),
     sqlalchemy.Column("guidance", sqlalchemy.String),
-    sqlalchemy.Column("ref_links", sqlalchemy.String),
+    sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
+)
+
+Summaries = sqlalchemy.Table(
+    "summaries",
+    metadata,
+    sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
+    sqlalchemy.Column("name", sqlalchemy.String),
+    sqlalchemy.Column("count", sqlalchemy.Integer),
+    sqlalchemy.Column("percentage", sqlalchemy.Float),
+    sqlalchemy.Column("type", sqlalchemy.String),
 )
 
 

services/db-migration/migrations/versions/dc6adc4d8944_update_guidance_table.py

@@ -0,0 +1,35 @@
+"""Update guidance table
+
+Revision ID: dc6adc4d8944
+Revises: 5f8c3a21331b
+Create Date: 2020-09-24 12:04:03.960057
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import ARRAY
+
+
+# revision identifiers, used by Alembic.
+revision = 'dc6adc4d8944'
+down_revision = '5f8c3a21331b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_table("classification")
+    op.add_column(
+        "guidance", sa.Column("tag_id", sa.String()),
+    )
+    op.alter_column("guidance", "ref_links", type_=ARRAY(sa.String()), postgresql_using='ref_links::character varying[]')
+
+
+def downgrade():
+    op.create_table(
+        "classification",
+        sa.Column("id", sa.Integer(), primary_key=True),
+        sa.Column("UNCLASSIFIED", sa.String()),
+    )
+    op.drop_column("guidance", "tag_id")
+    op.alter_column("guidance", "ref_links", type_=sa.String())

services/db-migration/models/__init__.py

@@ -181,16 +181,10 @@
     "guidance",
     metadata,
     sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
+    sqlalchemy.Column("tag_id", sqlalchemy.String),
     sqlalchemy.Column("tag_name", sqlalchemy.String),
     sqlalchemy.Column("guidance", sqlalchemy.String),
-    sqlalchemy.Column("ref_links", sqlalchemy.String),
-)
-
-Classification = sqlalchemy.Table(
-    "classification",
-    metadata,
-    sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
-    sqlalchemy.Column("UNCLASSIFIED", sqlalchemy.String),
+    sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
 )
 
 Summaries = sqlalchemy.Table(

services/scanners/results/result_processor.py

@@ -226,9 +226,20 @@
     "guidance",
     metadata,
     sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
+    sqlalchemy.Column("tag_id", sqlalchemy.String),
     sqlalchemy.Column("tag_name", sqlalchemy.String),
     sqlalchemy.Column("guidance", sqlalchemy.String),
-    sqlalchemy.Column("ref_links", sqlalchemy.String),
+    sqlalchemy.Column("ref_links", ARRAY(sqlalchemy.String)),
+)
+
+Summaries = sqlalchemy.Table(
+    "summaries",
+    metadata,
+    sqlalchemy.Column("id", sqlalchemy.Integer, primary_key=True),
+    sqlalchemy.Column("name", sqlalchemy.String),
+    sqlalchemy.Column("count", sqlalchemy.Integer),
+    sqlalchemy.Column("percentage", sqlalchemy.Float),
+    sqlalchemy.Column("type", sqlalchemy.String),
 )
 
 logging.basicConfig(stream=sys.stdout, level=logging.INFO)