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

Revert "Chore: upgrade prisma" #1191

Merged
merged 1 commit into from
May 25, 2023
Merged

Revert "Chore: upgrade prisma" #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 14 additions & 16 deletions backend/api/routes/completions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,22 +254,20 @@ export class CompletionController extends Controller {
user: User,
): Promise<Completion | null> => {
return (
(
await this.ctx.prisma.user
.findUnique({
where: {
id: user.id,
},
})
.completions({
where: {
course_id: course.completions_handled_by_id ?? course.id,
},
orderBy: { created_at: "asc" },
take: 1,
})
)?.[0] ?? null
)
await this.ctx.prisma.user
.findUnique({
where: {
id: user.id,
},
})
.completions({
where: {
course_id: course.completions_handled_by_id ?? course.id,
},
orderBy: { created_at: "asc" },
take: 1,
})
)?.[0]
}

recheckCompletion = async (
Expand Down
151 changes: 73 additions & 78 deletions backend/api/routes/progress.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,39 +311,37 @@ export class ProgressController extends Controller {
}

logger.info("Querying existing progresses and completions")
const beforeParentProgresses =
(await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.user_course_progresses({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})) ?? []
const beforeParentProgresses = await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.user_course_progresses({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})

const beforeCompletions =
(await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.completions({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})) ?? []
const beforeCompletions = await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.completions({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})

const getUsers = (arr: Array<object & { user: User | null }>) =>
arr?.map((e) => e.user).filter(notEmpty) ?? []
Expand Down Expand Up @@ -420,20 +418,19 @@ export class ProgressController extends Controller {
advancedBAICourse,
]) {
logger.info(`Handling ${course.slug}`)
const userCourseProgresses =
(await prisma.course
.findUnique({
where: {
id: course.id,
},
})
.user_course_progresses({
distinct: ["user_id"],
orderBy: { created_at: "asc" },
include: {
user: true,
},
})) ?? []
const userCourseProgresses = await prisma.course
.findUnique({
where: {
id: course.id,
},
})
.user_course_progresses({
distinct: ["user_id"],
orderBy: { created_at: "asc" },
include: {
user: true,
},
})

if (userCourseProgresses.length) {
logger.info(
Expand Down Expand Up @@ -482,39 +479,37 @@ export class ProgressController extends Controller {
}

logger.info("Querying updated progresses and completions")
const afterParentProgresses =
(await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.user_course_progresses({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})) ?? []
const afterParentProgresses = await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.user_course_progresses({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})

const afterCompletions =
(await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.completions({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})) ?? []
const afterCompletions = await prisma.course
.findUnique({
where: {
id: BAIParentCourse,
},
})
.completions({
distinct: ["user_id"],
orderBy: {
created_at: "asc",
},
include: {
user: true,
},
})

const result = {
progresses: {
Expand Down
39 changes: 19 additions & 20 deletions backend/api/routes/storedData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ export class StoredDataController extends Controller {
try {
const existingStoredData = await prisma.storedData.findUnique({
where: {
course_id_user_id: {
course_id: course.id,
user_id_course_id: {
user_id: user.id,
course_id: course.id,
},
},
})
Expand All @@ -59,9 +59,9 @@ export class StoredDataController extends Controller {

await prisma.storedData.update({
where: {
course_id_user_id: {
course_id: course.id,
user_id_course_id: {
user_id: user.id,
course_id: course.id,
},
},
data: {
Expand Down Expand Up @@ -98,26 +98,25 @@ export class StoredDataController extends Controller {
return ownershipResult.error
}

const storedData =
(await prisma.course
.findUnique({
where: { id: course.id },
})
.stored_data({
include: {
user: {
include: {
completions: {
where: {
course_id: course.completions_handled_by_id ?? course.id,
},
orderBy: { created_at: "asc" },
take: 1,
const storedData = await prisma.course
.findUnique({
where: { id: course.id },
})
.stored_data({
include: {
user: {
include: {
completions: {
where: {
course_id: course.completions_handled_by_id ?? course.id,
},
orderBy: { created_at: "asc" },
take: 1,
},
},
},
})) ?? []
},
})

const mappedStoredData = storedData.map((data) => ({
user: omit(data.user, "completions"),
Expand Down
4 changes: 2 additions & 2 deletions backend/bin/fetchUserAppDatum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DateTime } from "luxon"

import { Course, Prisma, PrismaClient, UserCourseSetting } from "@prisma/client"
import { Course, PrismaClient, UserCourseSetting } from "@prisma/client"

import { CONFIG_NAME } from "../config"
import { UserInfo } from "../domain/UserInfo"
Expand Down Expand Up @@ -212,7 +212,7 @@ const saveCourseVariant = async (p: any) => {
}

const saveOther = async (p: any) => {
const other = (old.other as Prisma.JsonObject) ?? {}
const other: any = old.other ?? {}
if (p.value == "t") {
p.value = true
} else if (p.value == "f") {
Expand Down
11 changes: 5 additions & 6 deletions backend/bin/importOrganizations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,11 @@ const upsertOrganization = async (org: OrganizationInfo) => {
information: org.information,
organization: { connect: { id: organization.id } },
}
const organizationTranslations =
(await prisma.organization
.findUnique({ where: { id: organization.id } })
.organization_translations({
where: { language: translationDetails.language },
})) ?? []
const organizationTranslations = await prisma.organization
.findUnique({ where: { id: organization.id } })
.organization_translations({
where: { language: translationDetails.language },
})
const organizationTranslationId = organizationTranslations.length
? organizationTranslations[0].id
: null
Expand Down
10 changes: 5 additions & 5 deletions backend/bin/kafkaConsumer/common/EmailTemplater/templates/CourseStats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class StartedCourseCount extends Template {
const conditions = [
Prisma.sql`course_id = ${
course.inherit_settings_from_id ?? course.id
}::uuid`,
}`,
]
if (courseInstanceLanguage) {
conditions.push(Prisma.sql`language = ${courseInstanceLanguage}`)
Expand Down Expand Up @@ -74,7 +74,7 @@ export class CompletedCourseCount extends Template {
const conditions = [
Prisma.sql`course_id = ${
course.completions_handled_by_id ?? course.id
}::uuid`,
}`,
]
if (completionLanguage) {
conditions.push(
Expand Down Expand Up @@ -124,7 +124,7 @@ export class AtLeastOneExerciseCount extends Template {
COUNT(DISTINCT user_id)
FROM exercise_completion ec
JOIN exercise e ON ec.exercise_id = e.id
WHERE course_id = ${course.id}::uuid
WHERE course_id = ${course.id}
AND attempted = true;
`
)?.[0]?.count
Expand Down Expand Up @@ -173,7 +173,7 @@ export class AtLeastOneExerciseButNotCompletedEmails extends Template {
const conditions = [
Prisma.sql`course_id = ${
course.completions_handled_by_id ?? course.id
}::uuid`,
}`,
Prisma.sql`user_id IS NOT NULL`,
]
if (completionLanguage) {
Expand All @@ -191,7 +191,7 @@ export class AtLeastOneExerciseButNotCompletedEmails extends Template {
JOIN exercise e ON ec.exercise_id = e.id
JOIN "user" u ON ec.user_id = u.id
WHERE
e.course_id = ${course.id}::uuid
e.course_id = ${course.id}
AND
ec.attempted = true
AND
Expand Down
Loading