Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Develop #347

Merged
merged 8 commits into from
Jun 11, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
[#346] Move generate config into a util function
  • Loading branch information
wayangalihpratama committed Jun 11, 2024
commit 2210947a6b02d3a8ceb169564f4700723f3a951d
53 changes: 2 additions & 51 deletions backend/core/config.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import os
from jsmin import jsmin
from fastapi import FastAPI, Request, Response
from middleware import decode_token
from fastapi.responses import FileResponse
from db.connection import SessionLocal

from routes.user import user_route
from routes.tag import tag_route
@@ -18,10 +15,7 @@
from routes.visualization import visualization_route
from routes.reference_data import reference_data_routes

from models.business_unit import BusinessUnit
from models.commodity_category import CommodityCategory
from models.currency import Currency
from models.country import Country
from utils.generate_config import generate_config_file, JS_FILE


app = FastAPI(
@@ -40,49 +34,7 @@
},
)

JS_FILE = "./config.min.js"


def generate_config_file() -> None:
session = SessionLocal()
env_js = "var __ENV__={"
env_js += 'client_id:"{}"'.format(os.environ["CLIENT_ID"])
env_js += ', client_secret:"{}"'.format(os.environ["CLIENT_SECRET"])
env_js += "};"
min_js = jsmin("".join([env_js, ""]))
business_units = session.query(BusinessUnit).all() or []
if business_units:
business_units = [bu.serialize for bu in business_units]
commodity_categories = session.query(CommodityCategory).all() or []
if commodity_categories:
commodity_categories = [
cc.serialize_with_commodities for cc in commodity_categories
]
currencies = (
session.query(Currency.abbreviation, Currency.country).distinct() or []
)
if currencies:
currencies = [
{"value": c[0], "label": c[0], "country": c[1]} for c in currencies
]
countries = (
session.query(Country).filter(Country.parent.is_(None)).all()
or [] # noqa
)
if countries:
countries = [c.to_dropdown for c in countries]
min_js += "var master={};".format(
str(
{
"business_units": business_units,
"commodity_categories": commodity_categories,
"currencies": currencies,
"countries": countries,
}
)
)
with open(JS_FILE, "w") as jsfile:
jsfile.write(min_js)
generate_config_file()


# Routes register
@@ -118,7 +70,6 @@ def health_check():
description="static javascript config",
)
async def main(res: Response):
generate_config_file()
res.headers["Content-Type"] = "application/x-javascript; charset=utf-8"
return JS_FILE

3 changes: 3 additions & 0 deletions backend/generate_config.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

python -m utils.generate_config
63 changes: 63 additions & 0 deletions backend/utils/generate_config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import os
from jsmin import jsmin
from db.connection import SessionLocal

from models.business_unit import BusinessUnit
from models.commodity_category import CommodityCategory
from models.currency import Currency
from models.country import Country


JS_FILE = "./config.min.js"


def generate_config_file() -> None:
print("[START] Generating config")
session = SessionLocal()
env_js = "var __ENV__={"
env_js += 'client_id:"{}"'.format(os.environ["CLIENT_ID"])
env_js += ', client_secret:"{}"'.format(os.environ["CLIENT_SECRET"])
env_js += "};"
min_js = jsmin("".join([env_js, ""]))
business_units = session.query(BusinessUnit).all() or []
session.flush()
if business_units:
business_units = [bu.serialize for bu in business_units]
commodity_categories = session.query(CommodityCategory).all() or []
session.flush()
if commodity_categories:
commodity_categories = [
cc.serialize_with_commodities for cc in commodity_categories
]
currencies = (
session.query(Currency.abbreviation, Currency.country).distinct() or []
)
session.flush()
if currencies:
currencies = [
{"value": c[0], "label": c[0], "country": c[1]} for c in currencies
]
countries = (
session.query(Country).filter(Country.parent.is_(None)).all()
or [] # noqa
)
session.flush()
if countries:
countries = [c.to_dropdown for c in countries]
min_js += "var master={};".format(
str(
{
"business_units": business_units,
"commodity_categories": commodity_categories,
"currencies": currencies,
"countries": countries,
}
)
)
with open(JS_FILE, "w") as jsfile:
jsfile.write(min_js)
print("[DONE] Config generated")
session.close()


generate_config_file()