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

Jump to bottom

[Issue #1744] Setup staging tables for Oracle data load #1840

Merged
merged 10 commits into from
Apr 25, 2024
Merged

[Issue #1744] Setup staging tables for Oracle data load #1840

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ddb7a27
[Issue #1744] Setup staging tables for Oracle data load
chouinar Apr 25, 2024
52a2ee3
Merge branch 'main' into chouinar/1744-setup-staging-tables
chouinar Apr 25, 2024
c39682f
Some updates to structure
chouinar Apr 25, 2024
7ada67b
Cleanup
chouinar Apr 25, 2024
446bf19
Fixing factories
chouinar Apr 25, 2024
7054372
test fix
chouinar Apr 25, 2024
1f8a90e
Update database ERD diagrams
nava-platform-bot Apr 25, 2024
6677fed
Update ERD command
chouinar Apr 25, 2024
8496940
Update database ERD diagrams
nava-platform-bot Apr 25, 2024
31df3f5
Adjust imports/naming
chouinar Apr 25, 2024
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
150 changes: 13 additions & 137 deletions api/src/db/foreign/forecast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,164 +5,40 @@
# match by oracle_fdw, but we are matching them for maintainability.
#

import datetime

from sqlalchemy.orm import Mapped, mapped_column
import src.db.legacy_mixins.forecast_mixin as forecast_mixin
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can shorten to:

Suggested change
import src.db.legacy_mixins.forecast_mixin as forecast_mixin
from src.db.legacy_mixins import forecast_mixin


from . import foreignbase


class Tforecast(foreignbase.ForeignBase):
class Tforecast(foreignbase.ForeignBase, forecast_mixin.TforecastMixin):
__tablename__ = "tforecast"

opportunity_id: Mapped[int] = mapped_column(primary_key=True)
version_nbr: Mapped[int]
posting_date: Mapped[datetime.datetime | None]
archive_date: Mapped[datetime.datetime | None]
forecast_desc: Mapped[str | None]
oth_cat_fa_desc: Mapped[str | None]
cost_sharing: Mapped[str | None]
number_of_awards: Mapped[str | None]
est_funding: Mapped[str | None]
award_ceiling: Mapped[str | None]
award_floor: Mapped[str | None]
fd_link_url: Mapped[str | None]
fd_link_desc: Mapped[str | None]
ac_name: Mapped[str | None]
ac_phone: Mapped[str | None]
ac_email_addr: Mapped[str | None]
ac_email_desc: Mapped[str | None]
agency_code: Mapped[str | None]
sendmail: Mapped[str | None]
applicant_elig_desc: Mapped[str | None]
est_synopsis_posting_date: Mapped[datetime.datetime | None]
est_appl_response_date: Mapped[datetime.datetime | None]
est_appl_response_date_desc: Mapped[str | None]
est_award_date: Mapped[datetime.datetime | None]
est_project_start_date: Mapped[datetime.datetime | None]
fiscal_year: Mapped[int | None]
modification_comments: Mapped[str | None]
create_ts: Mapped[datetime.datetime]
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]
publisheruid: Mapped[str | None]
publisher_profile_id: Mapped[int | None]


class TforecastHist(foreignbase.ForeignBase):

class TforecastHist(foreignbase.ForeignBase, forecast_mixin.TforecastHistMixin):
__tablename__ = "tforecast_hist"

opportunity_id: Mapped[int] = mapped_column(primary_key=True)
revision_number: Mapped[int] = mapped_column(primary_key=True)
version_nbr: Mapped[int]
posting_date: Mapped[datetime.datetime | None]
archive_date: Mapped[datetime.datetime | None]
forecast_desc: Mapped[str | None]
oth_cat_fa_desc: Mapped[str | None]
cost_sharing: Mapped[str | None]
number_of_awards: Mapped[str | None]
est_funding: Mapped[str | None]
award_ceiling: Mapped[str | None]
award_floor: Mapped[str | None]
fd_link_url: Mapped[str | None]
fd_link_desc: Mapped[str | None]
ac_name: Mapped[str | None]
ac_phone: Mapped[str | None]
ac_email_addr: Mapped[str | None]
ac_email_desc: Mapped[str | None]
agency_code: Mapped[str | None]
sendmail: Mapped[str | None]
applicant_elig_desc: Mapped[str | None]
est_synopsis_posting_date: Mapped[datetime.datetime | None]
est_appl_response_date: Mapped[datetime.datetime | None]
est_appl_response_date_desc: Mapped[str | None]
est_award_date: Mapped[datetime.datetime | None]
est_project_start_date: Mapped[datetime.datetime | None]
fiscal_year: Mapped[int | None]
modification_comments: Mapped[str | None]
action_type: Mapped[str | None]
action_date: Mapped[datetime.datetime | None]
create_ts: Mapped[datetime.datetime]
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]
publisheruid: Mapped[str | None]
publisher_profile_id: Mapped[int | None]


class TapplicanttypesForecast(foreignbase.ForeignBase):
__tablename__ = "tapplicanttypes_forecast"

at_frcst_id: Mapped[int] = mapped_column(primary_key=True)
at_id: Mapped[str] = mapped_column(primary_key=True)
opportunity_id: Mapped[int] = mapped_column(primary_key=True)
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]
class TapplicanttypesForecast(foreignbase.ForeignBase, forecast_mixin.TapplicanttypesForecastMixin):
__tablename__ = "tapplicanttypes_forecast"


