Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DEV-11821: sam subaward tables #2701

Merged
merged 7 commits into from
Feb 4, 2025
Merged

DEV-11821: sam subaward tables #2701

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
492c720
Create SAM subaward tables
alburde1 Jan 10, 2025
f5db22e
Updating models/migrations based on discussions
alburde1 Jan 14, 2025
e2dedf1
Merge branch 'qat' into mod/dev-11821-sam-subaward-tables
alburde1 Jan 14, 2025
23dea1d
Fixing migrations/table
alburde1 Jan 15, 2025
32f0251
Remove program_title for sub tier agencies in SAM
alburde1 Feb 4, 2025
277cb55
Merge branch 'qat' into mod/dev-11821-sam-subaward-tables
alburde1 Feb 4, 2025
213b08e
Removing naics from subaward tables
alburde1 Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 152 additions & 0 deletions dataactcore/migrations/versions/8effcd11f19c_create_sam_subcontract_and_sam_subgrant_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
"""Create sam_subcontract and sam_subgrant tables

Revision ID: 8effcd11f19c
Revises: 2eebdba5bed7
Create Date: 2025-01-14 18:53:28.837319

"""

# revision identifiers, used by Alembic.
revision = '8effcd11f19c'
down_revision = '2eebdba5bed7'
branch_labels = None
depends_on = None

from alembic import op
import sqlalchemy as sa


def upgrade(engine_name):
globals()["upgrade_%s" % engine_name]()


def downgrade(engine_name):
globals()["downgrade_%s" % engine_name]()





