Skip to content

Commit

Permalink
feat(server): add metered billing module, remove subscription module,…
Browse files Browse the repository at this point in the history
… discard Prisma (#1187)

* design metering schema

* add region bundle schema

* remove prisma in gateway, website, storage

* remove prisma in dependency module

* remove prisma in account module

* remove prisma in instance module

* remove prisma in auth and user module

* remove prisma in function and trigger module

* remove prisma totally

* add resource option & template api

* rename resource template to bundle

* add billing module & price calculation api

* add response api typings

* update app bundle api

* impl billing task

* impl billing payment task

* restart app while updating bundle

* update user profile api

* fix account api response body

* feat: bundle select

* fix: upgrade payment

* refactor(web): update package

* refactor(web): upgrade type definitions

---------

Co-authored-by: NightWhite <nightwhite634@gmail.com>

* add pagination response decoration

* feat(web): metering web (#1173)

(cherry picked from commit 3793fbc)

* chore: update entity typings

* fix(web): modal height (#1175)

* add application trial tier limit

* feat(server): add invite code feature and billings pagination (#1183)

* feat(server): process free trial billing

* fix(web): update app state api & rules add api (#1184)

* fix(web): update app state api

(cherry picked from commit 33f89bf)

* fix(web): rules add

(cherry picked from commit a4cc073)

* fix(web): id -> _id

(cherry picked from commit 1bd3ab0)

* fix(server): update response struct of rules, add response types

* refactor(web): api definitions (#1185)

* fix(server): fix trial app logic

* Feat definition (#1186)

* refactor(web): api definitions

* fix(web): show fee

* merge main into design-metering

* add metering yaml to laf helm charts

---------

Co-authored-by: allence <lizhenq2009@gmail.com>
Co-authored-by: NightWhite <nightwhite634@gmail.com>
Co-authored-by: limbo <43649186+HUAHUAI23@users.noreply.github.com>
  • Loading branch information
4 people committed May 29, 2023
1 parent 6e79d26 commit 8a06d44
Show file tree
Hide file tree
Showing 212 changed files with 7,511 additions and 5,873 deletions.
21 changes: 17 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
},
"cSpell.words": [
"aarch",
"alicloud",
"alipay",
"alisms",
"apiextensions",
Expand Down Expand Up @@ -49,6 +50,8 @@
"datepicker",
"dockerode",
"doctag",
"dysmsapi",
"Dysmsapi",
"EJSON",
"entrypoint",
"finalizers",
Expand All @@ -75,7 +78,9 @@
"MONOG",
"nestjs",
"objs",
"openapi",
"openebs",
"OVERLIMIT",
"passw",
"pgdb",
"presigner",
Expand Down Expand Up @@ -115,12 +120,20 @@
"zustand"
],
"i18n-ally.localesPaths": "web/public/locales",
"i18n-ally.enabledParsers": ["json"],
"i18n-ally.enabledFrameworks": ["react", "i18next", "general"],
"i18n-ally.enabledParsers": [
"json"
],
"i18n-ally.enabledFrameworks": [
"react",
"i18next",
"general"
],
"i18n-ally.sourceLanguage": "zh-CN",
"i18n-ally.displayLanguage": "en,zh",
"i18n-ally.namespace": false,
"i18n-ally.pathMatcher": "{locale}/translation.json",
"i18n-ally.keystyle": "nested",
"i18n-ally.keysInUse": ["description.part2_whatever"]
}
"i18n-ally.keysInUse": [
"description.part2_whatever"
]
}
2 changes: 2 additions & 0 deletions deploy/build/charts/laf-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ spec:
env:
- name: DATABASE_URL
value: {{ .Values.databaseUrl | quote}}
- name: METERING_DATABASE_URL
value: {{ .Values.meteringDatabaseUrl | quote}}
- name: JWT_SECRET
value: {{ .Values.jwt.secret | quote}}
- name: API_SERVER_URL
Expand Down
Loading

0 comments on commit 8a06d44

Please sign in to comment.