Skip to content

Feature statement refactor branch merge #2178

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

Closed
Jxio wants to merge 4 commits into from
Closed

Feature statement refactor branch merge #2178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f571ee2
31533 & 31260 - Add partial_refund/refund applied credits to statemen…
Jxio Dec 2, 2025
ac273f0
PAD statement summary and transaction update (#2170)
Jxio Dec 4, 2025
7757d0c
BCOL, CC, ONLINE_BANKING, EFT statement updates (#2177)
Jxio Dec 9, 2025
b268b70
Statement Feature branch conflict solving(#2179)
Jxio Dec 9, 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
2 changes: 1 addition & 1 deletion .github/workflows/pay-api-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
env:
FLASK_ENV: "testing"
# Needs different database than POSTGRES otherwise dropping database doesn't work
DATABASE_TEST_URL: "postgresql+pg8000://postgres:postgres@localhost:5432/pay-test"
DATABASE_TEST_URL: "postgresql+psycopg://postgres:postgres@localhost:5432/pay-test"
USE_TEST_KEYCLOAK_DOCKER: "YES"
USE_DOCKER_MOCK: "YES"

Expand Down
24 changes: 12 additions & 12 deletions bcol-api/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bcol-api/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ requests = "^2.32.4"
zeep = "^4.2.1"
python-ldap = "^3.4.5"
attrs = "^23.2.0"
werkzeug = "^3.0.1"
werkzeug = "^3.1.4"
jaeger-client = "^4.8.0"
pycountry = "^23.12.11"
itsdangerous = "^2.1.2"
Expand Down
118 changes: 56 additions & 62 deletions jobs/ftp-poller/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jobs/ftp-poller/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ itsdangerous = "^2.1.2"
jinja2 = "^3.1.3"
launchdarkly-server-sdk = "^8.2.1"
sbc-common-components = {git = "https://github.com/bcgov/sbc-common-components.git", subdirectory = "python"}
pay-api = { git = "https://github.com/seeker25/sbc-pay.git", branch = "update_deps_2", subdirectory = "pay-api" }
pay-api = { git = "https://github.com/seeker25/sbc-pay.git", branch = "fix_deadlock", subdirectory = "pay-api" }
wheel = "^0.43.0"


Expand Down
12 changes: 6 additions & 6 deletions jobs/notebook-report/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jobs/notebook-report/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ requests = "^2.32.4"
marshmallow = "^3.23.1"
werkzeug = "^3.1.4"
certifi = "^2024.8.30"
urllib3 = "^2.5.0"
urllib3 = "^2.6.0"
idna = "^3.10"
pg8000 = "^1.31.2"

Expand Down
6 changes: 3 additions & 3 deletions jobs/payment-jobs/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ class _Config: # pylint: disable=too-few-public-methods
DB_PORT = os.getenv("DATABASE_PORT", "5432")
if DB_UNIX_SOCKET := os.getenv("DATABASE_UNIX_SOCKET", None):
SQLALCHEMY_DATABASE_URI = (
f"postgresql+pg8000://{DB_USER}:{DB_PASSWORD}@/{DB_NAME}?unix_sock={DB_UNIX_SOCKET}/.s.PGSQL.5432"
f"postgresql+psycopg://{DB_USER}:{DB_PASSWORD}@/{DB_NAME}?host={DB_UNIX_SOCKET}&port={DB_PORT}"
)
else:
SQLALCHEMY_DATABASE_URI = f"postgresql+pg8000://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{int(DB_PORT)}/{DB_NAME}"
SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{int(DB_PORT)}/{DB_NAME}"
SQLALCHEMY_ECHO = False

# Data Warehouse Settings
Expand Down Expand Up @@ -225,7 +225,7 @@ class TestConfig(_Config): # pylint: disable=too-few-public-methods
DB_PORT = os.getenv("DATABASE_TEST_PORT", "5432")
SQLALCHEMY_DATABASE_URI = os.getenv(
"DATABASE_TEST_URL",
f"postgresql+pg8000://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{int(DB_PORT)}/{DB_NAME}",
f"postgresql+psycopg://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{int(DB_PORT)}/{DB_NAME}",
)

SERVER_NAME = "localhost:5001"
Expand Down
Loading