Skip to content

Commit

Permalink
Merge pull request #223 from planetarium/feature/free-product
Browse files Browse the repository at this point in the history
Find avatar in right planet
  • Loading branch information
U-lis authored Jan 23, 2024
2 parents 25a5b3e + 52ec048 commit 4b8a4ef
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
HEADLESS: ${{ vars.HEADLESS }}
ODIN_GQL_URL: ${{ vars.ODIN_GQL_URL }}
HEIMDALL_GQL_URL: ${{ vars.HEIMDALL_GQL_URL }}
KMS_KEY_ID: ${{ secrets.KMS_KEY_ID }}
GOOGLE_CREDENTIAL: ${{ secrets.GOOGLE_CREDENTIAL }}
GOOGLE_PACKAGE_NAME: ${{ vars.GOOGLE_PACKAGE_NAME }}
Expand Down Expand Up @@ -163,6 +165,8 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
HEADLESS: ${{ vars.HEADLESS }}
ODIN_GQL_URL: ${{ vars.ODIN_GQL_URL }}
HEIMDALL_GQL_URL: ${{ vars.HEIMDALL_GQL_URL }}
KMS_KEY_ID: ${{ secrets.KMS_KEY_ID }}
GOOGLE_CREDENTIAL: ${{ secrets.GOOGLE_CREDENTIAL }}
GOOGLE_PACKAGE_NAME: ${{ vars.GOOGLE_PACKAGE_NAME }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/synth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
HEADLESS: ${{ vars.HEADLESS }}
ODIN_GQL_URL: ${{ vars.ODIN_GQL_URL }}
HEIMDALL_GQL_URL: ${{ vars.HEIMDALL_GQL_URL }}
KMS_KEY_ID: ${{ secrets.KMS_KEY_ID }}
GOOGLE_CREDENTIAL: ${{ secrets.GOOGLE_CREDENTIAL }}
GOOGLE_PACKAGE_NAME: ${{ vars.GOOGLE_PACKAGE_NAME }}
Expand Down
2 changes: 2 additions & 0 deletions common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ class Config:
account_id: str
region_name: str
cdn_host: str
odin_gql_url: str
heimdall_gql_url: str

# Multiplanetary
planet_url: str
Expand Down
8 changes: 7 additions & 1 deletion iap/api/purchase.py
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,15 @@ def free_product(receipt_data: FreeReceiptSchema, sess=Depends(session)):

# Required level
if product.required_level:
gql_url = None
if receipt_data.planetId in (PlanetID.ODIN, PlanetID.ODIN_INTERNAL):
gql_url = os.environ.get("ODIN_GQL_URL")
elif receipt_data.planetId in (PlanetID.HEIMDALL, PlanetID.HEIMDALL_INTERNAL):
gql_url = os.environ.get("HEIMDALL_GQL_URL")

query = f"""{{ stateQuery {{ avatar (avatarAddress: "{receipt_data.avatarAddress}") {{ level}} }} }}"""
try:
resp = requests.post(os.environ.get("HEADLESS"), json={"query": query}, timeout=1)
resp = requests.post(gql_url, json={"query": query}, timeout=1)
avatar_level = resp.json()["data"]["stateQuery"]["avatar"]["level"]
except:
# Whether request is failed or no fitted data found
Expand Down
2 changes: 2 additions & 0 deletions iap/iap_cdk_stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
"APPLE_KEY_ID": config.apple_key_id,
"APPLE_ISSUER_ID": config.apple_issuer_id,
"HEADLESS": config.headless,
"ODIN_GQL_URL": config.odin_gql_url,
"HEIMDALL_GQL_URL": config.heimdall_gql_url,
"CDN_HOST": config.cdn_host,
"PLANET_URL": config.planet_url,
"BRIDGE_DATA": config.bridge_data,
Expand Down

0 comments on commit 4b8a4ef

Please sign in to comment.