def upgrade_data_broker():
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('sam_subcontract',
sa.Column('created_at', sa.DateTime(), nullable=True),
sa.Column('updated_at', sa.DateTime(), nullable=True),
sa.Column('sam_subcontract_id', sa.Integer(), nullable=False),
sa.Column('subaward_report_id', sa.Integer(), nullable=True),
sa.Column('subaward_report_number', sa.Text(), nullable=True),
sa.Column('unique_award_key', sa.Text(), nullable=True),
sa.Column('date_submitted', sa.Date(), nullable=True),
sa.Column('program_title', sa.Text(), nullable=True),
sa.Column('contract_agency_code', sa.Text(), nullable=True),
sa.Column('contract_idv_agency_code', sa.Text(), nullable=True),
sa.Column('award_number', sa.Text(), nullable=True),
sa.Column('award_amount', sa.Text(), nullable=True),
sa.Column('action_date', sa.Date(), nullable=True),
sa.Column('uei', sa.Text(), nullable=True),
sa.Column('legal_business_name', sa.Text(), nullable=True),
sa.Column('parent_uei', sa.Text(), nullable=True),
sa.Column('parent_legal_business_name', sa.Text(), nullable=True),
sa.Column('dba_name', sa.Text(), nullable=True),
sa.Column('legal_entity_country_code', sa.Text(), nullable=True),
sa.Column('legal_entity_country_name', sa.Text(), nullable=True),
sa.Column('legal_entity_state_code', sa.Text(), nullable=True),
sa.Column('legal_entity_state_name', sa.Text(), nullable=True),
sa.Column('legal_entity_address_line1', sa.Text(), nullable=True),
sa.Column('legal_entity_address_line2', sa.Text(), nullable=True),
sa.Column('legal_entity_city_name', sa.Text(), nullable=True),
sa.Column('legal_entity_zip_code', sa.Text(), nullable=True),
sa.Column('legal_entity_congressional', sa.Text(), nullable=True),
sa.Column('ppop_country_code', sa.Text(), nullable=True),
sa.Column('ppop_country_name', sa.Text(), nullable=True),
sa.Column('ppop_state_code', sa.Text(), nullable=True),
sa.Column('ppop_state_name', sa.Text(), nullable=True),
sa.Column('ppop_address_line1', sa.Text(), nullable=True),
sa.Column('ppop_city_name', sa.Text(), nullable=True),
sa.Column('ppop_zip_code', sa.Text(), nullable=True),
sa.Column('ppop_congressional_district', sa.Text(), nullable=True),
sa.Column('business_types_codes', sa.ARRAY(sa.Text()), nullable=True),
sa.Column('business_types_names', sa.ARRAY(sa.Text()), nullable=True),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('naics', sa.Text(), nullable=True),
sa.Column('high_comp_officer1_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer1_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer2_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer2_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer3_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer3_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer4_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer4_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer5_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer5_amount', sa.Text(), nullable=True),
sa.PrimaryKeyConstraint('sam_subcontract_id')
)
op.create_index(op.f('ix_sam_subcontract_subaward_report_id'), 'sam_subcontract', ['subaward_report_id'], unique=False)
op.create_index(op.f('ix_sam_subcontract_subaward_report_number'), 'sam_subcontract', ['subaward_report_number'], unique=False)
op.create_index(op.f('ix_sam_subcontract_unique_award_key'), 'sam_subcontract', ['unique_award_key'], unique=False)
op.create_table('sam_subgrant',
sa.Column('created_at', sa.DateTime(), nullable=True),
sa.Column('updated_at', sa.DateTime(), nullable=True),
sa.Column('sam_subgrant_id', sa.Integer(), nullable=False),
sa.Column('subaward_report_id', sa.Integer(), nullable=True),
sa.Column('subaward_report_number', sa.Text(), nullable=True),
sa.Column('unique_award_key', sa.Text(), nullable=True),
sa.Column('date_submitted', sa.Date(), nullable=True),
sa.Column('award_number', sa.Text(), nullable=True),
sa.Column('award_amount', sa.Text(), nullable=True),
sa.Column('action_date', sa.Date(), nullable=True),
sa.Column('uei', sa.Text(), nullable=True),
sa.Column('legal_business_name', sa.Text(), nullable=True),
sa.Column('parent_uei', sa.Text(), nullable=True),
sa.Column('parent_legal_business_name', sa.Text(), nullable=True),
sa.Column('dba_name', sa.Text(), nullable=True),
sa.Column('legal_entity_country_code', sa.Text(), nullable=True),
sa.Column('legal_entity_country_name', sa.Text(), nullable=True),
sa.Column('legal_entity_state_code', sa.Text(), nullable=True),
sa.Column('legal_entity_state_name', sa.Text(), nullable=True),
sa.Column('legal_entity_address_line1', sa.Text(), nullable=True),
sa.Column('legal_entity_address_line2', sa.Text(), nullable=True),
sa.Column('legal_entity_city_name', sa.Text(), nullable=True),
sa.Column('legal_entity_zip_code', sa.Text(), nullable=True),
sa.Column('legal_entity_congressional', sa.Text(), nullable=True),
sa.Column('ppop_country_code', sa.Text(), nullable=True),
sa.Column('ppop_country_name', sa.Text(), nullable=True),
sa.Column('ppop_state_code', sa.Text(), nullable=True),
sa.Column('ppop_state_name', sa.Text(), nullable=True),
sa.Column('ppop_address_line1', sa.Text(), nullable=True),
sa.Column('ppop_city_name', sa.Text(), nullable=True),
sa.Column('ppop_zip_code', sa.Text(), nullable=True),
sa.Column('ppop_congressional_district', sa.Text(), nullable=True),
sa.Column('business_types_codes', sa.ARRAY(sa.Text()), nullable=True),
sa.Column('business_types_names', sa.ARRAY(sa.Text()), nullable=True),
sa.Column('description', sa.Text(), nullable=True),
sa.Column('high_comp_officer1_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer1_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer2_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer2_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer3_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer3_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer4_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer4_amount', sa.Text(), nullable=True),
sa.Column('high_comp_officer5_full_na', sa.Text(), nullable=True),
sa.Column('high_comp_officer5_amount', sa.Text(), nullable=True),
sa.PrimaryKeyConstraint('sam_subgrant_id')
)
op.create_index(op.f('ix_sam_subgrant_subaward_report_id'), 'sam_subgrant', ['subaward_report_id'], unique=False)
op.create_index(op.f('ix_sam_subgrant_subaward_report_number'), 'sam_subgrant', ['subaward_report_number'], unique=False)
op.create_index(op.f('ix_sam_subgrant_unique_award_key'), 'sam_subgrant', ['unique_award_key'], unique=False)
# ### end Alembic commands ###


def downgrade_data_broker():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_index(op.f('ix_sam_subgrant_unique_award_key'), table_name='sam_subgrant')
op.drop_index(op.f('ix_sam_subgrant_subaward_report_number'), table_name='sam_subgrant')
op.drop_index(op.f('ix_sam_subgrant_subaward_report_id'), table_name='sam_subgrant')
op.drop_table('sam_subgrant')
op.drop_index(op.f('ix_sam_subcontract_unique_award_key'), table_name='sam_subcontract')
op.drop_index(op.f('ix_sam_subcontract_subaward_report_number'), table_name='sam_subcontract')
op.drop_index(op.f('ix_sam_subcontract_subaward_report_id'), table_name='sam_subcontract')
op.drop_table('sam_subcontract')
# ### end Alembic commands ###

