Changeset 6626008

Timestamp:

02/02/23 15:09:53 (22 months ago)

Author:

milamihajlovska <mila.mihajlovska01@…>

Branches:

master

Children:

d12020e

Parents:

e6b2246 (diff), d522b3f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/DenicaKj/MovieZone

Location:

src/main/java/com/example/moviezone/model

Files:

• Categories.java (modified) (2 diffs)
• Cinemas.java (added)

src/main/java/com/example/moviezone/model/Categories.java

@@ -1 +1 @@
 package com.example.moviezone.model;
 
-import jakarta.persistence.Entity;
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+
+import java.util.Objects;
 
 @Getter
@@ -11 +13 @@
 @Entity
 public class Categories {
+    @Id
+    @Column(name = "id_category", nullable = false)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id_category;
+    String name;
+    Integer extra_amount;
+
+    public Categories(String name, Integer extra_amount) {
+        this.name = name;
+        this.extra_amount = extra_amount;
+    }
+
+    public Categories() {
+
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Categories that = (Categories) o;
+        return Objects.equals(id_category, that.id_category) && Objects.equals(name, that.name) && Objects.equals(extra_amount, that.extra_amount);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id_category, name, extra_amount);
+    }
 }