Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/AnswerId.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -16,5 +16,5 @@ @ManyToOne @JoinColumn(name="questionid") - private questions question; + private Questions question; @Override public boolean equals(Object o) { Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Answers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,28 @@ +package com.bazi.fullystocked.Models; + + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +@Entity +@NoArgsConstructor +@Data +public class Answers { + @EmbeddedId + private AnswerId answerId; + private LocalDateTime datecreated; + @NotNull(message = "The answer must have content") + @NotEmpty(message = "The location must have content") + @Column(nullable = false) + private String answertext; + + public Answers(String answertext) { + this.datecreated = LocalDateTime.now(); + this.answertext = answertext; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Articles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Articles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Articles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,43 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +@Data +@Entity +@NoArgsConstructor +public class Articles { + @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") + @NotEmpty(message = "Article must have name") + private String articlename; + private String imageurl; + @Column(nullable = false) + @NotNull(message = "Article must have max quantity") + private int maxquantityperlocation; + @ManyToMany + @JoinTable(name = "article_belongs_to_category", + joinColumns = @JoinColumn(name = "articleid"), + inverseJoinColumns = @JoinColumn(name = "categoryid") + ) + private List categoryList=new ArrayList<>(); + + public Articles(String description, String articlename, int maxquantityperlocation) { + this.description = description; + this.articlename = articlename; + this.maxquantityperlocation = maxquantityperlocation; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Categories.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Categories.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Categories.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,37 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +@Data +@Entity +@NoArgsConstructor +public class Categories { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer categoryid; + @Column(nullable = false) + @NotNull(message = "Category must have name") + @NotEmpty(message = "Category must have name") + private String categoryname; + @Column(nullable = false) + @NotNull(message = "Category must have description") + @NotEmpty(message = "Category must have description") + private String description; + @ManyToMany(mappedBy = "categoryList") + private List articlesList=new ArrayList<>(); + @ManyToMany(mappedBy = "categoryList2") + private List suppliersList=new ArrayList<>(); + + + public Categories(String categoryname, String description) { + this.categoryname = categoryname; + this.description = description; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/ArticleStatus.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,5 @@ +package com.bazi.fullystocked.Models.Enumerations; + +public enum ArticleStatus { + ORDERED, DELIVERED, PROCESSED +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderPriority.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,5 @@ +package com.bazi.fullystocked.Models.Enumerations; + +public enum OrderPriority { + LOW, MEDIUM, HIGH; +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Enumerations/OrderStatus.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,21 @@ +package com.bazi.fullystocked.Models.Enumerations; + +public enum OrderStatus { + CREATED("Created"), + APPROVED("Approved"), + CANCELED("Canceled"), + IN_PROGRESS("In progress"), + DELIVERED("Delivered"), + REJECTED("Rejected"); + private String name; + + OrderStatus(String s) { + this.name=s; + } + public String getName() { + return this.name; + } + public String toString() { + return name; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidArgumentsException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidArgumentsException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidArgumentsException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,8 @@ +package com.bazi.fullystocked.Models.Exceptions; + +public class InvalidArgumentsException extends RuntimeException { + + public InvalidArgumentsException() { + super("Invalid arguments exception"); + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidUserCredentialsException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidUserCredentialsException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/InvalidUserCredentialsException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,8 @@ +package com.bazi.fullystocked.Models.Exceptions; + +public class InvalidUserCredentialsException extends RuntimeException { + + public InvalidUserCredentialsException() { + super("Invalid user credentials exception"); + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UserNotFoundException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UserNotFoundException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UserNotFoundException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,11 @@ +package com.bazi.fullystocked.Models.Exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +public class UserNotFoundException extends RuntimeException{ + + public UserNotFoundException(String username) { + super(String.format("User with username: %s was not found", username)); + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UsernameAlreadyExistsException.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UsernameAlreadyExistsException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Exceptions/UsernameAlreadyExistsException.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,7 @@ +package com.bazi.fullystocked.Models.Exceptions; + +public class UsernameAlreadyExistsException extends RuntimeException{ + public UsernameAlreadyExistsException(String username) { + super(String.format("User with username: %s already exists", username)); + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/InvoicedArticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/InvoicedArticles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/InvoicedArticles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,39 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +@Data +@Entity +@NoArgsConstructor +@Table(name="invoicedarticles") +public class InvoicedArticles { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer iarticleid; + @Column(nullable = false) + @NotNull(message = "Invoiced Article must have price") + @Min(0) + private int price; + @Column(nullable = false) + @NotNull(message = "Invoiced Article must have quantity") + @Min(0) + private int quantity; + @ManyToOne + @JoinColumn(name = "invoiceid") + private Invoices invoice; + @ManyToOne + @JoinColumn(name = "articleid") + private Articles article; + + public InvoicedArticles(int price, int quantity, Invoices invoice, Articles article) { + this.price = price; + this.quantity = quantity; + this.invoice = invoice; + this.article = article; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Invoices.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Invoices.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Invoices.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,44 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +@Data +@Entity +@NoArgsConstructor +public class Invoices { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer invoiceid; + private String customername; + private String customerphone; + private String street; + private int streetnumber; + private String city; + @Column(nullable = false) + @NotNull(message = "Invoice must have creation date") + private LocalDateTime datecreate; + @ManyToOne + @JoinColumn(name = "workeruserid") + private Workers worker; + + public Invoices(Workers worker) { + + this.datecreate = LocalDateTime.now(); + this.worker = worker; + } + + public Invoices(String customername, String customerphone, String street, int streetnumber, String city, Workers worker) { + this.customername = customername; + this.customerphone = customerphone; + this.street = street; + this.streetnumber = streetnumber; + this.city = city; + this.worker = worker; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Locations.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Locations.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Locations.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,44 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Data +@Entity +@NoArgsConstructor +public class Locations { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer locationid; + @Column(nullable = false) + @NotNull(message = "Location must have name") + @NotEmpty(message = "Location must have name") + private String locationname; + @Column(nullable = false) + @NotNull(message = "Location must have phone") + @NotEmpty(message = "Location must have phone") + private String phone; + @Column(nullable = false) + @NotNull(message = "Location must have street") + @NotEmpty(message = "Location must have street") + private String street; + @Column(nullable = false) + @NotNull(message = "Location must have street number") + private Integer streetnumber; + @Column(nullable = false) + @NotNull(message = "Location must have city") + @NotEmpty(message = "Location must have city") + private String city; + + public Locations(String locationname, String phone, String street, Integer streetnumber, String city) { + this.locationname = locationname; + this.phone = phone; + this.street = street; + this.streetnumber = streetnumber; + this.city = city; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Managers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Managers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Managers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,17 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; + +@Entity +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +public class Managers extends User{ + public Managers(String firstname, String lastname, String username, String email, String password) { + super(firstname, lastname, username, email, password); + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/OrderedArticles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,46 @@ +package com.bazi.fullystocked.Models; + +import com.bazi.fullystocked.Models.Enumerations.ArticleStatus; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Data +@Entity +@NoArgsConstructor +@Table(name="orderedarticles") +public class OrderedArticles { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer oarticleid; + @Min(0) + private int price; + @Column(nullable = false) + @NotNull(message = "Ordered Article must have quantity") + @Min(0) + private int quantity; + @Column(nullable = false) + @Enumerated(EnumType.STRING) + private ArticleStatus articlestatus; + @ManyToOne + @JoinColumn(name = "orderid") + private Orders order; + @ManyToOne + @JoinColumn(name = "locationid") + private Locations location; + @ManyToOne + @JoinColumn(name = "articleid") + private Articles article; + + public OrderedArticles(int quantity, Orders order, Locations location, Articles article) { + this.quantity = quantity; + this.articlestatus = ArticleStatus.ORDERED; + this.order = order; + this.location = location; + this.article = article; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Orders.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Orders.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Orders.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,46 @@ +package com.bazi.fullystocked.Models; + +import com.bazi.fullystocked.Models.Enumerations.OrderPriority; +import com.bazi.fullystocked.Models.Enumerations.OrderStatus; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +@Data +@Entity +@NoArgsConstructor +public class Orders { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer orderid; + @Column(nullable = false) + @Enumerated(EnumType.STRING) + private OrderStatus status; + private String supplierremark; + private String managerremark; + @Column(nullable = false) + @NotNull(message = "Order must have creation date") + private LocalDateTime datecreated; + private LocalDateTime dateapproved; + @Column(nullable = false) + @Enumerated(EnumType.STRING) + private OrderPriority priority; + @ManyToOne + @JoinColumn(name = "manageruserid") + private Managers manager; + @ManyToOne + @JoinColumn(name = "supplieruserid") + private Suppliers supplier; + + public Orders(OrderPriority priority, Managers manager, Suppliers supplier) { + this.status = OrderStatus.CREATED; + this.datecreated = LocalDateTime.now(); + this.priority = priority; + this.manager = manager; + this.supplier = supplier; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Questions.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Questions.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Questions.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,43 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Data +@Entity +@NoArgsConstructor +public class Questions { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer questionid; + @Column(nullable = false) + @NotNull(message = "Question must have content") + @NotEmpty(message = "Question must have content") + private String questiontext; + @Column(nullable = false) + @NotNull(message = "Question must have creation date") + private LocalDateTime datecreated; + @ManyToOne + @JoinColumn(name = "workeruserid") + private Workers worker; + @ManyToOne + @JoinColumn(name = "manageruserid") + private Managers manager; + @ManyToMany(mappedBy = "questionsList") + private List storedarticlesList=new ArrayList<>(); + + + public Questions(String questiontext, Workers worker, Managers manager) { + this.questiontext = questiontext; + this.datecreated = LocalDateTime.now(); + this.worker = worker; + this.manager = manager; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/SqlViews/ArticlesReport.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,21 @@ +package com.bazi.fullystocked.Models.SqlViews; + +import org.hibernate.annotations.Immutable; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Immutable +@Table(name = "articles_report") +public class ArticlesReport { + @Id + private Integer articleid; + private String articlename; + private String description; + private String imageurl; + private int quantity; + private String locationname; + private Integer locationid; +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/StoredArticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/StoredArticles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/StoredArticles.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,42 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +@Data +@Entity +@NoArgsConstructor +@Table(name="storedarticles") +public class StoredArticles { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer sarticleid; + @Column(nullable = false) + @NotNull(message = "Stored Article must have quantity") + @Min(0) + private int quantity; + @ManyToOne + @JoinColumn(name = "locationid") + private Locations locations; + @ManyToOne + @JoinColumn(name = "articleid") + private Articles article; + @ManyToMany + @JoinTable(name = "question_availability_for_storedarticle", + joinColumns = @JoinColumn(name = "sarticleid"), + inverseJoinColumns = @JoinColumn(name = "questionid") + ) + private List questionsList=new ArrayList<>(); + + public StoredArticles(int quantity, Locations locations, Articles article) { + this.quantity = quantity; + this.locations = locations; + this.article = article; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Suppliers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,52 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +@Entity +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +public class Suppliers extends User{ + @Column(nullable = false) + @NotNull(message = "Supplier must have supplierInfo") + @NotEmpty(message = "Supplier must have supplierInfo") + private String supplierinfo; + @Column(nullable = false) + @NotNull(message = "Supplier must have phone") + @NotEmpty(message = "Supplier must have phone") + private String phone; + @Column(nullable = false) + @NotNull(message = "Supplier must have street") + @NotEmpty(message = "Supplier must have street") + private String street; + @Column(nullable = false) + @NotNull(message = "Supplier must have street number") + private int streetnumber; + @Column(nullable = false) + @NotNull(message = "Supplier must have street city") + @NotEmpty(message = "Supplier must have street city") + private String city; + @ManyToMany + @JoinTable(name = "supplier_supplies_category", + joinColumns = @JoinColumn(name = "userid"), + inverseJoinColumns = @JoinColumn(name = "categoryid") + ) + private List categoryList2=new ArrayList<>(); + + public Suppliers(String firstname, String lastname, String username, String email, String password, String supplierinfo, String phone, String street, int sttreetnumber, String city) { + super(firstname, lastname, username, email, password); + this.supplierinfo = supplierinfo; + this.phone = phone; + this.street = street; + this.streetnumber = sttreetnumber; + this.city = city; + } +} Index: FullyStocked/src/main/java/com/bazi/fullystocked/Models/Workers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/Workers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) +++ FullyStocked/src/main/java/com/bazi/fullystocked/Models/Workers.java (revision 5c142f75d0cfcf16280039461c1609aa023099ce) @@ -0,0 +1,24 @@ +package com.bazi.fullystocked.Models; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + +@Entity +@EqualsAndHashCode(callSuper = true) +@Data +@NoArgsConstructor +public class Workers extends User{ + @ManyToOne + @JoinColumn(name = "locationid") + private Locations location; + + public Workers(String firstname, String lastname, String username, String email, String password, Locations location) { + super(firstname, lastname, username, email, password); + this.location = location; + } +} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/answers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/answers.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,28 +1,0 @@ -package com.bazi.fullystocked.Models; - - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -@Entity -@NoArgsConstructor -@Data -public class answers { - @EmbeddedId - private AnswerId answerId; - private LocalDateTime datecreated; - @NotNull(message = "The answer must have content") - @NotEmpty(message = "The location must have content") - @Column(nullable = false) - private String answertext; - - public answers(String answertext) { - this.datecreated = LocalDateTime.now(); - this.answertext = answertext; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/articles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/articles.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,45 +1,0 @@ -package com.bazi.fullystocked.Models; - -import jdk.jfr.Category; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -public class articles { - @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") - @NotEmpty(message = "Article must have name") - private String articlename; - private String imageurl; - @Column(nullable = false) - @NotNull(message = "Article must have max quantity") - private int maxquantityperlocation; - @ManyToMany - @JoinTable(name = "article_belongs_to_category", - joinColumns = @JoinColumn(name = "articleid"), - inverseJoinColumns = @JoinColumn(name = "categoryid") - ) - private List categoryList=new ArrayList<>(); - - public articles(String description, String articlename, String imageurl, int maxquantityperlocation) { - this.description = description; - this.articlename = articlename; - this.imageurl = imageurl; - this.maxquantityperlocation = maxquantityperlocation; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/categories.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/categories.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,37 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -public class categories { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer categoryid; - @Column(nullable = false) - @NotNull(message = "Category must have name") - @NotEmpty(message = "Category must have name") - private String categoryname; - @Column(nullable = false) - @NotNull(message = "Category must have description") - @NotEmpty(message = "Category must have description") - private String description; - @ManyToMany(mappedBy = "categoryList") - private List articlesList=new ArrayList<>(); - @ManyToMany(mappedBy = "categoryList2") - private List suppliersList=new ArrayList<>(); - - - public categories(String categoryname, String description) { - this.categoryname = categoryname; - this.description = description; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/invoicedarticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoicedarticles.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,39 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -@Data -@Entity -@NoArgsConstructor -public class invoicedarticles { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer iarticleid; - @Column(nullable = false) - @NotNull(message = "Invoiced Article must have price") - @Min(0) - private int price; - @Column(nullable = false) - @NotNull(message = "Invoiced Article must have quantity") - @Min(0) - private int quantity; - @ManyToOne - @JoinColumn(name = "invoiceid") - private invoices invoice; - @ManyToOne - @JoinColumn(name = "articleid") - private articles article; - - public invoicedarticles(int price, int quantity, invoices invoice, articles article) { - this.price = price; - this.quantity = quantity; - this.invoice = invoice; - this.article = article; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/invoices.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/invoices.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,54 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -@Data -@Entity -@NoArgsConstructor -public class invoices { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer invoiceid; - @Column(nullable = false) - @NotNull(message = "Invoice must have customer name") - @NotEmpty(message = "Invoice must have customer name") - private String customername; - @Column(nullable = false) - @NotNull(message = "Invoice must have customer phone") - @NotEmpty(message = "Invoice must have customer phone") - private String customerphone; - @Column(nullable = false) - @NotNull(message = "Invoice must have customer street") - @NotEmpty(message = "Invoice must have customer street") - private String street; - @Column(nullable = false) - @NotNull(message = "Invoice must have customer street number") - private int streetnumber; - @Column(nullable = false) - @NotNull(message = "Invoice must have customer city") - @NotEmpty(message = "Invoice must have customer city") - private String city; - @Column(nullable = false) - @NotNull(message = "Invoice must have creation date") - private LocalDateTime datecreate; - @ManyToOne - @JoinColumn(name = "workeruserid") - private workers worker; - - public invoices(String customername, String customerphone, - String street, int streetnumber, String city, workers worker) { - this.customername = customername; - this.customerphone = customerphone; - this.street = street; - this.streetnumber = streetnumber; - this.city = city; - this.datecreate = LocalDateTime.now(); - this.worker = worker; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/locations.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/locations.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,44 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -@Data -@Entity -@NoArgsConstructor -public class locations { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer locationid; - @Column(nullable = false) - @NotNull(message = "Location must have name") - @NotEmpty(message = "Location must have name") - private String locationname; - @Column(nullable = false) - @NotNull(message = "Location must have phone") - @NotEmpty(message = "Location must have phone") - private String phone; - @Column(nullable = false) - @NotNull(message = "Location must have street") - @NotEmpty(message = "Location must have street") - private String street; - @Column(nullable = false) - @NotNull(message = "Location must have street number") - private Integer streetnumber; - @Column(nullable = false) - @NotNull(message = "Location must have city") - @NotEmpty(message = "Location must have city") - private String city; - - public locations(String locationname, String phone, String street, Integer streetnumber, String city) { - this.locationname = locationname; - this.phone = phone; - this.street = street; - this.streetnumber = streetnumber; - this.city = city; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/managers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/managers.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,17 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Entity; - -@Entity -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -public class managers extends User{ - public managers(String firstname, String lastname, String username, String email, String password) { - super(firstname, lastname, username, email, password); - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/orderedarticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/orderedarticles.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,47 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -@Data -@Entity -@NoArgsConstructor -public class orderedarticles { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer oarticleid; - @Min(0) - private int price; - @Column(nullable = false) - @NotNull(message = "Ordered Article must have quantity") - @Min(0) - private int quantity; - @Column(nullable = false) - @NotNull(message = "Ordered Article must have status") - @NotEmpty(message = "Ordered Article must have status") - private String articlestatus; - @ManyToOne - @JoinColumn(name = "orderid") - private orders order; - @ManyToOne - @JoinColumn(name = "locationid") - private locations location; - @ManyToOne - @JoinColumn(name = "articleid") - private articles article; - - public orderedarticles(int price, int quantity, String articlestatus, orders order, locations location, articles article) { - this.price = price; - this.quantity = quantity; - this.articlestatus = articlestatus; - this.order = order; - this.location = location; - this.article = article; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/orders.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/orders.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,50 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; - -@Data -@Entity -@NoArgsConstructor -public class orders { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer orderid; - @Column(nullable = false) - @NotNull(message = "Order must have status") - @NotEmpty(message = "Order must have status") - private String status; - private String supplierremark; - private String managerremark; - @Column(nullable = false) - @NotNull(message = "Order must have creation date") - private LocalDateTime datecreated; - private LocalDateTime dateapproved; - @Column(nullable = false) - @NotNull(message = "Order must have priority") - @NotEmpty(message = "Order must have priority") - private String priority; - @ManyToOne - @JoinColumn(name = "manageruserid") - private managers manager; - @ManyToOne - @JoinColumn(name = "supplieruserid") - private suppliers supplier; - - public orders(String status, String supplierremark, String managerremark, - LocalDateTime dateapproved, String priority, managers manager, suppliers supplier) { - this.status = status; - this.supplierremark = supplierremark; - this.managerremark = managerremark; - this.datecreated = LocalDateTime.now(); - this.dateapproved = dateapproved; - this.priority = priority; - this.manager = manager; - this.supplier = supplier; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/questions.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/questions.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,43 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -public class questions { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer questionid; - @Column(nullable = false) - @NotNull(message = "Question must have content") - @NotEmpty(message = "Question must have content") - private String questiontext; - @Column(nullable = false) - @NotNull(message = "Question must have creation date") - private LocalDateTime datecreated; - @ManyToOne - @JoinColumn(name = "workeruserid") - private workers worker; - @ManyToOne - @JoinColumn(name = "manageruserid") - private managers manager; - @ManyToMany(mappedBy = "questionsList") - private List storedarticlesList=new ArrayList<>(); - - - public questions(String questiontext, workers worker, managers manager) { - this.questiontext = questiontext; - this.datecreated = LocalDateTime.now(); - this.worker = worker; - this.manager = manager; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/storedarticles.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/storedarticles.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,42 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Data -@Entity -@NoArgsConstructor -public class storedarticles { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer sarticleid; - @Column(nullable = false) - @NotNull(message = "Stored Article must have quantity") - @Min(0) - private int quantity; - @ManyToOne - @JoinColumn(name = "locationid") - private locations locations; - @ManyToOne - @JoinColumn(name = "articleid") - private articles article; - @ManyToMany - @JoinTable(name = "question_availability_for_storedarticle", - joinColumns = @JoinColumn(name = "sarticleid"), - inverseJoinColumns = @JoinColumn(name = "questionid") - ) - private List questionsList=new ArrayList<>(); - - public storedarticles(int quantity, locations locations, articles article) { - this.quantity = quantity; - this.locations = locations; - this.article = article; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/suppliers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/suppliers.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,52 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.List; - -@Entity -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -public class suppliers extends User{ - @Column(nullable = false) - @NotNull(message = "Supplier must have supplierInfo") - @NotEmpty(message = "Supplier must have supplierInfo") - private String supplierinfo; - @Column(nullable = false) - @NotNull(message = "Supplier must have phone") - @NotEmpty(message = "Supplier must have phone") - private String phone; - @Column(nullable = false) - @NotNull(message = "Supplier must have street") - @NotEmpty(message = "Supplier must have street") - private String street; - @Column(nullable = false) - @NotNull(message = "Supplier must have street number") - private int streetnumber; - @Column(nullable = false) - @NotNull(message = "Supplier must have street city") - @NotEmpty(message = "Supplier must have street city") - private String city; - @ManyToMany - @JoinTable(name = "supplier_supplies_category", - joinColumns = @JoinColumn(name = "userid"), - inverseJoinColumns = @JoinColumn(name = "categoryid") - ) - private List categoryList2=new ArrayList<>(); - - public suppliers(String firstname, String lastname, String username, String email, String password, String supplierinfo, String phone, String street, int sttreetnumber, String city) { - super(firstname, lastname, username, email, password); - this.supplierinfo = supplierinfo; - this.phone = phone; - this.street = street; - this.streetnumber = sttreetnumber; - this.city = city; - } -} Index: llyStocked/src/main/java/com/bazi/fullystocked/Models/workers.java =================================================================== --- FullyStocked/src/main/java/com/bazi/fullystocked/Models/workers.java (revision 594d4c41d6f71f9cd81cb7ed9f09256bc18a77c2) +++ (revision ) @@ -1,26 +1,0 @@ -package com.bazi.fullystocked.Models; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; - -@Entity -@EqualsAndHashCode(callSuper = true) -@Data -@NoArgsConstructor -public class workers extends User{ - @ManyToOne - @JoinColumn(name = "locationid") - private locations location; - - public workers(String firstname, String lastname, String username, String email, String password, locations location) { - super(firstname, lastname, username, email, password); - this.location = location; - } -}