fix admin ui strike submit
This commit is contained in:
@ -154,7 +154,7 @@ export const report = {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (input.status === 'closed' && preReportStrike?.strikeReasonId != input.strikeReasonId) {
|
if (input.status === 'closed' && preReportStrike?.strikeReason?.id != input.strikeReasonId) {
|
||||||
const report = await db.getReportById({ id: input.reportId });
|
const report = await db.getReportById({ id: input.reportId });
|
||||||
if (report.reported) {
|
if (report.reported) {
|
||||||
const strikes = await db.getStrikesByTeamId({ teamId: report.reported.id });
|
const strikes = await db.getStrikesByTeamId({ teamId: report.reported.id });
|
||||||
|
@ -3,6 +3,7 @@ import { strikeReason } from '@db/schema/strikeReason.ts';
|
|||||||
import type { MySql2Database } from 'drizzle-orm/mysql2';
|
import type { MySql2Database } from 'drizzle-orm/mysql2';
|
||||||
import { eq } from 'drizzle-orm';
|
import { eq } from 'drizzle-orm';
|
||||||
import { report } from '@db/schema/report.ts';
|
import { report } from '@db/schema/report.ts';
|
||||||
|
import { strikeReasons } from '@app/admin/strikeReasons/strikeReasons.ts';
|
||||||
|
|
||||||
type Database = MySql2Database<{ strike: typeof strike }>;
|
type Database = MySql2Database<{ strike: typeof strike }>;
|
||||||
|
|
||||||
@ -47,12 +48,16 @@ export async function editStrike(db: Database, values: EditStrikeReq) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function getStrikeByReportId(db: Database, values: GetStrikeByReportIdReq) {
|
export async function getStrikeByReportId(db: Database, values: GetStrikeByReportIdReq) {
|
||||||
return db.query.strike.findFirst({
|
const strikes = await db
|
||||||
with: {
|
.select({
|
||||||
strikeReason: true
|
strike,
|
||||||
},
|
strikeReason
|
||||||
where: eq(strike.reportId, values.reportId)
|
})
|
||||||
});
|
.from(strike)
|
||||||
|
.where(eq(strike.reportId, values.reportId))
|
||||||
|
.leftJoin(strikeReason, eq(strike.strikeReasonId, strikeReason.id));
|
||||||
|
|
||||||
|
return strikes[0] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getStrikesByTeamId(db: Database, values: GetStrikesByTeamIdReq) {
|
export async function getStrikesByTeamId(db: Database, values: GetStrikesByTeamIdReq) {
|
||||||
|
Reference in New Issue
Block a user