Skip to content

Product #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rogargon merged 5 commits into from
Oct 9, 2025
Merged

Product #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a25212
fix: update Product class to establish relationship with Inventory
drp5 Oct 9, 2025
e3c718f
feat: establish relationship between Inventory and Business
drp5 Oct 9, 2025
da09609
Merge branch 'main' into product
drp5 Oct 9, 2025
67e140c
fix: remove unnecessary Business field from Inventory class
drp5 Oct 9, 2025
b7daa4e
Merge remote-tracking branch 'origin/product' into product
drp5 Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/cat/udl/eps/softarch/demo/domain/Inventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ public class Inventory extends UriEntity {
private String location;

private int totalStock;


}
10 changes: 2 additions & 8 deletions src/main/java/cat/udl/eps/softarch/demo/domain/Product.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,8 @@ public class Product extends UriEntity<Long>{
// @ManyToMany
// private Set<Basket> baskets;


//TODO
// @OneToMany(cascade = CascadeType.ALL)
// private Set<Loyalty> loyalties;
//
//TODO
// @ManyToOne
// private Inventory inventory;
@ManyToOne
private Inventory inventory;


}
Loading