From 8191138d20a3891de940cc4d2ec2678de0702264 Mon Sep 17 00:00:00 2001
From: Tim <47184194+imgde@users.noreply.github.com>
Date: Fri, 23 May 2025 11:27:18 +0200
Subject: [PATCH] Fix Repo Entities

---
 .../webshop/repository/entities/ArticleConfiguration.java  | 5 +++--
 .../java/de/htwsaar/webshop/repository/entities/Image.java | 5 +++--
 .../java/de/htwsaar/webshop/repository/entities/Order.java | 2 +-
 .../de/htwsaar/webshop/repository/entities/Review.java     | 2 +-
 .../de/htwsaar/webshop/service/impl/ImageServiceImpl.java  | 7 ++-----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/ArticleConfiguration.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/ArticleConfiguration.java
index 44a7439..11ba0e1 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/ArticleConfiguration.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/ArticleConfiguration.java
@@ -21,8 +21,9 @@ public class ArticleConfiguration {
     @Column(name = "id", nullable = false)
     private Long id;
 
-    @Column(name = "articleId", nullable = false)
-    private Long articleId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "articleId", referencedColumnName = "id", nullable = false)
+    private Article article;
 
     @Column(name = "name", nullable = false)
     private String name;
diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Image.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Image.java
index f459942..9e00e6e 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Image.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Image.java
@@ -18,8 +18,9 @@ public class Image {
     @Column(name = "id", nullable = false)
     private Long id;
 
-    @Column(name = "articleId", nullable = false)
-    private Long articleId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "articleId", referencedColumnName = "id", nullable = false)
+    private Article article;
 
     @Column(name = "uri", nullable = false)
     private String uri;
diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java
index a8ded50..9c3024f 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java
@@ -10,7 +10,7 @@ public class Order {
     private Long id;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @MapsId("customerId")
+    @JoinColumn(name = "customerId")
     private Customer customer;
 
     @Column(name = "time")
diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java
index 7bbaf3e..c28d049 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Review.java
@@ -24,7 +24,7 @@ public class Review {
     private String content;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @MapsId("articleId")
+    @JoinColumn(name = "articleId", referencedColumnName = "id", nullable = false)
     private Article article;
 
     @PositiveOrZero
diff --git a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java
index c223185..9d2be28 100644
--- a/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java
+++ b/00-backend/src/main/java/de/htwsaar/webshop/service/impl/ImageServiceImpl.java
@@ -3,7 +3,6 @@ package de.htwsaar.webshop.service.impl;
 import de.htwsaar.webshop.model.ImageModel;
 import de.htwsaar.webshop.repository.ImageRepository;
 import de.htwsaar.webshop.repository.entities.Image;
-import de.htwsaar.webshop.service.ArticleService;
 import de.htwsaar.webshop.service.ImageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,12 +14,10 @@ import java.util.List;
 @Slf4j
 public class ImageServiceImpl implements ImageService {
     private final ImageRepository imageRepository;
-    private final ArticleService articleService;
 
     @Autowired
-    public ImageServiceImpl(ImageRepository imageRepository, ArticleService articleService) {
+    public ImageServiceImpl(ImageRepository imageRepository) {
         this.imageRepository = imageRepository;
-        this.articleService = articleService;
     }
 
 
@@ -46,7 +43,7 @@ public class ImageServiceImpl implements ImageService {
 
     @Override
     public ImageModel from(Image image) {
-        return new ImageModel(articleService.findById(image.getArticleId()).getUuid(), image.getUri());
+        return new ImageModel(image.getArticle().getUuid(), image.getUri());
     }
 
     @Override