Skip to content
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

Jump to bottom

feat(server): add metered billing module, remove subscription module, discard Prisma #1187

Merged
merged 57 commits into from
May 29, 2023
Merged

feat(server): add metered billing module, remove subscription module, discard Prisma #1187

merged 57 commits into from
May 29, 2023

Conversation

maslow
Copy link
Member

@maslow maslow commented May 29, 2023

  • design metering schema
  • add region bundle schema
  • remove prisma in some modules
  • 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
  • design metering schema
  • add region bundle schema
  • remove prisma in some modules
  • 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
  • Design metering (Design metering #1169)
  • 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(web): new metering design (feat(web): metering web #1171)
  • add pagination response decoration
  • feat(web): metering web (feat(web): metering web #1173)
  • chore: update entity typings
  • fix(web): modal height (fix(web): modal height #1175)
  • add application trial tier limit
  • feat(server): add invite code feature and billings pagination (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 (fix(web): update app state api & rules add api #1184)
  • fix(server): update response struct of rules, add response types
  • refactor(web): api definitions (refactor(web): api definitions #1185)
  • fix(server): fix trial app logic
  • Feat definition (Feat definition #1186)
  • merge main into design-metering
  • add metering yaml to laf helm charts

maslow added 30 commits May 9, 2023 16:37
@maslow
design metering schema
19acb20
@maslow
Merge remote-tracking branch 'upstream/main' into design-metering
c85d99e
@maslow
Merge remote-tracking branch 'upstream/main' into design-metering
f65e737
@maslow
Merge remote-tracking branch 'upstream/main' into design-metering
e87187a
@maslow
add region bundle schema
ef434e7
@maslow
remove prisma in some modules
bc36980
@maslow
remove prisma in gateway, website, storage
e7f360d
@maslow
remove prisma in dependency module
d3b6888
@maslow
remove prisma in account module
45c0dd3
@maslow
remove prisma in instance module
29ee47b
@maslow
remove prisma in auth and user module
7bc52d4
@maslow
remove prisma in function and trigger module
54550c8
@maslow
remove prisma totally
5076425
@maslow
Merge remote-tracking branch 'upstream/main' into design-metering
9f5b31d
@maslow
add resource option & template api
398c3a1
@maslow
rename resource template to bundle
a2dc9db
@maslow
design metering schema
fec7757
@maslow
add region bundle schema
1f51402
@maslow
remove prisma in some modules
393eda0
@maslow
remove prisma in gateway, website, storage
52d926d
@maslow
remove prisma in dependency module
1f51c57
@maslow
remove prisma in account module
5938807
@maslow
remove prisma in instance module
7e3fbf6
@maslow
remove prisma in auth and user module
e65b211
@maslow
remove prisma in function and trigger module
cba015c
@maslow
remove prisma totally
2d2a116
@maslow
add resource option & template api
2093afb
@maslow
rename resource template to bundle
b3a7d95
@maslow
Merge remote-tracking branch 'upstream/metering' into design-metering
10e8d6f
@maslow
add billing module & price calculation api
935c7b2
maslow and others added 25 commits May 23, 2023 19:56
@maslow
Design metering (#1169)
9130c52 
* design metering schema

* add region bundle schema

* remove prisma in some modules

* 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
@maslow
update app bundle api
cdfeee4
@maslow
impl billing task
1238998
@maslow
feat(server): add application billings http api
b6bf134
@maslow
impl billing payment task
e3f5886
@maslow
restart app while updating bundle
c415158
@maslow
update user profile api
5e045ff
@maslow
fix account api response body
2f1cb16
@LeezQ @nightwhite
feat(web): new metering design (#1171)
1f7d298 
* doc: add wechat example

* doc: add jsapi pay example

* doc: add two cloud function example (#1134)

* doc: add two cloud function example

* doc: delete repeat word

* doc: fix wrong format (#1164)

* feat: bundle select

* fix: upgrade payment

* refactor(web): update package

* refactor(web): upgrade type definitions

---------

Co-authored-by: NightWhite <nightwhite634@gmail.com>
@maslow
add pagination response decoration
cd72e16
@LeezQ
feat(web): metering web (#1173)
34b1f35 
(cherry picked from commit 3793fbc)
@maslow
chore: update entity typings
cd44872
@LeezQ
fix(web): modal height (#1175)
172f9cc
@maslow
add application trial tier limit
6a240c9
@HUAHUAI23
feat(server): add invite code feature and billings pagination (#1183)
b51af3d
@maslow
feat(server): process free trial billing
aab7d8e
@LeezQ
fix(web): update app state api & rules add api (#1184)
5c06979 
* 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)
@maslow
fix(server): update response struct of rules, add response types
1033a18
@maslow
Merge remote-tracking branch 'upstream/design-metering' into design-m…
ef1d85a 
…etering
@LeezQ
refactor(web): api definitions (#1185)
7b558ea
@maslow
fix(server): fix trial app logic
8440f77
@maslow
Merge remote-tracking branch 'upstream/design-metering' into design-m…
4815947 
…etering
@LeezQ
Feat definition (#1186)
5234138 
* refactor(web): api definitions

* fix(web): show fee
@maslow
merge main into design-metering
6ed2885
@maslow
add metering yaml to laf helm charts
f89d90c
@maslow maslow changed the title design metering feat(server): add metered billing module, remove subscription module, discard Prisma May 29, 2023
@maslow maslow merged commit 8a06d44 into main May 29, 2023
@maslow maslow deleted the design-metering branch May 29, 2023 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@maslow @LeezQ @HUAHUAI23