Refactors database

repeated-dislikes/generated-requests.http

@@ -8,5 +8,9 @@ Content-Type: application/json
   "shops": []
 }
 
+###
+GET http://localhost:8080/bad/users/all
+###
+GET http://localhost:8080/badfix/users/all
 ###
 GET http://localhost:8080/fix/users/all

repeated-dislikes/src/main/kotlin/org/jesperancinha/repeateddislikes/fix/domain/Domain.kt

@@ -16,7 +16,10 @@ data class User(
     @OneToMany(cascade = [CascadeType.DETACH], fetch = FetchType.EAGER)
     @JoinTable(
         schema = SCHEMA,
-        name = "USERS_RECEIPTS"
+        name = "RECEIPTS",
+        joinColumns = [jakarta.persistence.JoinColumn(name = "USER_ID")],
+        inverseJoinColumns = [JoinColumn(name="ID")]
+
     )
     val receipts: List<Receipt>,
     @OneToMany(cascade = [CascadeType.DETACH], fetch = FetchType.EAGER)
@@ -26,7 +29,7 @@ data class User(
     )val shops: List<Shop>
 )
 
-@Table(name = "receipts", schema = SCHEMA)
+@Table(name = "RECEIPTS", schema = SCHEMA)
 @Entity
 data class Receipt(
     @Id

repeated-dislikes/src/main/resources/data.sql

@@ -8,24 +8,15 @@ values ('Cats Para Dice');
 SET @receipt1=random_uuid();
 SET @receipt2=random_uuid();
 SET @userid=(select ID from BAD.USERS WHERE NAME = 'CatOne');
+SET @shop1=(select ID from BAD.SHOPS WHERE NAME = 'Cats Para Dice');
 insert into BAD.RECEIPTS (ID, USER_ID, SHOP_ID)
-values (@receipt1, @userid,
-        (select ID from BAD.SHOPS WHERE NAME = 'Cats Para Dice')
-       );
+values (@receipt1, @userid, @shop1);
 insert into BAD.RECEIPTS (ID, USER_ID, SHOP_ID)
-values (@receipt2, @userid,
-        (select ID from BAD.SHOPS WHERE NAME = 'Cats Para Dice')
-       );
+values (@receipt2, @userid, @shop1);
 insert into BAD.BAD_DISLIKES_RELATIONS (ID, USER_ID, SHOP_ID, RECEIPT_ID)
-values (random_uuid(), @userid,
-        (select ID from BAD.SHOPS WHERE NAME = 'Cats Para Dice'),
-        @receipt1
-       );
+values (random_uuid(), @userid, @shop1, @receipt1);
 insert into BAD.BAD_DISLIKES_RELATIONS (ID, USER_ID, SHOP_ID, RECEIPT_ID)
-values (random_uuid(), @userid,
-        (select ID from BAD.SHOPS WHERE NAME = 'Cats Para Dice'),
-        @receipt2
-       );
+values (random_uuid(), @userid, @shop1, @receipt2);
 
 
 
@@ -39,34 +30,21 @@ values ('Cats Para Dice BadFix');
 SET @receipt1=random_uuid();
 SET @receipt2=random_uuid();
 SET @userid=(select ID from BADFIX.USERS WHERE NAME = 'CatOne BadFix');
+SET @shop1=(select ID from BADFIX.SHOPS WHERE NAME = 'Cats Para Dice BadFix');
 insert into BADFIX.RECEIPTS (ID, USER_ID, SHOP_ID)
-values (@receipt1, @userid,
-        (select ID from BADFIX.SHOPS WHERE NAME = 'Cats Para Dice BadFix')
-       );
+values (@receipt1, @userid, @shop1);
 insert into BADFIX.RECEIPTS (ID, USER_ID, SHOP_ID)
-values (@receipt2, @userid,
-        (select ID from BADFIX.SHOPS WHERE NAME = 'Cats Para Dice BadFix')
-       );
+values (@receipt2, @userid, @shop1);
 insert into BADFIX.BAD_DISLIKES_RELATIONS (ID, USER_ID, SHOP_ID, RECEIPT_ID)
-values (random_uuid(), @userid,
-        (select ID from BADFIX.SHOPS WHERE NAME = 'Cats Para Dice BadFix'),
-        @receipt1
-       );
+values (random_uuid(), @userid, @shop1, @receipt1);
 insert into BADFIX.BAD_DISLIKES_RELATIONS (ID, USER_ID, SHOP_ID, RECEIPT_ID)
-values (random_uuid(), @userid,
-        (select ID from BADFIX.SHOPS WHERE NAME = 'Cats Para Dice BadFix'),
-        @receipt2
-       );
-
-
-
+values (random_uuid(), @userid, @shop1, @receipt2);
 
 
 
 truncate table FIX.USERS;
 truncate table FIX.SHOPS;
 truncate table FIX.RECEIPTS;
-truncate table FIX.USERS_RECEIPTS;
 insert into FIX.USERS (ID, NAME)
 values (random_uuid(), 'CatOne Fix');
 insert into FIX.SHOPS (ID, NAME)
@@ -79,7 +57,3 @@ insert into FIX.RECEIPTS (ID, USER_ID, SHOP_ID)
 values (@receipt3, @userid, @shopid);
 insert into FIX.RECEIPTS (ID, USER_ID, SHOP_ID)
 values (@receipt4, @userid, @shopid);
-insert into FIX.USERS_RECEIPTS(USER_ID, RECEIPTS_ID)
-values (@userid, @receipt3);
-insert into FIX.USERS_RECEIPTS(USER_ID, RECEIPTS_ID)
-values (@userid, @receipt4);

repeated-dislikes/src/main/resources/schema.sql

@@ -14,8 +14,6 @@ DROP TABLE IF EXISTS BAD.SHOPS;
 
 DROP TABLE IF EXISTS FIX.USERS_SHOPS;
 
-DROP TABLE IF EXISTS FIX.USERS_RECEIPTS;
-
 DROP TABLE IF EXISTS FIX.USERS;
 
 DROP TABLE IF EXISTS FIX.RECEIPTS;
@@ -99,13 +97,5 @@ CREATE TABLE IF NOT EXISTS FIX.SHOPS
 );
 
 
-CREATE TABLE IF NOT EXISTS FIX.USERS_RECEIPTS
-(
-    id UUID NOT NULL DEFAULT random_uuid() PRIMARY KEY,
-    user_id UUID,
-    receipts_id UUID
-);
-
 CREATE VIEW IF NOT EXISTS FIX.USERS_SHOPS AS
-SELECT DISTINCT ur.user_id, r.shop_id as shops_id  FROM FIX.USERS_RECEIPTS ur
-    INNER JOIN FIX.RECEIPTS r ON ur.receipts_id = r.id;
+SELECT DISTINCT r.user_id, r.shop_id as shops_id from FIX.RECEIPTS AS r;