103 changes: 102 additions & 1 deletion dataactcore/models/fsrs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from sqlalchemy import Boolean, Column, Date, DateTime, ForeignKey, func, Integer, BigInteger, String, Text, Index
from sqlalchemy import (Boolean, Column, Date, DateTime, ForeignKey, func, Integer, BigInteger, String, Text, Index,
ARRAY)
from sqlalchemy.orm import relationship

from dataactcore.models.baseModel import Base
Expand Down Expand Up @@ -160,6 +161,106 @@ class FSRSSubgrant(Base, _GrantAttributes):
Index("ix_fsrs_sproc_prin_add_country_upp", func.upper(FSRSSubcontract.principle_place_country))


class SAMSubcontract(Base):
""" Model for SAM subcontract data """
__tablename__ = 'sam_subcontract'
sam_subcontract_id = Column(Integer, primary_key=True)
subaward_report_id = Column(Integer, index=True)
subaward_report_number = Column(Text, index=True)
unique_award_key = Column(Text, index=True)
date_submitted = Column(Date)
program_title = Column(Text)
contract_agency_code = Column(Text)
contract_idv_agency_code = Column(Text)
award_number = Column(Text)
award_amount = Column(Text)
action_date = Column(Date)
uei = Column(Text)
legal_business_name = Column(Text)
parent_uei = Column(Text)
parent_legal_business_name = Column(Text)
dba_name = Column(Text)
legal_entity_country_code = Column(Text)
legal_entity_country_name = Column(Text)
legal_entity_state_code = Column(Text)
legal_entity_state_name = Column(Text)
legal_entity_address_line1 = Column(Text)
legal_entity_address_line2 = Column(Text)
legal_entity_city_name = Column(Text)
legal_entity_zip_code = Column(Text)
legal_entity_congressional = Column(Text)
ppop_country_code = Column(Text)
ppop_country_name = Column(Text)
ppop_state_code = Column(Text)
ppop_state_name = Column(Text)
ppop_address_line1 = Column(Text)
ppop_city_name = Column(Text)
ppop_zip_code = Column(Text)
ppop_congressional_district = Column(Text)
business_type_codes = Column(ARRAY(Text))
business_type_names = Column(ARRAY(Text))
description = Column(Text)
naics = Column(Text)
high_comp_officer1_full_na = Column(Text)
high_comp_officer1_amount = Column(Text)
high_comp_officer2_full_na = Column(Text)
high_comp_officer2_amount = Column(Text)
high_comp_officer3_full_na = Column(Text)
high_comp_officer3_amount = Column(Text)
high_comp_officer4_full_na = Column(Text)
high_comp_officer4_amount = Column(Text)
high_comp_officer5_full_na = Column(Text)
high_comp_officer5_amount = Column(Text)


class SAMSubgrant(Base):
""" Model for SAM subgrant data """
__tablename__ = 'sam_subgrant'
sam_subgrant_id = Column(Integer, primary_key=True)
subaward_report_id = Column(Integer, index=True)
subaward_report_number = Column(Text, index=True)
unique_award_key = Column(Text, index=True)
date_submitted = Column(Date)
award_number = Column(Text)
award_amount = Column(Text)
action_date = Column(Date)
uei = Column(Text)
legal_business_name = Column(Text)
parent_uei = Column(Text)
parent_legal_business_name = Column(Text)
dba_name = Column(Text)
legal_entity_country_code = Column(Text)
legal_entity_country_name = Column(Text)
legal_entity_state_code = Column(Text)
legal_entity_state_name = Column(Text)
legal_entity_address_line1 = Column(Text)
legal_entity_address_line2 = Column(Text)
legal_entity_city_name = Column(Text)
legal_entity_zip_code = Column(Text)
legal_entity_congressional = Column(Text)
ppop_country_code = Column(Text)
ppop_country_name = Column(Text)
ppop_state_code = Column(Text)
ppop_state_name = Column(Text)
ppop_address_line1 = Column(Text)
ppop_city_name = Column(Text)
ppop_zip_code = Column(Text)
ppop_congressional_district = Column(Text)
business_type_codes = Column(ARRAY(Text))
business_type_names = Column(ARRAY(Text))
description = Column(Text)
high_comp_officer1_full_na = Column(Text)
high_comp_officer1_amount = Column(Text)
high_comp_officer2_full_na = Column(Text)
high_comp_officer2_amount = Column(Text)
high_comp_officer3_full_na = Column(Text)
high_comp_officer3_amount = Column(Text)
high_comp_officer4_full_na = Column(Text)
high_comp_officer4_amount = Column(Text)
high_comp_officer5_full_na = Column(Text)
high_comp_officer5_amount = Column(Text)


class Subaward(Base):
""" Model for all subaward data """
__tablename__ = "subaward"
Expand Down