From c7c1844dce656b2c0c3bc4fb994f44198f2ebba3 Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Thu, 29 Oct 2026 17:52:38 -0400 Subject: [PATCH 1/9] starter class creation --- .../sticker_business/entities/Sticker.java | 41 +++++++++++++++++++ .../StickerBusinessApplicationTests.java | 7 ++++ .../entity_tests/StickerTests.java | 3 ++ 3 files changed, 51 insertions(+) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java create mode 100644 sticker-business/src/test/java/gold_star/sticker_business/entity_tests/StickerTests.java diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java new file mode 100644 index 0000000..2000b21 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java @@ -0,0 +1,41 @@ +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "Sticker") +public class Sticker { + @Id @GeneratedValue private int id; + + @Column(name = "name") + private String name; + + @Column(name = "length") + private double length; + + @Column(name = "width") + private double width; + + @Column(name = "desc") + private String desc; + + // category + + @Column(name = "svgPath") + private String svgPath; + + @Column(name = "active") + private boolean active; + + public Sticker(String name, double length, double width, String desc) { + this.name = name; + this.length = length; + this.width = width; + this.desc = desc; + + // Default + this.active = true; + } +} diff --git a/sticker-business/src/test/java/gold_star/sticker_business/StickerBusinessApplicationTests.java b/sticker-business/src/test/java/gold_star/sticker_business/StickerBusinessApplicationTests.java index 228af84..898e186 100644 --- a/sticker-business/src/test/java/gold_star/sticker_business/StickerBusinessApplicationTests.java +++ b/sticker-business/src/test/java/gold_star/sticker_business/StickerBusinessApplicationTests.java @@ -1,11 +1,18 @@ package gold_star.sticker_business; +import org.hibernate.jpa.HibernatePersistenceConfiguration; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest class StickerBusinessApplicationTests { + HibernatePersistenceConfiguration sessionFactory = new HibernatePersistenceConfiguration("Test"); @Test void contextLoads() {} + + @Test + void dataSchemaValidates() { + sessionFactory.getSchemaManager().validate(); + } } diff --git a/sticker-business/src/test/java/gold_star/sticker_business/entity_tests/StickerTests.java b/sticker-business/src/test/java/gold_star/sticker_business/entity_tests/StickerTests.java new file mode 100644 index 0000000..27f5bce --- /dev/null +++ b/sticker-business/src/test/java/gold_star/sticker_business/entity_tests/StickerTests.java @@ -0,0 +1,3 @@ +package gold_star.sticker_business.entity_tests; + +public class StickerTests {} From bc9b2964487205054b473e4cac0855904c6ce597 Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Thu, 5 Nov 2026 17:52:54 -0500 Subject: [PATCH 2/9] Started hibernate classes --- .../StickerBusinessApplication.java | 20 +++++ .../sticker_business/entities/Order.java | 24 ++++++ .../entities/OrderStatus.java | 11 +++ .../sticker_business/entities/Sticker.java | 74 +++++++++++++++---- .../src/main/resources/hibernate.properties | 15 ++++ 5 files changed, 128 insertions(+), 16 deletions(-) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java create mode 100644 sticker-business/src/main/resources/hibernate.properties diff --git a/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java b/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java index b8c99f1..c695283 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java @@ -1,5 +1,10 @@ package gold_star.sticker_business; +import entities.Sticker; +import org.hibernate.SessionFactory; +import org.hibernate.boot.MetadataSources; +import org.hibernate.boot.registry.StandardServiceRegistry; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.jspecify.annotations.Nullable; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -36,5 +41,20 @@ public String home() { public static void main(String[] args) { SpringApplication.run(StickerBusinessApplication.class, args); + + // A SessionFactory is set up once for an application! + final StandardServiceRegistry registry = new StandardServiceRegistryBuilder().build(); + SessionFactory sessionFactory; + try { + sessionFactory = + new MetadataSources(registry) + .addAnnotatedClass(Sticker.class) + .buildMetadata() + .buildSessionFactory(); + } catch (Exception e) { + // The registry would be destroyed by the SessionFactory, but we + // had trouble building the SessionFactory so destroy it manually. + StandardServiceRegistryBuilder.destroy(registry); + } } } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java new file mode 100644 index 0000000..fee4108 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java @@ -0,0 +1,24 @@ +package entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.Instant; +import org.hibernate.annotations.CreationTimestamp; + +@Entity +@Table(name = "PlacedOrder") // 'order' is a reserved keyword in MySQL +public class Order { + @Id @GeneratedValue private int id; + + private int customer_id; // FK to User + @CreationTimestamp private Instant placementTimestamp; + + @Enumerated(EnumType.STRING) + private OrderStatus status; + + private String address; // json?? maybe use a blob instead? +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java new file mode 100644 index 0000000..3259ee3 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java @@ -0,0 +1,11 @@ +package entities; + +public enum OrderStatus { + SUBMITTED, + ACCEPTED, + DENIED, + IN_PROGRESS, + PRINTED, + SHIPPED, + CANCELLED +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java index 2000b21..0ea612e 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java @@ -1,4 +1,5 @@ -import jakarta.persistence.Column; +package entities; + import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; @@ -9,33 +10,74 @@ public class Sticker { @Id @GeneratedValue private int id; - @Column(name = "name") private String name; - - @Column(name = "length") private double length; - - @Column(name = "width") private double width; - - @Column(name = "desc") private String desc; - - // category - - @Column(name = "svgPath") private String svgPath; - - @Column(name = "active") private boolean active; - public Sticker(String name, double length, double width, String desc) { + public Sticker() {} + + public Sticker(String name, double length, double width, String desc, String svgPath) { this.name = name; this.length = length; this.width = width; this.desc = desc; - + this.svgPath = svgPath; // Default this.active = true; } + + public int get_id() { + return this.id; + } + + public String get_name() { + return this.name; + } + + public double get_length() { + return this.length; + } + + public double get_width() { + return this.width; + } + + public String get_desc() { + return desc; + } + + public String get_svgPath() { + return svgPath; + } + + public boolean get_active() { + return active; + } + + public void set_name(String name) { + this.name = name; + } + + public void set_length(double length) { + this.length = length; + } + + public void set_width(double width) { + this.width = width; + } + + public void set_desc(String desc) { + this.desc = desc; + } + + public void set_SvgPath(String svgPath) { + this.svgPath = svgPath; + } + + public void setActive(boolean active) { + this.active = active; + } } diff --git a/sticker-business/src/main/resources/hibernate.properties b/sticker-business/src/main/resources/hibernate.properties new file mode 100644 index 0000000..fa76521 --- /dev/null +++ b/sticker-business/src/main/resources/hibernate.properties @@ -0,0 +1,15 @@ +# Database connection settings +# In memory H2 database (good for testing -- not our prod set up) +hibernate.connection.url=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1 +hibernate.connection.username=sa +hibernate.connection.password= + +# Echo all executed SQL to console +# also good for testing but not for prod +hibernate.show_sql=true +hibernate.format_sql=true +hibernate.highlight_sql=true + +# Automatically export the schema +# this means drop all existing tables at start up, not for prod +hibernate.hbm2ddl.auto=create \ No newline at end of file From ed378340d35bc8901d40bc181257c9f4cb6794fc Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Sun, 8 Nov 2026 18:34:11 -0500 Subject: [PATCH 3/9] more progress on Order and OrderItems hibernate classes --- .../sticker_business/entities/Order.java | 10 +++++++++- .../sticker_business/entities/OrderItems.java | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java index fee4108..ca55286 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java @@ -5,6 +5,7 @@ import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import java.time.Instant; import org.hibernate.annotations.CreationTimestamp; @@ -14,11 +15,18 @@ public class Order { @Id @GeneratedValue private int id; - private int customer_id; // FK to User + @ManyToOne private int customer_id; // FK to User @CreationTimestamp private Instant placementTimestamp; @Enumerated(EnumType.STRING) private OrderStatus status; private String address; // json?? maybe use a blob instead? + + public Order() {} + + public Order(int customer_id, String address) { + this.customer_id = customer_id; + this.address = address; + } } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java new file mode 100644 index 0000000..dccb6db --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java @@ -0,0 +1,19 @@ +package entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "OrderItems") +public class OrderItems { + @Id @GeneratedValue private int id; + + @ManyToOne private int orderId; + private int sheetId; + private int quantity; + + public OrderItems() {} +} From c08e7f20bdf5c36ac796502d1a86cf05b7d775b2 Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Sun, 8 Nov 2026 20:04:00 -0500 Subject: [PATCH 4/9] added and expended OrderItems and Tag classes --- .../sticker_business/entities/Order.java | 18 ++++++++-- .../sticker_business/entities/OrderItems.java | 7 +++- .../entities/Repos/OrderItemsRepo.java | 3 ++ .../entities/Repos/OrderRepo.java | 6 ++++ .../sticker_business/entities/Sticker.java | 24 ++++++------- .../sticker_business/entities/Tag.java | 34 +++++++++++++++++++ .../sticker_business/entities/TagItems.java | 21 ++++++++++++ 7 files changed, 97 insertions(+), 16 deletions(-) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderItemsRepo.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java index ca55286..bb5110b 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java @@ -1,13 +1,18 @@ package entities; +import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import java.time.Instant; +import java.util.ArrayList; +import java.util.List; import org.hibernate.annotations.CreationTimestamp; @Entity @@ -15,7 +20,10 @@ public class Order { @Id @GeneratedValue private int id; - @ManyToOne private int customer_id; // FK to User + @ManyToOne + @JoinColumn(name = "customerId") + private int customerId; // FK to User --> TODO: change type to User when class exists + @CreationTimestamp private Instant placementTimestamp; @Enumerated(EnumType.STRING) @@ -23,10 +31,14 @@ public class Order { private String address; // json?? maybe use a blob instead? + // Reference to all the OrderItems in the order + @OneToMany(mappedBy = "orderId", cascade = CascadeType.ALL) + private List items = new ArrayList(); + public Order() {} - public Order(int customer_id, String address) { - this.customer_id = customer_id; + public Order(int customerId, String address) { + this.customerId = customerId; this.address = address; } } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java index dccb6db..9d00b01 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java @@ -1,8 +1,10 @@ package entities; import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; @@ -11,7 +13,10 @@ public class OrderItems { @Id @GeneratedValue private int id; - @ManyToOne private int orderId; + @ManyToOne // fk to PlacedOrder table + @JoinColumn(name = "orderId", foreignKey = @ForeignKey(name = "ORDER_ID_FK")) + private Order order; + private int sheetId; private int quantity; diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderItemsRepo.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderItemsRepo.java new file mode 100644 index 0000000..71fc4d1 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderItemsRepo.java @@ -0,0 +1,3 @@ +package gold_star.sticker_business.entities.Repos; + +public class OrderItemsRepo {} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java new file mode 100644 index 0000000..2e61d76 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java @@ -0,0 +1,6 @@ +package gold_star.sticker_business.entities.Repos; + +import entities.Order; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface OrderRepo extends JpaRepository {} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java index 0ea612e..5880ffb 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java @@ -29,51 +29,51 @@ public Sticker(String name, double length, double width, String desc, String svg this.active = true; } - public int get_id() { + public int getId() { return this.id; } - public String get_name() { + public String getName() { return this.name; } - public double get_length() { + public double getLength() { return this.length; } - public double get_width() { + public double getWidth() { return this.width; } - public String get_desc() { + public String getDesc() { return desc; } - public String get_svgPath() { + public String getSvgPath() { return svgPath; } - public boolean get_active() { + public boolean getActive() { return active; } - public void set_name(String name) { + public void setName(String name) { this.name = name; } - public void set_length(double length) { + public void setLength(double length) { this.length = length; } - public void set_width(double width) { + public void setWidth(double width) { this.width = width; } - public void set_desc(String desc) { + public void setDesc(String desc) { this.desc = desc; } - public void set_SvgPath(String svgPath) { + public void setSvgPath(String svgPath) { this.svgPath = svgPath; } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java new file mode 100644 index 0000000..c92283b --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java @@ -0,0 +1,34 @@ +package gold_star.sticker_business.entities; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "Tag") +public class Tag { + @Id @GeneratedValue private int id; + + @Column(unique = true) + private String label; + + public Tag() {} + + public Tag(String label) { + this.label = label; + } + + public int getId() { + return this.id; + } + + public String getLabel() { + return this.label; + } + + public void setLabel(String label) { + this.label = label; + } +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java new file mode 100644 index 0000000..7131998 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java @@ -0,0 +1,21 @@ +package gold_star.sticker_business.entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "TagItems") +public class TagItems { + @Id @GeneratedValue private int id; + + @ManyToOne // fk to Tag table + @JoinColumn(name = "tagId", foreignKey = @ForeignKey(name = "TAG_ID_FK")) + private Tag tag; + + // @ManyToMany private Sticker sticker; +} From 096bafcfe7207082f922916c7c7c2511a0191994 Mon Sep 17 00:00:00 2001 From: yu-ziyi Date: Tue, 10 Nov 2026 16:30:34 -0500 Subject: [PATCH 5/9] feat(backend): add user/permission/permissiontype hibernate classes --- .../sticker_business/entities/Permission.java | 42 +++++++++++++++++++ .../entities/PermissionType.java | 38 +++++++++++++++++ .../sticker_business/entities/User.java | 42 +++++++++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/User.java diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java new file mode 100644 index 0000000..291dc54 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java @@ -0,0 +1,42 @@ +package gold_star.sticker_business.entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "Permission") +public class Permission { + @Id @GeneratedValue private int id; + + @ManyToMany(mappedBy = "permissions") + private List users = new ArrayList<>(); + + @ManyToOne + @JoinColumn(name = "permissionTypeId") + private PermissionType permissionType; + + public Permission() {} + + public Permission(PermissionType permissionType) { + this.permissionType = permissionType; + } + + public int getId() { + return id; + } + + public List getUsers() { + return users; + } + + public PermissionType getPermissionType() { + return permissionType; + } +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java new file mode 100644 index 0000000..6e9953a --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java @@ -0,0 +1,38 @@ +package gold_star.sticker_business.entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "PermissionType") +public class PermissionType { + @Id @GeneratedValue private int id; + + private String name; + + @OneToMany(mappedBy = "permissionType") + private List permissions = new ArrayList<>(); + + public PermissionType() {} + + public PermissionType(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } + + public List getPermissions() { + return permissions; + } +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/User.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/User.java new file mode 100644 index 0000000..0f1e394 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/User.java @@ -0,0 +1,42 @@ +package gold_star.sticker_business.entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "User") +public class User { + @Id @GeneratedValue private int id; + + private String username; + private String passwordHash; + + public User() {} + + public User(String username, String passwordHash) { + this.username = username; + this.passwordHash = passwordHash; + } + + public int getId() { + return id; + } + + public String getUsername() { + return username; + } + + public String getPasswordHash() { + return passwordHash; + } + + public void setUsername(String username) { + this.username = username; + } + + public void setPasswordHash(String passwordHash) { + this.passwordHash = passwordHash; + } +} From 930fbc862b7145d12c8c6fc1ee0a465d84fd72bc Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Tue, 10 Nov 2026 17:00:34 -0500 Subject: [PATCH 6/9] Updated Tag and TagItems entity classes, updated Collection and CollectionItems classes, created StickerSheets class --- .../sticker_business/entities/Collection.java | 36 +++++++++++++++ .../entities/CollectionItems.java | 45 +++++++++++++++++++ .../entities/StickerSheets.java | 20 +++++++++ .../sticker_business/entities/Tag.java | 7 ++- .../sticker_business/entities/TagItems.java | 28 +++++++++++- 5 files changed, 130 insertions(+), 6 deletions(-) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java new file mode 100644 index 0000000..d6b1c68 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java @@ -0,0 +1,36 @@ +package entities; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "Collection") +public class Collection { + @Id @GeneratedValue private int id; + + private String name; + + // Reference to all the CollectionItems in the order + @OneToMany(mappedBy = "collectionId", cascade = CascadeType.ALL) + private List items = new ArrayList(); + + public Collection() {} + + public Collection(String name) { + this.name = name; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java new file mode 100644 index 0000000..8c5fbba --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java @@ -0,0 +1,45 @@ +package entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "CollectionItems") +public class CollectionItems { + @Id @GeneratedValue private int id; + + @ManyToOne + @JoinColumn(name = "stickerId", foreignKey = @ForeignKey(name = "STICKER_ID_FK")) + private Sticker sticker; + + @ManyToOne + @JoinColumn(name = "collectionId", foreignKey = @ForeignKey(name = "COLLECTION_ID_FK")) + private Collection collection; + + public CollectionItems() {} + + public CollectionItems(Collection collection, Sticker sticker) { + this.collection = collection; + this.sticker = sticker; + } + + public int getId() { + return this.id; + } + + public Sticker getSticker() { + return this.sticker; + } + + public Collection getCollection() { + return this.collection; + } + + // No setters because CollectionItems should be immutable, if you + // change either the sticker or the collection it is just a new item +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java new file mode 100644 index 0000000..7ce52fd --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java @@ -0,0 +1,20 @@ +package gold_star.sticker_business.entities; + +// import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "StickerSheets") +public class StickerSheets { + @Id @GeneratedValue private int id; + + private String filePath; + + private String stickerIdsJSON; + + // @Convert(converter = HashMapConverter.class) + // private Map stickerIds; +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java index c92283b..fdc2725 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java @@ -1,4 +1,4 @@ -package gold_star.sticker_business.entities; +package entities; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -28,7 +28,6 @@ public String getLabel() { return this.label; } - public void setLabel(String label) { - this.label = label; - } + // No setters because tags are meant to be immutable, a different + // label is just a different tag } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java index 7131998..4a2638b 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java @@ -1,4 +1,4 @@ -package gold_star.sticker_business.entities; +package entities; import jakarta.persistence.Entity; import jakarta.persistence.ForeignKey; @@ -17,5 +17,29 @@ public class TagItems { @JoinColumn(name = "tagId", foreignKey = @ForeignKey(name = "TAG_ID_FK")) private Tag tag; - // @ManyToMany private Sticker sticker; + @ManyToOne + @JoinColumn(name = "stickerId", foreignKey = @ForeignKey(name = "STICKER_ID_FK")) + private Sticker sticker; + + public TagItems() {} + + public TagItems(Tag tag, Sticker sticker) { + this.tag = tag; + this.sticker = sticker; + } + + public int getId() { + return this.id; + } + + public Tag getTag() { + return this.tag; + } + + public Sticker getSticker() { + return this.sticker; + } + + // no setters because tags are meant to be immutable--if you change either + // part it's a different tag } From c575afa54bda4623544d66cf976ac6e607028a0b Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Wed, 11 Nov 2026 01:39:57 -0500 Subject: [PATCH 7/9] Added getters and setters to some classes, created attribute converter classes --- .../entities/AddressConverter.java | 19 +++++++ .../sticker_business/entities/Collection.java | 7 +++ .../sticker_business/entities/Order.java | 37 ++++++++++++-- .../entities/OrderStatus.java | 1 + .../entities/OrderUpdates.java | 51 +++++++++++++++++++ .../entities/StickerSheetJSONConverter.java | 20 ++++++++ .../entities/StickerSheets.java | 7 +-- .../sticker_business/entities/Tag.java | 2 + 8 files changed, 136 insertions(+), 8 deletions(-) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java new file mode 100644 index 0000000..4d75df5 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java @@ -0,0 +1,19 @@ +package entities; + +import jakarta.persistence.AttributeConverter; +import java.util.HashMap; + +public class AddressConverter implements AttributeConverter, String> { + + @Override + public String convertToDatabaseColumn(HashMap address) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'convertToDatabaseColumn'"); + } + + @Override + public HashMap convertToEntityAttribute(String addressJSON) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'convertToEntityAttribute'"); + } +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java index d6b1c68..b174fdd 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java @@ -1,6 +1,7 @@ package entities; import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; @@ -14,9 +15,11 @@ public class Collection { @Id @GeneratedValue private int id; + @Column(unique = true) private String name; // Reference to all the CollectionItems in the order + // No setter -- stickers in a collection should not be modified this way @OneToMany(mappedBy = "collectionId", cascade = CascadeType.ALL) private List items = new ArrayList(); @@ -30,6 +33,10 @@ public String getName() { return this.name; } + public List getItems() { + return this.items; + } + public void setName(String name) { this.name = name; } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java index bb5110b..835280a 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java @@ -1,6 +1,7 @@ package entities; import jakarta.persistence.CascadeType; +import jakarta.persistence.Convert; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -12,6 +13,7 @@ import jakarta.persistence.Table; import java.time.Instant; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import org.hibernate.annotations.CreationTimestamp; @@ -22,23 +24,48 @@ public class Order { @ManyToOne @JoinColumn(name = "customerId") - private int customerId; // FK to User --> TODO: change type to User when class exists + private User customer; @CreationTimestamp private Instant placementTimestamp; @Enumerated(EnumType.STRING) private OrderStatus status; - private String address; // json?? maybe use a blob instead? + private String addressJSON; + + private String note; // Reference to all the OrderItems in the order @OneToMany(mappedBy = "orderId", cascade = CascadeType.ALL) private List items = new ArrayList(); + // Reference to all the OrderUpdates for the order + @OneToMany(mappedBy = "orderId", cascade = CascadeType.ALL) + private List updates = new ArrayList(); + + @Convert(converter = AddressConverter.class) + private HashMap address; + public Order() {} - public Order(int customerId, String address) { - this.customerId = customerId; - this.address = address; + public Order(User customer, String addressJSON) { + this.customer = customer; + this.addressJSON = addressJSON; + } + + public int getId() { + return this.id; + } + + public User getCustomer() { + return this.customer; + } + + public Instant getPlacementTimestamp() { + return this.placementTimestamp; + } + + public OrderStatus getStatus() { + return this.status; } } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java index 3259ee3..d8d467e 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java @@ -6,6 +6,7 @@ public enum OrderStatus { DENIED, IN_PROGRESS, PRINTED, + CUT, SHIPPED, CANCELLED } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java new file mode 100644 index 0000000..571279d --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java @@ -0,0 +1,51 @@ +package entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import java.time.Instant; +import org.hibernate.annotations.Immutable; + +@Entity +@Table(name = "OrderUpdates") +public class OrderUpdates { + + @Id @GeneratedValue private int id; + + @ManyToOne // fk to Order table + @JoinColumn(name = "orderId", foreignKey = @ForeignKey(name = "ORDER_ID_FK")) + private Order order; + + @Immutable private Instant timestamp; + + @Immutable private OrderStatus orderType; + + public OrderUpdates() {} + + public OrderUpdates(Order order, OrderStatus orderType) { + this.order = order; + this.orderType = orderType; + } + + public int getId() { + return this.id; + } + + public Order getOrder() { + return this.order; + } + + public Instant getTimestamp() { + return this.timestamp; + } + + public OrderStatus getOrderType() { + return this.orderType; + } + + // No setters because this object should be immutable for historical integrity +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java new file mode 100644 index 0000000..b67b9e6 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java @@ -0,0 +1,20 @@ +package entities; + +import jakarta.persistence.AttributeConverter; +import java.util.HashMap; + +public class StickerSheetJSONConverter + implements AttributeConverter, String> { + + @Override + public String convertToDatabaseColumn(HashMap stickerIds) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'convertToDatabaseColumn'"); + } + + @Override + public HashMap convertToEntityAttribute(String stickerIdsJSON) { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'convertToEntityAttribute'"); + } +} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java index 7ce52fd..2472387 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java @@ -1,10 +1,11 @@ package gold_star.sticker_business.entities; -// import jakarta.persistence.Convert; +import jakarta.persistence.Convert; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; +import java.util.HashMap; @Entity @Table(name = "StickerSheets") @@ -15,6 +16,6 @@ public class StickerSheets { private String stickerIdsJSON; - // @Convert(converter = HashMapConverter.class) - // private Map stickerIds; + @Convert(converter = HashMapConverter.class) + private HashMap stickerIds; } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java index fdc2725..9e63793 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java @@ -5,6 +5,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; +import org.hibernate.annotations.Immutable; @Entity @Table(name = "Tag") @@ -12,6 +13,7 @@ public class Tag { @Id @GeneratedValue private int id; @Column(unique = true) + @Immutable private String label; public Tag() {} From bdb63d2e00ad7c4ed09b0426669c59603e3be936 Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Thu, 12 Nov 2026 01:53:20 -0500 Subject: [PATCH 8/9] finished building up hibernate classes --- .../StickerBusinessApplication.java | 2 +- .../entities/AddressConverter.java | 10 +++--- .../sticker_business/entities/Collection.java | 3 +- .../entities/CollectionItems.java | 3 +- .../sticker_business/entities/Order.java | 19 ++++++++++- .../sticker_business/entities/OrderItems.java | 31 +++++++++++++++-- .../entities/OrderStatus.java | 2 +- .../entities/OrderUpdates.java | 3 +- .../sticker_business/entities/Permission.java | 1 + .../entities/PermissionType.java | 3 ++ .../entities/Repos/OrderRepo.java | 2 +- .../sticker_business/entities/Sticker.java | 3 +- .../entities/StickerSheetJSONConverter.java | 10 +++--- .../entities/StickerSheets.java | 34 +++++++++++++++++-- .../sticker_business/entities/Tag.java | 3 +- .../sticker_business/entities/TagItems.java | 3 +- .../sticker_business/entities/User.java | 1 + 17 files changed, 108 insertions(+), 25 deletions(-) diff --git a/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java b/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java index c695283..2cb59b6 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/StickerBusinessApplication.java @@ -1,6 +1,6 @@ package gold_star.sticker_business; -import entities.Sticker; +import gold_star.sticker_business.entities.Sticker; import org.hibernate.SessionFactory; import org.hibernate.boot.MetadataSources; import org.hibernate.boot.registry.StandardServiceRegistry; diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java index 4d75df5..8cbdbe6 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/AddressConverter.java @@ -1,18 +1,18 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.AttributeConverter; -import java.util.HashMap; +import java.util.Map; -public class AddressConverter implements AttributeConverter, String> { +public class AddressConverter implements AttributeConverter, String> { @Override - public String convertToDatabaseColumn(HashMap address) { + public String convertToDatabaseColumn(Map address) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'convertToDatabaseColumn'"); } @Override - public HashMap convertToEntityAttribute(String addressJSON) { + public Map convertToEntityAttribute(String addressJSON) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'convertToEntityAttribute'"); } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java index b174fdd..321e47a 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Collection.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; @@ -11,6 +11,7 @@ import java.util.List; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "Collection") public class Collection { @Id @GeneratedValue private int id; diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java index 8c5fbba..01f936c 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/CollectionItems.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.Entity; import jakarta.persistence.ForeignKey; @@ -8,6 +8,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; +@SuppressWarnings("NullAway.Init") @Entity @Table(name = "CollectionItems") public class CollectionItems { diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java index 835280a..a6620ee 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Order.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.CascadeType; import jakarta.persistence.Convert; @@ -17,6 +17,7 @@ import java.util.List; import org.hibernate.annotations.CreationTimestamp; +@SuppressWarnings("NullAway.Init") @Entity @Table(name = "PlacedOrder") // 'order' is a reserved keyword in MySQL public class Order { @@ -68,4 +69,20 @@ public Instant getPlacementTimestamp() { public OrderStatus getStatus() { return this.status; } + + public HashMap getAddress() { + return this.address; + } + + public String getNote() { + return this.note; + } + + public void setStatus(OrderStatus status) { + this.status = status; + } + + public void setNote(String note) { + this.note = note; + } } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java index 9d00b01..5732735 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItems.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.Entity; import jakarta.persistence.ForeignKey; @@ -8,6 +8,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; +@SuppressWarnings("NullAway.Init") @Entity @Table(name = "OrderItems") public class OrderItems { @@ -17,8 +18,34 @@ public class OrderItems { @JoinColumn(name = "orderId", foreignKey = @ForeignKey(name = "ORDER_ID_FK")) private Order order; - private int sheetId; + private StickerSheets sheet; private int quantity; public OrderItems() {} + + public OrderItems(Order order, StickerSheets sheet, int quantity) { + this.order = order; + this.sheet = sheet; + this.quantity = quantity; + } + + public int getId() { + return this.id; + } + + public Order getOrder() { + return this.order; + } + + public StickerSheets getSheet() { + return this.sheet; + } + + public int getQuantity() { + return this.quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java index d8d467e..de7d569 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderStatus.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; public enum OrderStatus { SUBMITTED, diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java index 571279d..0978cbb 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderUpdates.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.Entity; import jakarta.persistence.ForeignKey; @@ -11,6 +11,7 @@ import org.hibernate.annotations.Immutable; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "OrderUpdates") public class OrderUpdates { diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java index 291dc54..68b470f 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Permission.java @@ -11,6 +11,7 @@ import java.util.List; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "Permission") public class Permission { @Id @GeneratedValue private int id; diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java index 6e9953a..942d4f0 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/PermissionType.java @@ -1,5 +1,6 @@ package gold_star.sticker_business.entities; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; @@ -9,10 +10,12 @@ import java.util.List; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "PermissionType") public class PermissionType { @Id @GeneratedValue private int id; + @Column(unique = true) private String name; @OneToMany(mappedBy = "permissionType") diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java index 2e61d76..c178473 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Repos/OrderRepo.java @@ -1,6 +1,6 @@ package gold_star.sticker_business.entities.Repos; -import entities.Order; +import gold_star.sticker_business.entities.Order; import org.springframework.data.jpa.repository.JpaRepository; public interface OrderRepo extends JpaRepository {} diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java index 5880ffb..d4d208c 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Sticker.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -6,6 +6,7 @@ import jakarta.persistence.Table; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "Sticker") public class Sticker { @Id @GeneratedValue private int id; diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java index b67b9e6..659a192 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheetJSONConverter.java @@ -1,19 +1,19 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.AttributeConverter; -import java.util.HashMap; +import java.util.Map; public class StickerSheetJSONConverter - implements AttributeConverter, String> { + implements AttributeConverter, String> { @Override - public String convertToDatabaseColumn(HashMap stickerIds) { + public String convertToDatabaseColumn(Map stickerIds) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'convertToDatabaseColumn'"); } @Override - public HashMap convertToEntityAttribute(String stickerIdsJSON) { + public Map convertToEntityAttribute(String stickerIdsJSON) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'convertToEntityAttribute'"); } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java index 2472387..337b21d 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/StickerSheets.java @@ -5,9 +5,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.Table; -import java.util.HashMap; +import java.util.Map; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "StickerSheets") public class StickerSheets { @Id @GeneratedValue private int id; @@ -16,6 +17,33 @@ public class StickerSheets { private String stickerIdsJSON; - @Convert(converter = HashMapConverter.class) - private HashMap stickerIds; + @Convert(converter = StickerSheetJSONConverter.class) + private Map stickerIds; + + public StickerSheets() {} + + public StickerSheets(String filePath, String stickerIdsJSON) { + this.filePath = filePath; + this.stickerIdsJSON = stickerIdsJSON; + } + + public int getId() { + return this.id; + } + + public String getFilePath() { + return this.filePath; + } + + public String getStickerIdsJSON() { + return this.stickerIdsJSON; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public void setStickerIdsJSON(String stickerIdsJSON) { + this.stickerIdsJSON = stickerIdsJSON; + } } diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java index 9e63793..ab9d00e 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/Tag.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -8,6 +8,7 @@ import org.hibernate.annotations.Immutable; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "Tag") public class Tag { @Id @GeneratedValue private int id; diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java index 4a2638b..d2370f9 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/TagItems.java @@ -1,4 +1,4 @@ -package entities; +package gold_star.sticker_business.entities; import jakarta.persistence.Entity; import jakarta.persistence.ForeignKey; @@ -9,6 +9,7 @@ import jakarta.persistence.Table; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "TagItems") public class TagItems { @Id @GeneratedValue private int id; diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/User.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/User.java index 0f1e394..95a8c65 100644 --- a/sticker-business/src/main/java/gold_star/sticker_business/entities/User.java +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/User.java @@ -6,6 +6,7 @@ import jakarta.persistence.Table; @Entity +@SuppressWarnings("NullAway.Init") @Table(name = "User") public class User { @Id @GeneratedValue private int id; From 5224bef80ab3d70241371dad6dd9313df3304b05 Mon Sep 17 00:00:00 2001 From: kathryn-eckert Date: Mon, 16 Nov 2026 02:38:44 -0500 Subject: [PATCH 9/9] OrderItemsStatus class --- .../entities/OrderItemsStatus.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItemsStatus.java diff --git a/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItemsStatus.java b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItemsStatus.java new file mode 100644 index 0000000..c1a4b01 --- /dev/null +++ b/sticker-business/src/main/java/gold_star/sticker_business/entities/OrderItemsStatus.java @@ -0,0 +1,46 @@ +package gold_star.sticker_business.entities; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; + +@SuppressWarnings("NullAway.Init") +@Entity +@Table(name = "OrderItemsStatus") +public class OrderItemsStatus { + @Id @GeneratedValue private int id; + + // fk to PlacedOrder table + @Column(unique = true) + @JoinColumn(name = "orderItemsId", foreignKey = @ForeignKey(name = "ORDER_ITEMS_ID_FK")) + private OrderItems orderItem; + + private boolean complete; + + public OrderItemsStatus() {} + + public OrderItemsStatus(OrderItems orderItem, boolean complete) { + this.orderItem = orderItem; + this.complete = complete; + } + + public int getId() { + return this.id; + } + + public OrderItems getOrderItem() { + return this.orderItem; + } + + public boolean getComplete() { + return this.complete; + } + + public void setComplete(boolean complete) { + this.complete = complete; + } +}