Skip to content

DRAFT: break: Stricter date checks #196

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

Open
nickredmark wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DRAFT: break: Stricter date checks #196

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
2 changes: 1 addition & 1 deletion src/models/model-definitions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type FieldDefinitionBase2 =
| {
type: 'DateTime';
dateTimeType?: 'year' | 'date' | 'datetime' | 'year_and_month';
endOfDay?: boolean;
endOfPeriod?: boolean;
}
| ({
type: 'Int';
Expand Down
38 changes: 30 additions & 8 deletions src/resolvers/mutations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { GraphQLResolveInfo } from 'graphql';
import { DateTimeUnit } from 'luxon';
import { v4 as uuid } from 'uuid';
import { Context, FullContext } from '../context';
import { ForbiddenError, GraphQLError } from '../errors';
import { EntityField, EntityModel } from '../models/models';
import { ForbiddenError, GraphQLError, UserInputError } from '../errors';
import { EntityModel } from '../models/models';
import { Entity } from '../models/mutation-hook';
import { get, isPrimitive, it, typeToField } from '../models/utils';
import { applyPermissions, checkCanWrite, getEntityToMutate } from '../permissions/check';
Expand Down Expand Up @@ -368,9 +369,33 @@ const sanitize = (ctx: FullContext, model: EntityModel, data: Entity) => {
continue;
}

if (isEndOfDay(field) && data[key]) {
data[key] = anyDateToLuxon(data[key], ctx.timeZone).endOf('day');
continue;
if (isPrimitive(field) && field.type === 'DateTime' && data[key]) {
let date = anyDateToLuxon(data[key], ctx.timeZone);
const period: DateTimeUnit =
field.dateTimeType === 'date'
? 'day'
: field.dateTimeType === 'year_and_month'
? 'month'
: field.dateTimeType === 'year'
? 'year'
: undefined;

if (period) {
if (field.endOfPeriod) {
if (!date.equals(date.startOf(period))) {
if (date.equals(date.startOf(period))) {
date = date.endOf(period);
} else {
throw new UserInputError(`Date ${data[key]} for ${key} is not at the end (or beginning) of the ${period}.`);
}
}
} else {
if (!date.equals(date.startOf('day'))) {
throw new UserInputError(`Date ${data[key]} for ${key} is not at the beginning of the ${period}.`);
}
}
}
data[key] = date;
}

if (field.list && field.kind === 'enum' && Array.isArray(data[key])) {
Expand All @@ -379,6 +404,3 @@ const sanitize = (ctx: FullContext, model: EntityModel, data: Entity) => {
}
}
};

const isEndOfDay = (field?: EntityField) =>
isPrimitive(field) && field.type === 'DateTime' && field?.endOfDay === true && field?.dateTimeType === 'date';