Compare commits
10 Commits
f11cca534f
...
e5cdce164a
| Author | SHA1 | Date | |
|---|---|---|---|
| e5cdce164a | |||
| 73b4fb84e7 | |||
| 932155c559 | |||
| a5bb5d45a3 | |||
| b2a798d90e | |||
| 23c821937f | |||
| 9df6d6f0c6 | |||
| ebaf42d83d | |||
| 56e6143fd2 | |||
| ed769b18a4 |
3
backend/.gitignore
vendored
3
backend/.gitignore
vendored
@@ -31,3 +31,6 @@ build/
|
|||||||
|
|
||||||
### VS Code ###
|
### VS Code ###
|
||||||
.vscode/
|
.vscode/
|
||||||
|
|
||||||
|
### Local dev config (may contain secrets / local DB credentials) ###
|
||||||
|
src/main/resources/application-dev.yml
|
||||||
|
|||||||
@@ -191,11 +191,11 @@ public class RecipeService {
|
|||||||
// ── Image validation ──
|
// ── Image validation ──
|
||||||
|
|
||||||
private static final java.util.regex.Pattern ALLOWED_IMAGE_PATTERN =
|
private static final java.util.regex.Pattern ALLOWED_IMAGE_PATTERN =
|
||||||
java.util.regex.Pattern.compile("^data:image/(jpeg|jpg|png|gif|webp);base64,");
|
java.util.regex.Pattern.compile("data:image/(jpeg|jpg|png|gif|webp);base64,.*");
|
||||||
|
|
||||||
private void validateHeroImageUrl(String heroImageUrl) {
|
private void validateHeroImageUrl(String heroImageUrl) {
|
||||||
if (heroImageUrl == null || heroImageUrl.isBlank()) return;
|
if (heroImageUrl == null || heroImageUrl.isBlank()) return;
|
||||||
if (!ALLOWED_IMAGE_PATTERN.matcher(heroImageUrl).find()) {
|
if (!ALLOWED_IMAGE_PATTERN.matcher(heroImageUrl).matches()) {
|
||||||
throw new ValidationException("Ungültiger Bildtyp. Erlaubt sind: JPEG, PNG, GIF, WebP.");
|
throw new ValidationException("Ungültiger Bildtyp. Erlaubt sind: JPEG, PNG, GIF, WebP.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ public record RecipeCreateRequest(
|
|||||||
Integer serves,
|
Integer serves,
|
||||||
Integer cookTimeMin,
|
Integer cookTimeMin,
|
||||||
@NotBlank @Pattern(regexp = "easy|medium|hard") String effort,
|
@NotBlank @Pattern(regexp = "easy|medium|hard") String effort,
|
||||||
String heroImageUrl,
|
@Size(max = 7_000_000) String heroImageUrl,
|
||||||
@NotEmpty @Valid List<IngredientEntry> ingredients,
|
@NotEmpty @Valid List<IngredientEntry> ingredients,
|
||||||
@Valid List<StepEntry> steps,
|
@Valid List<StepEntry> steps,
|
||||||
@NotEmpty List<UUID> tagIds
|
@NotEmpty List<UUID> tagIds
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ spring:
|
|||||||
|
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
|
# NOTE: these limits only apply to multipart/form-data uploads.
|
||||||
|
# Images sent as base64 inside a JSON body (Content-Type: application/json)
|
||||||
|
# are NOT constrained here — the @Size(max=7_000_000) annotation on
|
||||||
|
# RecipeCreateRequest.heroImageUrl enforces the limit for that path.
|
||||||
max-file-size: 5MB
|
max-file-size: 5MB
|
||||||
max-request-size: 6MB
|
max-request-size: 6MB
|
||||||
|
|
||||||
|
|||||||
@@ -80,6 +80,17 @@ class ImageCompressorTest {
|
|||||||
assertThat(compressor.compressToPreview("data:image/jpeg;base64,!!!not-valid!!!")).isNull();
|
assertThat(compressor.compressToPreview("data:image/jpeg;base64,!!!not-valid!!!")).isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void compressToPreview_acceptsJpegInput() throws Exception {
|
||||||
|
String dataUri = makeJpegDataUri(800, 600);
|
||||||
|
String result = compressor.compressToPreview(dataUri);
|
||||||
|
assertThat(result).startsWith("data:image/jpeg;base64,");
|
||||||
|
String base64 = result.substring("data:image/jpeg;base64,".length());
|
||||||
|
BufferedImage img = ImageIO.read(new ByteArrayInputStream(Base64.getDecoder().decode(base64)));
|
||||||
|
assertThat(img).isNotNull();
|
||||||
|
assertThat(img.getWidth()).isLessThanOrEqualTo(400);
|
||||||
|
}
|
||||||
|
|
||||||
// ── helpers ──
|
// ── helpers ──
|
||||||
|
|
||||||
private String makePngDataUri(int width, int height) throws Exception {
|
private String makePngDataUri(int width, int height) throws Exception {
|
||||||
@@ -95,4 +106,15 @@ class ImageCompressorTest {
|
|||||||
ImageIO.write(img, "png", bos);
|
ImageIO.write(img, "png", bos);
|
||||||
return "data:image/png;base64," + Base64.getEncoder().encodeToString(bos.toByteArray());
|
return "data:image/png;base64," + Base64.getEncoder().encodeToString(bos.toByteArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String makeJpegDataUri(int width, int height) throws Exception {
|
||||||
|
BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
|
||||||
|
java.awt.Graphics2D g = img.createGraphics();
|
||||||
|
g.setColor(java.awt.Color.ORANGE);
|
||||||
|
g.fillRect(0, 0, width, height);
|
||||||
|
g.dispose();
|
||||||
|
ByteArrayOutputStream bos = new ByteArrayOutputStream();
|
||||||
|
ImageIO.write(img, "jpeg", bos);
|
||||||
|
return "data:image/jpeg;base64," + Base64.getEncoder().encodeToString(bos.toByteArray());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,6 +161,33 @@ class RecipeControllerTest {
|
|||||||
verify(recipeService).deleteRecipe(HOUSEHOLD_ID, RECIPE_ID);
|
verify(recipeService).deleteRecipe(HOUSEHOLD_ID, RECIPE_ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createRecipeWithOversizedHeroImageShouldReturn400() throws Exception {
|
||||||
|
String heroImageUrl = "data:image/jpeg;base64," + "A".repeat(7_000_000);
|
||||||
|
String body = "{\"name\":\"Test\",\"effort\":\"easy\",\"tagIds\":[\"" + UUID.randomUUID() + "\"]," +
|
||||||
|
"\"ingredients\":[{\"quantity\":1,\"unit\":\"g\",\"newIngredientName\":\"x\",\"sortOrder\":0}]," +
|
||||||
|
"\"heroImageUrl\":\"" + heroImageUrl + "\"}";
|
||||||
|
|
||||||
|
mockMvc.perform(post("/v1/recipes")
|
||||||
|
.principal(() -> "sarah@example.com")
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.content(body))
|
||||||
|
.andExpect(status().isBadRequest());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createRecipeWithEmptyIngredientsListShouldReturn400() throws Exception {
|
||||||
|
var body = """
|
||||||
|
{"name":"Test","effort":"easy","tagIds":["%s"],"ingredients":[]}
|
||||||
|
""".formatted(UUID.randomUUID());
|
||||||
|
|
||||||
|
mockMvc.perform(post("/v1/recipes")
|
||||||
|
.principal(() -> "sarah@example.com")
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.content(body))
|
||||||
|
.andExpect(status().isBadRequest());
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void createRecipeWithCapitalisedEffortShouldReturn400() throws Exception {
|
void createRecipeWithCapitalisedEffortShouldReturn400() throws Exception {
|
||||||
var body = """
|
var body = """
|
||||||
|
|||||||
@@ -589,6 +589,8 @@ class RecipeServiceTest {
|
|||||||
when(householdRepository.findById(HOUSEHOLD_ID)).thenReturn(Optional.of(household));
|
when(householdRepository.findById(HOUSEHOLD_ID)).thenReturn(Optional.of(household));
|
||||||
when(recipeRepository.save(any(Recipe.class))).thenAnswer(i -> i.getArgument(0));
|
when(recipeRepository.save(any(Recipe.class))).thenAnswer(i -> i.getArgument(0));
|
||||||
|
|
||||||
|
// "abc" is not valid base64 for a real image; ImageCompressor will return null for the
|
||||||
|
// preview, but validateHeroImageUrl() should pass for a well-formed data URI prefix.
|
||||||
var request = new RecipeCreateRequest(
|
var request = new RecipeCreateRequest(
|
||||||
"Test", null, null, "easy", "data:image/jpeg;base64,abc",
|
"Test", null, null, "easy", "data:image/jpeg;base64,abc",
|
||||||
List.of(), List.of(), List.of());
|
List.of(), List.of(), List.of());
|
||||||
@@ -604,4 +606,30 @@ class RecipeServiceTest {
|
|||||||
|
|
||||||
assertThat(result).isEmpty();
|
assertThat(result).isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void createRecipeShouldStoreNullPreviewWhenCompressorReturnsNull() {
|
||||||
|
var household = testHousehold();
|
||||||
|
when(householdRepository.findById(HOUSEHOLD_ID)).thenReturn(Optional.of(household));
|
||||||
|
when(imageCompressor.compressToPreview(any())).thenReturn(null);
|
||||||
|
when(recipeRepository.save(any(Recipe.class))).thenAnswer(i -> {
|
||||||
|
Recipe r = i.getArgument(0);
|
||||||
|
try {
|
||||||
|
var field = Recipe.class.getDeclaredField("id");
|
||||||
|
field.setAccessible(true);
|
||||||
|
field.set(r, UUID.randomUUID());
|
||||||
|
} catch (Exception e) { throw new RuntimeException(e); }
|
||||||
|
return r;
|
||||||
|
});
|
||||||
|
|
||||||
|
var request = new RecipeCreateRequest(
|
||||||
|
"Soup", null, null, "easy", "data:image/jpeg;base64,abc",
|
||||||
|
List.of(), List.of(), List.of());
|
||||||
|
|
||||||
|
RecipeDetailResponse result = recipeService.createRecipe(HOUSEHOLD_ID, request);
|
||||||
|
|
||||||
|
assertThat(result.id()).isNotNull();
|
||||||
|
// verify the recipe was saved without a preview (compressor returned null)
|
||||||
|
verify(recipeRepository).save(argThat(r -> r.getHeroImagePreview() == null));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,6 +64,7 @@
|
|||||||
let imageError = $state<string | null>(null);
|
let imageError = $state<string | null>(null);
|
||||||
|
|
||||||
const MAX_IMAGE_BYTES = 5 * 1024 * 1024;
|
const MAX_IMAGE_BYTES = 5 * 1024 * 1024;
|
||||||
|
const ALLOWED_MIME_TYPES = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp'];
|
||||||
|
|
||||||
function handleImageChange(e: Event) {
|
function handleImageChange(e: Event) {
|
||||||
const file = (e.currentTarget as HTMLInputElement).files?.[0];
|
const file = (e.currentTarget as HTMLInputElement).files?.[0];
|
||||||
@@ -73,6 +74,11 @@
|
|||||||
(e.currentTarget as HTMLInputElement).value = '';
|
(e.currentTarget as HTMLInputElement).value = '';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!ALLOWED_MIME_TYPES.includes(file.type)) {
|
||||||
|
imageError = 'Dateityp nicht unterstützt. Erlaubt: JPEG, PNG, GIF, WebP.';
|
||||||
|
(e.currentTarget as HTMLInputElement).value = '';
|
||||||
|
return;
|
||||||
|
}
|
||||||
imageError = null;
|
imageError = null;
|
||||||
const reader = new FileReader();
|
const reader = new FileReader();
|
||||||
reader.onload = () => {
|
reader.onload = () => {
|
||||||
@@ -137,7 +143,7 @@
|
|||||||
for="cookTimeMin"
|
for="cookTimeMin"
|
||||||
class="mb-[6px] block text-[12px] font-medium text-[var(--color-text)]"
|
class="mb-[6px] block text-[12px] font-medium text-[var(--color-text)]"
|
||||||
>
|
>
|
||||||
Kochzeit
|
Kochzeit (min)
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
id="cookTimeMin"
|
id="cookTimeMin"
|
||||||
@@ -189,7 +195,7 @@
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onclick={() => (heroImageUrl = null)}
|
onclick={() => (heroImageUrl = null)}
|
||||||
class="mb-[8px] text-[12px] text-[var(--color-text-muted)] hover:text-[var(--color-error)] cursor-pointer"
|
class="mb-[8px] text-[12px] text-[var(--color-error)] opacity-60 hover:opacity-100 cursor-pointer"
|
||||||
>
|
>
|
||||||
Bild entfernen
|
Bild entfernen
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -189,4 +189,26 @@ describe('RecipeForm', () => {
|
|||||||
|
|
||||||
expect(screen.queryByText(/datei zu groß/i)).not.toBeInTheDocument();
|
expect(screen.queryByText(/datei zu groß/i)).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('shows error when selected file has unsupported type', async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
render(RecipeForm, { props: emptyProps });
|
||||||
|
|
||||||
|
const bmpFile = new File(['content'], 'image.bmp', { type: 'image/bmp' });
|
||||||
|
const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
|
||||||
|
await user.upload(fileInput, bmpFile);
|
||||||
|
|
||||||
|
expect(screen.getByText(/dateityp/i)).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not show type error for supported image types', async () => {
|
||||||
|
const user = userEvent.setup();
|
||||||
|
render(RecipeForm, { props: emptyProps });
|
||||||
|
|
||||||
|
const jpgFile = new File(['content'], 'photo.jpg', { type: 'image/jpeg' });
|
||||||
|
const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement;
|
||||||
|
await user.upload(fileInput, jpgFile);
|
||||||
|
|
||||||
|
expect(screen.queryByText(/dateityp/i)).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -67,6 +67,13 @@ export const actions: Actions = {
|
|||||||
return fail(400, { error: 'Ungültige Formulardaten' });
|
return fail(400, { error: 'Ungültige Formulardaten' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const filteredIngredients = (
|
||||||
|
parsedIngredients as { name: string; quantity: string; unit: string }[]
|
||||||
|
).filter((ing) => ing.name?.trim() && Number(ing.quantity) > 0);
|
||||||
|
|
||||||
|
if (!filteredIngredients.length)
|
||||||
|
return fail(422, { error: 'Mindestens eine gültige Zutat ist erforderlich' });
|
||||||
|
|
||||||
const api = apiClient(fetch);
|
const api = apiClient(fetch);
|
||||||
const { error: apiError } = await api.PUT('/v1/recipes/{id}', {
|
const { error: apiError } = await api.PUT('/v1/recipes/{id}', {
|
||||||
params: { path: { id: params.id } },
|
params: { path: { id: params.id } },
|
||||||
@@ -76,9 +83,7 @@ export const actions: Actions = {
|
|||||||
cookTimeMin: cookTimeMin ? Number(cookTimeMin) || null : null,
|
cookTimeMin: cookTimeMin ? Number(cookTimeMin) || null : null,
|
||||||
effort,
|
effort,
|
||||||
heroImageUrl,
|
heroImageUrl,
|
||||||
ingredients: (parsedIngredients as { name: string; quantity: string; unit: string }[])
|
ingredients: filteredIngredients.map((ing, i) => ({
|
||||||
.filter((ing) => ing.name?.trim() && Number(ing.quantity) > 0)
|
|
||||||
.map((ing, i) => ({
|
|
||||||
newIngredientName: ing.name.trim(),
|
newIngredientName: ing.name.trim(),
|
||||||
quantity: Number(ing.quantity),
|
quantity: Number(ing.quantity),
|
||||||
unit: ing.unit || '',
|
unit: ing.unit || '',
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ describe('edit recipe page — update action', () => {
|
|||||||
name: 'Test Rezept',
|
name: 'Test Rezept',
|
||||||
effort: 'easy',
|
effort: 'easy',
|
||||||
tagIds: ['t1'],
|
tagIds: ['t1'],
|
||||||
ingredientsJson: '[]',
|
ingredientsJson: JSON.stringify([{ name: 'Spaghetti', quantity: 200, unit: 'g' }]),
|
||||||
stepsJson: '[]',
|
stepsJson: '[]',
|
||||||
...overrides
|
...overrides
|
||||||
};
|
};
|
||||||
@@ -236,6 +236,24 @@ describe('edit recipe page — update action', () => {
|
|||||||
expect(body.ingredients[0].newIngredientName).toBe('Spaghetti');
|
expect(body.ingredients[0].newIngredientName).toBe('Spaghetti');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('returns fail(422) when all ingredients filter to empty after quantity check', async () => {
|
||||||
|
const result = await actions.update({
|
||||||
|
request: {
|
||||||
|
formData: async () =>
|
||||||
|
makeFormData({
|
||||||
|
ingredientsJson: JSON.stringify([
|
||||||
|
{ name: 'Salt', quantity: 0, unit: 'tsp' },
|
||||||
|
{ name: '', quantity: 100, unit: 'g' }
|
||||||
|
])
|
||||||
|
})
|
||||||
|
},
|
||||||
|
fetch: vi.fn(),
|
||||||
|
params: { id: 'r1' }
|
||||||
|
} as any);
|
||||||
|
expect(result.status).toBe(422);
|
||||||
|
expect(result.data.error).toMatch(/zutat/i);
|
||||||
|
});
|
||||||
|
|
||||||
it('returns fail(500) when API returns error', async () => {
|
it('returns fail(500) when API returns error', async () => {
|
||||||
mockPut.mockResolvedValue({ error: { status: 500 } });
|
mockPut.mockResolvedValue({ error: { status: 500 } });
|
||||||
const result = await actions.update({
|
const result = await actions.update({
|
||||||
|
|||||||
@@ -40,6 +40,13 @@ export const actions: Actions = {
|
|||||||
return fail(400, { error: 'Ungültige Formulardaten' });
|
return fail(400, { error: 'Ungültige Formulardaten' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const filteredIngredients = (
|
||||||
|
parsedIngredients as { name: string; quantity: string; unit: string }[]
|
||||||
|
).filter((ing) => ing.name?.trim() && Number(ing.quantity) > 0);
|
||||||
|
|
||||||
|
if (!filteredIngredients.length)
|
||||||
|
return fail(422, { error: 'Mindestens eine gültige Zutat ist erforderlich' });
|
||||||
|
|
||||||
const api = apiClient(fetch);
|
const api = apiClient(fetch);
|
||||||
const { error: apiError } = await api.POST('/v1/recipes', {
|
const { error: apiError } = await api.POST('/v1/recipes', {
|
||||||
body: {
|
body: {
|
||||||
@@ -48,9 +55,7 @@ export const actions: Actions = {
|
|||||||
cookTimeMin: cookTimeMin ? Number(cookTimeMin) || null : null,
|
cookTimeMin: cookTimeMin ? Number(cookTimeMin) || null : null,
|
||||||
effort,
|
effort,
|
||||||
heroImageUrl,
|
heroImageUrl,
|
||||||
ingredients: (parsedIngredients as { name: string; quantity: string; unit: string }[])
|
ingredients: filteredIngredients.map((ing, i) => ({
|
||||||
.filter((ing) => ing.name?.trim() && Number(ing.quantity) > 0)
|
|
||||||
.map((ing, i) => ({
|
|
||||||
newIngredientName: ing.name.trim(),
|
newIngredientName: ing.name.trim(),
|
||||||
quantity: Number(ing.quantity),
|
quantity: Number(ing.quantity),
|
||||||
unit: ing.unit || '',
|
unit: ing.unit || '',
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ describe('new recipe page — create action', () => {
|
|||||||
name: 'Test Rezept',
|
name: 'Test Rezept',
|
||||||
effort: 'easy',
|
effort: 'easy',
|
||||||
tagIds: ['t1'],
|
tagIds: ['t1'],
|
||||||
ingredientsJson: '[]',
|
ingredientsJson: JSON.stringify([{ name: 'Spaghetti', quantity: 200, unit: 'g' }]),
|
||||||
stepsJson: '[]',
|
stepsJson: '[]',
|
||||||
...overrides
|
...overrides
|
||||||
};
|
};
|
||||||
@@ -189,6 +189,23 @@ describe('new recipe page — create action', () => {
|
|||||||
expect(body.ingredients[0].newIngredientName).toBe('Spaghetti');
|
expect(body.ingredients[0].newIngredientName).toBe('Spaghetti');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('returns fail(422) when all ingredients filter to empty after quantity check', async () => {
|
||||||
|
const result = await actions.create({
|
||||||
|
request: {
|
||||||
|
formData: async () =>
|
||||||
|
makeFormData({
|
||||||
|
ingredientsJson: JSON.stringify([
|
||||||
|
{ name: 'Salt', quantity: 0, unit: 'tsp' },
|
||||||
|
{ name: '', quantity: 100, unit: 'g' }
|
||||||
|
])
|
||||||
|
})
|
||||||
|
},
|
||||||
|
fetch: vi.fn()
|
||||||
|
} as any);
|
||||||
|
expect(result.status).toBe(422);
|
||||||
|
expect(result.data.error).toMatch(/zutat/i);
|
||||||
|
});
|
||||||
|
|
||||||
it('returns fail(500) when API returns error', async () => {
|
it('returns fail(500) when API returns error', async () => {
|
||||||
mockPost.mockResolvedValue({ error: { status: 500 } });
|
mockPost.mockResolvedValue({ error: { status: 500 } });
|
||||||
const result = await actions.create({
|
const result = await actions.create({
|
||||||
|
|||||||
Reference in New Issue
Block a user