From d343a3f5a37dfbf066d85563a119f02181bc0601 Mon Sep 17 00:00:00 2001
From: Jan Sandr <Jan.Sandr2@ibm.com>
Date: Sun, 17 Dec 2023 15:25:44 +0100
Subject: [PATCH] Updated annotation for DB
---
.../cz/cvut/fit/tjv/vectorSandbox_api/domain/Editor.java | 8 +++++++-
.../cz/cvut/fit/tjv/vectorSandbox_api/domain/Shape.java | 7 +++++--
.../fit/tjv/vectorSandbox_api/domain/VectorCanvas.java | 2 +-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Editor.java b/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Editor.java
index b2a934e..6400c4b 100644
--- a/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Editor.java
+++ b/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Editor.java
@@ -8,16 +8,22 @@ import java.util.ArrayList;
import java.util.Collection;
@Entity
-@Table(name = "editors")
+@Table(name = "editor")
public class Editor implements EntityWithId<String> {
@Id
private String username = "";
+ @Column(name = "realname")
private String realName ;
@ManyToMany
@JsonIgnore
+ @JoinTable(
+ name = "vector_canvas_editor",
+ joinColumns = @JoinColumn(name = "editorname"),
+ inverseJoinColumns = @JoinColumn(name = "canvasname")
+ )
private Collection<VectorCanvas> editedByMe;
@OneToMany(mappedBy = "author")
diff --git a/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Shape.java b/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Shape.java
index 578fef2..81feadc 100644
--- a/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Shape.java
+++ b/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/Shape.java
@@ -6,21 +6,24 @@ import jakarta.persistence.*;
import java.util.Objects;
@Entity
-@Table(name = "shapes")
+@Table(name = "shape")
public class Shape implements EntityWithId<Long> {
@Id
- @GeneratedValue
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "idshape")
private Long idShape;
private String definition;
@ManyToOne
@JsonIgnore
+ @JoinColumn(name = "author")
private Editor author ;
@ManyToOne
@JsonIgnore
+ @JoinColumn(name = "outputcanvas")
private VectorCanvas outputCanvas ;
@Override
diff --git a/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/VectorCanvas.java b/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/VectorCanvas.java
index dd3e8b4..76d1798 100644
--- a/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/VectorCanvas.java
+++ b/src/main/java/cz/cvut/fit/tjv/vectorSandbox_api/domain/VectorCanvas.java
@@ -6,7 +6,7 @@ import jakarta.persistence.*;
import java.util.Collection;
@Entity
-@Table(name = "canvases")
+@Table(name = "vector_canvas")
public class VectorCanvas implements EntityWithId<String> {
@Id
private String name = "";
--
GitLab