From b843e9c3aba333c456543bb585c7853d22505b6b Mon Sep 17 00:00:00 2001 From: geistling <34081638+geistling@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:28:24 -0500 Subject: [PATCH 1/3] tag dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index caa3623aa..9160c3d91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ # to build for a development environment, run the following command: # docker build --build-arg build_env=dev -t coldfront --ssh default . --network=host +LABEL org.opencontainers.image.source=https://github.com/fasrc/coldfront +LABEL org.opencontainers.image.description="fasrc coldfront application" FROM python:3.10 From 5d7e94db310c8fb9930e94423f8f64be06196dc8 Mon Sep 17 00:00:00 2001 From: geistling <34081638+geistling@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:30:26 -0500 Subject: [PATCH 2/3] update dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9160c3d91..c08eeb7dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,14 +2,14 @@ # to build for a development environment, run the following command: # docker build --build-arg build_env=dev -t coldfront --ssh default . --network=host -LABEL org.opencontainers.image.source=https://github.com/fasrc/coldfront -LABEL org.opencontainers.image.description="fasrc coldfront application" - FROM python:3.10 ARG build_env=production ENV BUILD_ENV=$build_env +LABEL org.opencontainers.image.source=https://github.com/fasrc/coldfront +LABEL org.opencontainers.image.description="fasrc coldfront application" + RUN apt-get update \ && apt-get install -y --no-install-recommends \ && apt-get install -y redis redis-server \ From 4bf6b01cc3e84b397b6669ed9eb7f5405b446641 Mon Sep 17 00:00:00 2001 From: Aaron Kitzmiller Date: Tue, 26 Nov 2024 13:35:22 -0500 Subject: [PATCH 3/3] Updated ifxbilling to get endpoints Added urls for retrieving summary data; to be used by fiine mostly. Also urls for rebalance activities to be implemented in fiine --- coldfront/plugins/ifx/urls.py | 13 +++++++++---- ifxbilling | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/coldfront/plugins/ifx/urls.py b/coldfront/plugins/ifx/urls.py index fb072730e..14521eaf8 100644 --- a/coldfront/plugins/ifx/urls.py +++ b/coldfront/plugins/ifx/urls.py @@ -1,7 +1,7 @@ from django.urls import path, include from rest_framework import routers from ifxbilling.views import unauthorized as unauthorized_api -from ifxbilling.views import get_orgs_with_billing, get_charge_history +from ifxbilling import views as ifxbilling_views from ifxuser.views import get_org_names from coldfront.plugins.ifx.viewsets import ColdfrontBillingRecordViewSet, ColdfrontReportRunViewSet, ColdfrontProductUsageViewSet from coldfront.plugins.ifx.views import update_user_accounts_view, get_billing_record_list, unauthorized, report_runs, run_report, calculate_billing_month, billing_month, get_product_usages, billing_records, send_billing_record_review_notification, lab_billing_summary @@ -14,9 +14,14 @@ urlpatterns = [ path('api/unauthorized/', unauthorized_api), path('api/billing/get-billing-record-list/', get_billing_record_list), - path('api/billing/get-orgs-with-billing////', get_orgs_with_billing), - path('api/billing/get-charge-history/', get_charge_history), - path('api/calculate-billing-month///', calculate_billing_month), + path('api/billing/get-orgs-with-billing////', ifxbilling_views.get_orgs_with_billing), + path('api/billing/get-charge-history/', ifxbilling_views.get_charge_history), + path('api/billing/get-summary-by-user/', ifxbilling_views.get_summary_by_user), + path('api/billing/get-summary-by-product-rate/', ifxbilling_views.get_summary_by_product_rate), + path('api/billing/get-summary-by-account/', ifxbilling_views.get_summary_by_account), + path('api/billing/get-pending-year-month//', ifxbilling_views.get_pending_year_month), + path('api/billing/rebalance/', ifxbilling_views.rebalance), + path('api/calculate-billing-month///', calculate_billing_month, name='calculate-billing-month'), path('api/run-report/', run_report), path('api/get-org-names/', get_org_names, name='get-org-names'), path('api/get-product-usages/', get_product_usages, name='get-product-usages'), diff --git a/ifxbilling b/ifxbilling index c8bcbec53..3a8575b2b 160000 --- a/ifxbilling +++ b/ifxbilling @@ -1 +1 @@ -Subproject commit c8bcbec538f5adc6e03353424e91470b85671763 +Subproject commit 3a8575b2ba26f1189a105e9b8b42ec0d199a8292