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: achievement database model #867

Merged
merged 16 commits into from
Nov 14, 2023
Merged

feat: achievement database model #867

merged 16 commits into from
Nov 14, 2023

Conversation

LomyW
Copy link
Contributor

@LomyW LomyW commented Oct 20, 2023 •
edited
Loading

Closes https://github.com/corona-school/project-user/issues/880

✅ What was done

  • add achievement_template table
  • add user_achievement table
  • add event table
  • add enums
  • add basic structure for `aggregator, formula, metric, conditionDataAggregation, buckets
  • migrate model

@realmayus realmayus temporarily deployed to backend-feat-880-achiev-ke9gd9 October 20, 2023 12:16 Inactive
dhenkel92
dhenkel92 reviewed Oct 20, 2023
View reviewed changes
prisma/schema.prisma Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
Jonasdoubleyou
Jonasdoubleyou reviewed Oct 21, 2023
View reviewed changes
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
@Jonasdoubleyou
Copy link
Member

Jonasdoubleyou commented Oct 21, 2023 •
edited
Loading

As we need a somewhat linear history for our schema (as we need a total order in which migrations are applied), I'd suggest to either (a) bring this in to master directly if you think the model is more or less ready or (b) to ignore the migration check for now and generate the migration once the feature branch is ready.

@realmayus realmayus temporarily deployed to backend-feat-880-achiev-hajqdv October 23, 2023 09:05 Inactive
@realmayus realmayus temporarily deployed to backend-feat-880-achiev-oljkcz October 23, 2023 09:52 Inactive
@realmayus realmayus temporarily deployed to backend-feat-880-achiev-jm7ra9 October 23, 2023 10:47 Inactive
@realmayus realmayus temporarily deployed to backend-feat-880-achiev-9asiev October 24, 2023 07:26 Inactive
@LomyW LomyW marked this pull request as ready for review October 24, 2023 10:31
Jonasdoubleyou
Jonasdoubleyou reviewed Oct 27, 2023
View reviewed changes
common/achievement/types.ts Outdated Show resolved Hide resolved
prisma/schema.prisma Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
@LomyW LomyW self-assigned this Oct 30, 2023
Jonasdoubleyou
Jonasdoubleyou reviewed Nov 6, 2023
View reviewed changes
prisma/schema.prisma Outdated Show resolved Hide resolved
Jonasdoubleyou
Jonasdoubleyou reviewed Nov 6, 2023
View reviewed changes
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
prisma/schema.prisma Outdated Show resolved Hide resolved
common/achievement/types.ts Outdated Show resolved Hide resolved
@LomyW
add relation
3dc1562 
adjust formula return value
@LomyW LomyW requested a review from Jonasdoubleyou November 10, 2023 13:04
@LomyW LomyW requested a review from Jonasdoubleyou November 13, 2023 07:09
Jonasdoubleyou
Jonasdoubleyou previously approved these changes Nov 13, 2023
View reviewed changes
Copy link
Member

@Jonasdoubleyou Jonasdoubleyou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest to go to master with this soonish to avoid conflicts in prisma

@LomyW LomyW changed the base branch from feat/achievements to master November 13, 2023 11:12
@LomyW LomyW dismissed Jonasdoubleyou’s stale review November 13, 2023 11:12

The base branch was changed.

@LomyW LomyW requested a review from Jonasdoubleyou November 14, 2023 07:35
@LomyW LomyW merged commit 8a09be5 into master Nov 14, 2023
2 checks passed
@LomyW LomyW deleted the feat/880-achievement-datamodel branch November 14, 2023 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jonasdoubleyou Jonasdoubleyou Jonasdoubleyou approved these changes

@dhenkel92 dhenkel92 Awaiting requested review from dhenkel92

@timidak timidak Awaiting requested review from timidak

Assignees

@LomyW LomyW

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@LomyW @Jonasdoubleyou @dhenkel92 @timidak @realmayus