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.

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

24849 firm nrs added to names core only #1632

Merged
merged 2 commits into from
Dec 23, 2024

Conversation

EPortman
Copy link
Collaborator

@EPortman EPortman commented Dec 12, 2024

Issue #, if available: https://app.zenhub.com/workspaces/names-team-board-new-655554cbddd49510027dad2e/issues/gh/bcgov/entity/24849

Description of changes:

  1. Revert recent changes to /search endpoint
  2. Added firms to the Names Core in the Solr Updater Job. Before NRO decom something else was doing this. Now it is in the same place where names are added to the possible conflicts core.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the namex license (Apache 2.0).

@EPortman EPortman force-pushed the 24849_add_firms_to_solr_names_core branch from fce04f1 to 828c780 Compare December 17, 2024 20:21
Copy link

@EPortman
Copy link
Collaborator Author

Since Firms are now being added to the Names Core, like they were before NRO decommissioning, the changes to the /search endpoint to query the Names database has been reverted back to what it was. The file api/namex/resources/requests.py now looks exactly what it looked like before the first PR on this issue: #1629

The link to query the Names Core in Solr Prod is here: https://namex-solr-test.apps.silver.devops.gov.bc.ca/solr/#/names/query
In Prod, all Approved NRs for Firms are in the Solr Names Core (example):

image
image

Also in Prod, all Consumed and Expired NRs for Firms are in the Solr Names Core (different from non firms)
image
image

The only time NRs for Firms are taken out of the Names Core is when they are cancelled or reset.

This PR does 2 things

  1. Reverts the changes of changing how the /search endpoint works to get around the issue of firms not being in the Names Core.
  2. Inserts Firms into the Names Core when they are approved or conditionally approved. And then takes them out when they are cancelled or reset. This allows the /search endpoint to be able to search for firms.

@EPortman EPortman marked this pull request as ready for review December 18, 2024 15:51
@EPortman EPortman merged commit ee6b337 into bcgov:main Dec 23, 2024
6 of 10 checks passed
@EPortman EPortman deleted the 24849_add_firms_to_solr_names_core branch December 23, 2024 16:49
EPortman added a commit that referenced this pull request Jan 21, 2025
* 24511 solr documentation (#1628)

Signed-off-by: Shaanjot Gill <gill.shaanjots@gmail.com>

* 24849 search endpoint directly queries names db (#1629)

* 24849 change request search back to being a search (#1630)

* 24849 search works with name as well (#1631)

* 24774 Bad Name Notifier (#1633)

* create the job

* create the job

* revert invalid changes

* update codkerfile

* update according to sonarqube check

* update

* update dockerfile

* update dockerfile

* fix sonar errors

* bug fix

---------

Co-authored-by: eve-git <root@PF524S4L.idir.BCGOV>
Co-authored-by: bolyachevets <andriy.bolyachevets@gov.bc.ca>

* add logging (#1636)

* 24774 Create bad-name-notifier workflow (#1637)

* Create bad-name-notifier.yml

* Rename bad-name-notifier.yml to bad-name-notifier-cd.yml

* Create bad-name-notifier-CI.yml (#1638)

* 24849 firm nrs added to names core only (#1632)

* feat: firm nrs added to names core only

* revert: changes to /search endpoint

* 24225 update emails for new ia with magic link (#1634) (#1639)

* 24225 update emails for new ia with magic link

* fix lint issue

* update env, template

* fix bug

* update the email and output templates

* udpate comment

* update small template

* 24223 update get_instruction_group for CHG and CNV

Co-authored-by: Kevin Zhang <54437031+kzdev420@users.noreply.github.com>

* cd: update cd name (#1640)

* Change cd name (#1641)

* cd: update cd name

* update clouddeploy name

* cd: update clouddeploy (#1642)

* fix service account names (#1643)

* 24225 debug emaler (#1644)

* 24225_update_magic_link_with_debug (#1645)

* Update emailer-cd-gcp.yml

* 24225_update_version_namex_api (#1646)

* 24225_udpate_instruction_group_method (#1647)

* 24225 update env variables (#1648)

* 24225_update_debug_code (#1649)

* 25012_update_email_outputs_debug (#1652)

* create bad-designation-notifier (#1651)

* create bad-designation-notifier

* update config.py according to SonarQube duplication error

* update config.py according to SonarQube duplication error

* update according to SonarQube duplication error

* update according to SonarQube duplication error

* update according to sonarQube errors

* 25012_emailer_api_debug (#1653)

* Create sftp-nuans-report-ci.yml (#1616)

* add a linefeed at the end of the files (#1655)

* Create sftp-nuans-report-cd.yml (#1615)

* update flask-jwt-oidc package (#1656)

* Update flask jwt OIDC deps (#1657)

* revert updates to api lock dependencies except jwt-oidc

* remove broken flask-jwt-oidc package from lock file

* emailer uses latest version of namex api (#1658)

* 25167 add feature flags service enable won emails (#1659)

* 25167 add_feature_flags_service_enable_won_emails

* fix line issue

* fix the env key

* use the update namex api in emailer

* Update Makefile - commented out update-env as per P.W.

* Update Makefile - comment out update-env as per P.W.

* Update Makefile -

* Update Makefile - commented out update-env as per P.W.

* Update Makefile - undo -> commented out update-env as per P.W.

* Update Makefile - commented out update-env as per P.W.

* Update Makefile - commented out update-env as per P.W.

* Fix emailer issue (#1672)

* fix: flags use env from config

* chore: emailer uses latest version of namex

* fix: allow users modify cancel from legacy side (#1673)

* 25167 feature flgas enable won emails (#1674)

* 25167_feature_flgas_enable_won_emails

* use latest api with reference

* 25256_update_email_content (#1675)

* 25270_add_env_values (#1676)

* Update emailer-cd-gcp.yml

Removed API build when emailer changes.

* 24739 Affiliating a new NR to specified account id (#1677)

* affiliate new nr

* update version

* 25356 update_outputs_CHG_CNV_NR (#1679)

* 25356_update_outputs_CHG_CNV_NR

* update emailer poetry to use the latest api

* feat: use db in gcp

* chore: update version of namex used

* fix: permission issue

* feat: nr-day-job uses gcp db

* feat: namex pay uses gcp db

* feat: use namex db in gcp

* chore: remove auto-analyze service

---------

Signed-off-by: Shaanjot Gill <gill.shaanjots@gmail.com>
Co-authored-by: Shaanjot Gill <shaangill025@users.noreply.github.com>
Co-authored-by: eve-git <54647458+eve-git@users.noreply.github.com>
Co-authored-by: eve-git <root@PF524S4L.idir.BCGOV>
Co-authored-by: bolyachevets <andriy.bolyachevets@gov.bc.ca>
Co-authored-by: Omid Zamani <omid.x.zamani@gov.bc.ca>
Co-authored-by: Kevin Zhang <54437031+kzdev420@users.noreply.github.com>
Co-authored-by: rarmitag <35737789+rarmitag@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants