Merge branch 'main' into OSDEV-862-use-test-enviroment-for-db-download

opensupplyhub · Apr 20, 2024 · 05fce5f · 05fce5f
2 parents 69a082d + 6fe3556
commit 05fce5f
Show file tree

Hide file tree

Showing 12 changed files with 711 additions and 422 deletions.
diff --git a/doc/release/RELEASE-NOTES.md b/doc/release/RELEASE-NOTES.md
@@ -20,11 +20,17 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 * [OSDEV-862](https://opensupplyhub.atlassian.net/browse/OSDEV-862) Fix `DB - Save Anonymized DB` / `DB - Apply Anonymized DB` workflows:
   - run actions on self-hosted runners to eliminate `lack of storage` issue that hapopen on github's runners.
   - use the `Test` environment for  `DB - Save Anonymized DB` action
+* [OSDEV-989](https://opensupplyhub.atlassian.net/browse/OSDEV-989) - The Strategy pattern was utilized to consolidate the processing of new facilities received from both API requests and list uploads. The code responsible for executing this processing was refactored, and new classes were implemented:
+    * ProcessingFacility - abstract class for facility processing
+    * ProcessingFacilityList - class to process a facility list
+    * ProcessingFacilityAPI - class to process a facility from an API request
+    * ProcessingFacilityExecutor - class defines which interface to execute for the processing of a facility
 
 ### Bugfix
 
 ### What's new
 * [OSDEV-945](https://opensupplyhub.atlassian.net/browse/OSDEV-945) - Facility Claim. Update text of claim link on profile to "I want to claim this site"
+* [OSDEV-745](https://opensupplyhub.atlassian.net/browse/OSDEV-745) - New "Portuguese" translated resources option added to international menu.
 
 ## Release 1.11.0
 

diff --git a/src/app/src/components/Navbar/InternationalMenu.jsx b/src/app/src/components/Navbar/InternationalMenu.jsx
@@ -55,6 +55,13 @@ function Submenu() {
                 >
                     <span>India</span>
                 </a>
+                <a
+                    className="nav-submenu__link "
+                    href="https://info.opensupplyhub.org/brasil"
+                    target=""
+                >
+                    <span>Portuguese</span>
+                </a>
                 <a
                     className="nav-submenu__link "
                     href="https://info.opensupplyhub.org/turkey"

diff --git a/src/app/src/components/Navbar/MobileInternationalMenu.jsx b/src/app/src/components/Navbar/MobileInternationalMenu.jsx
@@ -65,6 +65,15 @@ export default function MobileInternationalMenu({
                         India
                     </a>
                 </div>
+                <div className="mobile-nav__item">
+                    <a
+                        className="mobile-nav-link "
+                        href="https://info.opensupplyhub.org/brasil"
+                        target=""
+                    >
+                        Portuguese
+                    </a>
+                </div>
                 <div className="mobile-nav__item">
                     <a
                         className="mobile-nav-link "

diff --git a/src/dedupe-hub/api/Dockerfile b/src/dedupe-hub/api/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.7
 
 WORKDIR /usr/local/src
 

diff --git a/src/dedupe-hub/api/requirements.txt b/src/dedupe-hub/api/requirements.txt
@@ -5,7 +5,7 @@ fastapi[all]==0.75.0
 fastapi-utils==0.2.0
 Unidecode==1.3.6
 dedupe==1.9.4
-numpy==1.22.0
+numpy==1.21.6
 rollbar==0.16.3
 SQLAlchemy==1.4.49
 psycopg2==2.9.6