From 4607369ffc78a15927cf81754fe0bf68387b6474 Mon Sep 17 00:00:00 2001 From: OliviaxJames Date: Fri, 9 May 2025 17:33:23 +0000 Subject: [PATCH 1/2] add sql files --- .../lesson28/models/CheckoutModel.java | 5 ++-- .../lesson28/models/LibraryUserModel.java | 15 ++++++++++ .../main/resources/queries/oliviajames.sql | 26 ++++++++++++++++++ .../db_app/src/main/resources/sqlite/data.db | Bin 16384 -> 28672 bytes 4 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/LibraryUserModel.java create mode 100644 lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql diff --git a/lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/CheckoutModel.java b/lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/CheckoutModel.java index f196513ee..884b3b667 100644 --- a/lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/CheckoutModel.java +++ b/lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/CheckoutModel.java @@ -1,10 +1,11 @@ package com.codedifferently.lesson28.models; +import java.time.Instant; +import java.util.UUID; + import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import java.time.Instant; -import java.util.UUID; @Entity @Table(name = "checked_out_items") diff --git a/lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/LibraryUserModel.java b/lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/LibraryUserModel.java new file mode 100644 index 000000000..ab9c0a024 --- /dev/null +++ b/lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/models/LibraryUserModel.java @@ -0,0 +1,15 @@ +public class LibraryUserModel { + private String id; + private String email; + private String firstName; + private String lastName; + private String password; + + public LibraryUserModel(String id, String email, String firstName, String lastName, String password) { + this.id = id; + this.email = email; + this.firstName = firstName; + this.lastName = lastName; + this.password = password; + } +} diff --git a/lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql b/lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql new file mode 100644 index 000000000..098734d2b --- /dev/null +++ b/lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql @@ -0,0 +1,26 @@ +SELECT media_type, COUNT(*) AS item_count +FROM media_items +GROUP BY media_type; + +SELECT SUM (m.page_count) AS total_pages_checked_out +FROM checked_out_items c +JOIN media_items m ON c.media_id = m.id; + +SELECT g.*, c.* +FROM guests g +LEFT JOIN checked_out_items c ON g.id = c.guests_id +LIMIT 5; + +CREATE TABLE libraries_users ( + id TEXT PRIMARY KEY, + email TEXT NOT NULL UNIQUE, + first_name TEXT NOT NULL, + last_name TEXT NOT NULL, + password TEXT NOT NULL, +); + +INSERT INTO library_users (id, email, first_name, last_name, password +VALUES +('1', 'jane@example.com', 'Jane', 'Doe', '$2a$10$8Sbo8w4UTo7PYYMRAfE8ieBaQYqDZV9AYw2x9AlFFeFZ3Y3q1TxMi'), +('2', 'john@example.com', 'John', 'Smith', '$2a$10$L8lWx.L3QhxiKyzYJCTi7uYTeKKbqElxRYHO6mGjc5Cfb5pY3HHQO'), +('3', 'olivia@example.com', 'Olivia', 'James', '$2a$10$kRrQ3YbeXYbXl9F6sUYOYOX5pK8flNOuNcByVRKz9ChfLYUM6ZKAe'); \ No newline at end of file diff --git a/lesson_28/db/db_app/src/main/resources/sqlite/data.db b/lesson_28/db/db_app/src/main/resources/sqlite/data.db index 8baa982d2b27c50808a4c569a14c47972c41a695..c122ce889f304d743e4a92dba6f8f458559ea20c 100644 GIT binary patch delta 841 zcma)2Ur*Ce9Brv%LZDYfCB#H)vII>Sv#W#k#ZX2k&~DvIhr1ZF+>SeUv0JxxlfuiG zFTTQO@C#`80=)PMO!QHC*YKiGK4A9;;xIA(l6!N{{hf1u_n!TIdjBhZaC;&`QB=@h z=XK|BR+x@ZbIRd3t5U;bXB2qMeqoKVGj?M9)BEIYoxE-3G28V)c4y&EV2G zRpoN&)of0lZFLDH;<$}M6;<#ct0%Y6Kbke>?eQqD8s(v*>V5KuqPCF3zpfFqkG&( zwuP7=;HRhB0l~J&D}olWhblD-&lT;8*1cKtGjKyu6yhI-Ug}O(fF{mEGjEB>c{c|& zsO4idC0?@9S~Fc-+TGBVJuy)(sW6wC-&7?0d?*OQH~kUOZM$6kbHJM2Dp%Jlq*3ns zt8we8H>V2OvPYENJ-C)I$U+kuSW(QnY zMpZoE@8e|~_s!$$rXAmTlr!vw41_6ND#`H(!AmF$>&u%Pq6BxMo+w$#Bu;J$P^j~U zmm;H`(7-7Leu1Ch)DP`DdwB5UZh!%_z;yQL&=m%Z@IBr!1-^mL;JDBGuy~8%>A#a@ SZZKi`avDREOnBt-7k&e-90FMY delta 59 zcmZp8z}V2hI6+!amw|zS1&ColcA}24ur7n1_e5Tx5Hnv01HT>LeZG**iVBZ-H;3@8 GF$4fGP78_v From 947a842cacf7db033314c0460b1715d2a93ef66d Mon Sep 17 00:00:00 2001 From: OliviaxJames Date: Fri, 9 May 2025 23:17:20 +0000 Subject: [PATCH 2/2] feat: add oliviajames.sql file --- .../main/resources/queries/oliviajames.sql | 29 ++++++++++-------- .../db_app/src/main/resources/sqlite/data.db | Bin 28672 -> 28672 bytes 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql b/lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql index 098734d2b..f5dfcb567 100644 --- a/lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql +++ b/lesson_28/db/db_app/src/main/resources/queries/oliviajames.sql @@ -1,26 +1,31 @@ -SELECT media_type, COUNT(*) AS item_count +SELECT * FROM media_items + +SELECT type, COUNT(*) AS count FROM media_items -GROUP BY media_type; +GROUP BY type; -SELECT SUM (m.page_count) AS total_pages_checked_out +SELECT SUM (m.pages) AS total_pages_checked_out FROM checked_out_items c -JOIN media_items m ON c.media_id = m.id; +JOIN media_items m ON c.item_id = m.id; + +SELECT g.name, c.* +FROM guests g +LEFT JOIN checked_out_items c ON g.email = c.email -SELECT g.*, c.* -FROM guests g -LEFT JOIN checked_out_items c ON g.id = c.guests_id -LIMIT 5; +DROP TABLE library_users; -CREATE TABLE libraries_users ( +CREATE TABLE library_users ( id TEXT PRIMARY KEY, email TEXT NOT NULL UNIQUE, first_name TEXT NOT NULL, last_name TEXT NOT NULL, - password TEXT NOT NULL, + password TEXT NOT NULL ); -INSERT INTO library_users (id, email, first_name, last_name, password +INSERT INTO library_users (id, email, first_name, last_name, password) VALUES ('1', 'jane@example.com', 'Jane', 'Doe', '$2a$10$8Sbo8w4UTo7PYYMRAfE8ieBaQYqDZV9AYw2x9AlFFeFZ3Y3q1TxMi'), ('2', 'john@example.com', 'John', 'Smith', '$2a$10$L8lWx.L3QhxiKyzYJCTi7uYTeKKbqElxRYHO6mGjc5Cfb5pY3HHQO'), -('3', 'olivia@example.com', 'Olivia', 'James', '$2a$10$kRrQ3YbeXYbXl9F6sUYOYOX5pK8flNOuNcByVRKz9ChfLYUM6ZKAe'); \ No newline at end of file +('3', 'olivia@example.com', 'Olivia', 'James', '$2a$10$kRrQ3YbeXYbXl9F6sUYOYOX5pK8flNOuNcByVRKz9ChfLYUM6ZKAe'); + +SELECT * FROM library_users; \ No newline at end of file diff --git a/lesson_28/db/db_app/src/main/resources/sqlite/data.db b/lesson_28/db/db_app/src/main/resources/sqlite/data.db index c122ce889f304d743e4a92dba6f8f458559ea20c..23da1d00e148d854dbbbbba3af490d9d5a062888 100644 GIT binary patch delta 45 tcmZp8z}WDBae}m<2?GNII}pQw(nK9&Mw5*R6M0zpd>HO-{>sCh3;@^r3Jd@M delta 43 rcmZp8z}WDBae}m-I}pQw+(aE?M*WQm6L}^E@NNFj!