class TapplicanttypesForecastHist(foreignbase.ForeignBase):
class TapplicanttypesForecastHist(
foreignbase.ForeignBase, forecast_mixin.TapplicanttypesForecastHistMixin
):
__tablename__ = "tapplicanttypes_forecast_hist"

at_frcst_id: Mapped[int] = mapped_column(primary_key=True)
at_id: Mapped[str] = mapped_column(primary_key=True)
opportunity_id: Mapped[int] = mapped_column(primary_key=True)
revision_number: Mapped[int] = mapped_column(primary_key=True)
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]


class TfundactcatForecast(foreignbase.ForeignBase):
class TfundactcatForecast(foreignbase.ForeignBase, forecast_mixin.TfundactcatForecastMixin):
__tablename__ = "tfundactcat_forecast"

fac_frcst_id: Mapped[int] = mapped_column(primary_key=True)
fac_id: Mapped[str] = mapped_column(primary_key=True)
opportunity_id: Mapped[int] = mapped_column(primary_key=True)
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]


class TfundactcatForecastHist(foreignbase.ForeignBase):
class TfundactcatForecastHist(foreignbase.ForeignBase, forecast_mixin.TfundactcatForecastHistMixin):
__tablename__ = "tfundactcat_forecast_hist"

fac_frcst_id: Mapped[int] = mapped_column(primary_key=True)
fac_id: Mapped[str] = mapped_column(primary_key=True)
opportunity_id: Mapped[int] = mapped_column(primary_key=True)
revision_number: Mapped[int] = mapped_column(primary_key=True)
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]


class TfundinstrForecast(foreignbase.ForeignBase):
class TfundinstrForecast(foreignbase.ForeignBase, forecast_mixin.TfundinstrForecastMixin):
__tablename__ = "tfundinstr_forecast"

fi_frcst_id: Mapped[int] = mapped_column(primary_key=True)
fi_id: Mapped[str] = mapped_column(primary_key=True)
opportunity_id: Mapped[int] = mapped_column(primary_key=True)
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]


class TfundinstrForecastHist(foreignbase.ForeignBase):
class TfundinstrForecastHist(foreignbase.ForeignBase, forecast_mixin.TfundinstrForecastHistMixin):
__tablename__ = "tfundinstr_forecast_hist"

fi_frcst_id: Mapped[int] = mapped_column(primary_key=True)
fi_id: Mapped[str] = mapped_column(primary_key=True)
opportunity_id: Mapped[int] = mapped_column(primary_key=True)
revision_number: Mapped[int] = mapped_column(primary_key=True)
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]
39 changes: 3 additions & 36 deletions api/src/db/foreign/opportunity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,14 @@
# match by oracle_fdw, but we are matching them for maintainability.
#

import datetime

from sqlalchemy.orm import Mapped, mapped_column
import src.db.legacy_mixins.opportunity_mixin as opportunity_mixin
chouinar marked this conversation as resolved.
Show resolved Hide resolved

from . import foreignbase


class Topportunity(foreignbase.ForeignBase):
class Topportunity(foreignbase.ForeignBase, opportunity_mixin.TopportunityMixin):
__tablename__ = "topportunity"

opportunity_id: Mapped[int] = mapped_column(primary_key=True)
oppnumber: Mapped[str | None]
revision_number: Mapped[int | None]
opptitle: Mapped[str | None]
owningagency: Mapped[str | None]
publisheruid: Mapped[str | None]
listed: Mapped[str | None]
oppcategory: Mapped[str | None]
initial_opportunity_id: Mapped[int | None]
modified_comments: Mapped[str | None]
created_date: Mapped[datetime.datetime]
last_upd_date: Mapped[datetime.datetime]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]
flag_2006: Mapped[str | None]
category_explanation: Mapped[str | None]
publisher_profile_id: Mapped[int | None]
is_draft: Mapped[str | None]


class TopportunityCfda(foreignbase.ForeignBase):
class TopportunityCfda(foreignbase.ForeignBase, opportunity_mixin.TopportunityCfdaMixin):
__tablename__ = "topportunity_cfda"

opp_cfda_id: Mapped[int] = mapped_column(primary_key=True)
opportunity_id: Mapped[int]
cfdanumber: Mapped[str | None]
programtitle: Mapped[str | None]
origtoppid: Mapped[int | None]
oppidcfdanum: Mapped[str | None]
origoppnum: Mapped[str | None]
created_date: Mapped[datetime.datetime | None]
last_upd_date: Mapped[datetime.datetime | None]
creator_id: Mapped[str | None]
last_upd_id: Mapped[str | None]
Loading
Loading