Skip to content

Commit 4703e18

Browse files
committed
Fix for checks
1 parent 4bbd131 commit 4703e18

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

backend/samfundet/serializers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import re
44
import datetime
55
import itertools
6-
from typing import TYPE_CHECKING
6+
from typing import TYPE_CHECKING, Any
77
from collections import defaultdict
88

99
from PIL import Image as PilImage
@@ -247,13 +247,13 @@ def get_image(self, obj: Event) -> dict:
247247
"tags": list(img.tags.values_list("id", flat=True))
248248
}
249249

250-
def update(self, instance, validated_data) -> Event:
250+
def update(self, instance: Event, validated_data: dict[str, Any]) -> Event:
251251
image_id = validated_data.pop("image_id", None)
252252
if image_id is not None:
253253
try:
254254
instance.image = Image.objects.get(pk=image_id)
255-
except Image.DoesNotExist:
256-
raise serializers.ValidationError({"image_id": "Invalid image id"})
255+
except Image.DoesNotExist as err:
256+
raise serializers.ValidationError({"image_id": "Invalid image id"}) from err
257257

258258
for attr, value in validated_data.items():
259259
setattr(instance, attr, value)

frontend/src/PagesAdmin/EventCreatorAdminPage/EventCreatorAdminPage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import {
2424
import type { DropdownOption } from '~/Components/Dropdown/Dropdown';
2525
import { ImagePicker } from '~/Components/ImagePicker/ImagePicker';
2626
import { type Tab, TabBar } from '~/Components/TabBar/TabBar';
27-
import { getEvent, getImages, getVenues, postEvent, putEvent } from '~/api';
27+
import { getEvent, getVenues, postEvent, putEvent } from '~/api';
2828
import { BACKEND_DOMAIN } from '~/constants';
29-
import type { EventDto, ImageDto } from '~/dto';
29+
import type { EventDto } from '~/dto';
3030
import { useCustomNavigate, usePrevious, useTitle } from '~/hooks';
3131
import { KEY } from '~/i18n/constants';
3232
import { venueKeys } from '~/queryKeys';

frontend/src/api.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,15 +294,15 @@ export async function getEvents(): Promise<EventDto[]> {
294294

295295
export async function postEvent(data: Partial<EventDto>): Promise<AxiosResponse<EventDto>> {
296296
const transformed = { ...data, image_id: data.image?.id };
297-
delete transformed.image;
297+
transformed.image = undefined;
298298
const url = BACKEND_DOMAIN + ROUTES.backend.samfundet__events_list;
299299
const response = await axios.post<EventDto>(url, transformed, { withCredentials: true });
300300
return response;
301301
}
302302

303303
export async function putEvent(id: string | number, data: Partial<EventDto>): Promise<AxiosResponse<EventDto>> {
304304
const transformed = { ...data, image_id: data.image?.id };
305-
delete transformed.image;
305+
transformed.image = undefined;
306306
const url = BACKEND_DOMAIN + reverse({ pattern: ROUTES.backend.samfundet__events_detail, urlParams: { pk: id } });
307307
const response = await axios.put<EventDto>(url, transformed, { withCredentials: true });
308308
return response;

frontend/src/dto.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ export type EventDto = {
162162

163163
// General info
164164
id: number;
165-
image_id: number;
166165
title_nb: string;
167166
title_en: string;
168167
description_long_nb: string;
@@ -179,7 +178,6 @@ export type EventDto = {
179178
registration_url?: string;
180179

181180
// Timestamps/duration
182-
image_url: string;
183181
start_dt: string;
184182
duration: number;
185183
end_dt: string;
@@ -195,6 +193,8 @@ export type EventDto = {
195193

196194
// Write only:
197195
// Used to create new event with using id of existing imagedto
196+
image_id?: number;
197+
image_url: string;
198198
image?: ImageDto;
199199
capacity?: number;
200200
};

0 commit comments

Comments
 (0)