Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -4,12 +4,29 @@
 import lombok.Setter;
 
-import javax.persistence.Embeddable;
+import javax.persistence.*;
 import java.io.Serializable;
+import java.util.Objects;
+
 @Embeddable
 @Getter
 @Setter
 public class AnswerId implements Serializable {
-    private Long answerid;
-    private Long questionid;
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer answerid;
+    @ManyToOne
+    @JoinColumn(name="questionid")
+    private questions question;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AnswerId answerId = (AnswerId) o;
+        return answerid.equals(answerId.answerid) && question.equals(answerId.question);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(answerid, question);
+    }
 
 
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/User.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/User.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/User.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -16,5 +16,5 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long userid;
+    private Integer userid;
     @Column(nullable = false)
     @NotNull(message = "The user must have an first name")
@@ -36,5 +36,5 @@
     @NotNull(message = "The user must have an password")
     @NotEmpty(message = "The user must have an password")
-    private String password;
+    private String userpassword;
 
     public User(String firstname, String lastname, String username, String email, String password) {
@@ -43,5 +43,5 @@
         this.username = username;
         this.email = email;
-        this.password = password;
+        this.userpassword = password;
     }
 
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/answers.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/answers.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/answers.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -5,7 +5,5 @@
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
+import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/articles.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/articles.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/articles.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -15,11 +15,11 @@
 @NoArgsConstructor
 public class articles {
-        @Id
-        @GeneratedValue(strategy = GenerationType.IDENTITY)
-        private Long articleid;
-        @Column(nullable = false)
-        @NotNull(message = "Article must have description")
-        @NotEmpty(message = "Article must have description")
-        private String description;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer articleid;
+    @Column(nullable = false)
+    @NotNull(message = "Article must have description")
+    @NotEmpty(message = "Article must have description")
+    private String description;
     @Column(nullable = false)
     @NotNull(message = "Article must have name")
@@ -29,5 +29,4 @@
     @Column(nullable = false)
     @NotNull(message = "Article must have max quantity")
-    @NotEmpty(message = "Article must have max quantity")
     private int maxquantityperlocation;
     @ManyToMany
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/categories.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/categories.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/categories.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -16,5 +16,5 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long categoryid;
+    private Integer categoryid;
     @Column(nullable = false)
     @NotNull(message = "Category must have name")
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoicedarticles.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoicedarticles.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoicedarticles.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -15,13 +15,11 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long iarticleid;
+    private Integer iarticleid;
     @Column(nullable = false)
     @NotNull(message = "Invoiced Article must have price")
-    @NotEmpty(message = "Invoiced Article must have price")
     @Min(0)
     private int price;
     @Column(nullable = false)
     @NotNull(message = "Invoiced Article must have quantity")
-    @NotEmpty(message = "Invoiced Article must have quantity")
     @Min(0)
     private int quantity;
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoices.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoices.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoices.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -15,5 +15,5 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long invoiceid;
+    private Integer invoiceid;
     @Column(nullable = false)
     @NotNull(message = "Invoice must have customer name")
@@ -30,5 +30,4 @@
     @Column(nullable = false)
     @NotNull(message = "Invoice must have customer street number")
-    @NotEmpty(message = "Invoice must have customer street number")
     private int streetnumber;
     @Column(nullable = false)
@@ -38,5 +37,4 @@
     @Column(nullable = false)
     @NotNull(message = "Invoice must have creation date")
-    @NotEmpty(message = "Invoice must have creation date")
     private LocalDateTime datecreate;
     @ManyToOne
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/locations.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/locations.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/locations.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -14,5 +14,5 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long locationid;
+    private Integer locationid;
     @Column(nullable = false)
     @NotNull(message = "Location must have name")
@@ -29,6 +29,5 @@
     @Column(nullable = false)
     @NotNull(message = "Location must have street number")
-    @NotEmpty(message = "Location must have street number")
-    private String streetnumber;
+    private Integer streetnumber;
     @Column(nullable = false)
     @NotNull(message = "Location must have city")
@@ -36,5 +35,5 @@
     private String city;
 
-    public locations(String locationname, String phone, String street, String streetnumber, String city) {
+    public locations(String locationname, String phone, String street, Integer streetnumber, String city) {
         this.locationname = locationname;
         this.phone = phone;
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/orderedarticles.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/orderedarticles.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/orderedarticles.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -16,13 +16,9 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long oarticleid;
-    @Column(nullable = false)
-    @NotNull(message = "Ordered Article must have price")
-    @NotEmpty(message = "Ordered Article must have price")
+    private Integer oarticleid;
     @Min(0)
     private int price;
     @Column(nullable = false)
     @NotNull(message = "Ordered Article must have quantity")
-    @NotEmpty(message = "Ordered Article must have quantity")
     @Min(0)
     private int quantity;
@@ -32,5 +28,5 @@
     private String articlestatus;
     @ManyToOne
-    @JoinColumn(name = "orederid")
+    @JoinColumn(name = "orderid")
     private orders order;
     @ManyToOne
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/orders.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/orders.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/orders.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -15,5 +15,5 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long orederid;
+    private Integer orderid;
     @Column(nullable = false)
     @NotNull(message = "Order must have status")
@@ -24,5 +24,4 @@
     @Column(nullable = false)
     @NotNull(message = "Order must have creation date")
-    @NotEmpty(message = "Order must have creation date")
     private LocalDateTime datecreated;
     private LocalDateTime dateapproved;
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/questions.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/questions.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/questions.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -17,5 +17,5 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long questionid;
+    private Integer questionid;
     @Column(nullable = false)
     @NotNull(message = "Question must have content")
@@ -24,5 +24,4 @@
     @Column(nullable = false)
     @NotNull(message = "Question must have creation date")
-    @NotEmpty(message = "Question must have creation date")
     private LocalDateTime datecreated;
     @ManyToOne
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/storedarticles.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/storedarticles.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/storedarticles.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -17,8 +17,7 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long sarticleid;
+    private Integer sarticleid;
     @Column(nullable = false)
     @NotNull(message = "Stored Article must have quantity")
-    @NotEmpty(message = "Stored Article must have quantity")
     @Min(0)
     private int quantity;
Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/suppliers.java
===================================================================
--- FullyStocked/src/main/java/com/bazi/fullystocked/Models/suppliers.java	(revision 15f833052244ef212accfd86e9a726f8cf93c67c)
+++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/suppliers.java	(revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2)
@@ -30,6 +30,5 @@
     @Column(nullable = false)
     @NotNull(message = "Supplier must have street number")
-    @NotEmpty(message = "Supplier must have street number")
-    private int sttreetnumber;
+    private int streetnumber;
     @Column(nullable = false)
     @NotNull(message = "Supplier must have street city")
@@ -48,5 +47,5 @@
         this.phone = phone;
         this.street = street;
-        this.sttreetnumber = sttreetnumber;
+        this.streetnumber = sttreetnumber;
         this.city = city;
     }