diff --git a/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/factory/LibraryDbDataLoader.java b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/factory/LibraryDbDataLoader.java index c0e49ada..bcf71eae 100644 --- a/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/factory/LibraryDbDataLoader.java +++ b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/factory/LibraryDbDataLoader.java @@ -2,6 +2,7 @@ import com.codedifferently.lesson14.models.LibraryDataModel; import com.codedifferently.lesson14.repository.LibraryGuestRepository; +import com.codedifferently.lesson14.repository.LibraryUserRepository; import com.codedifferently.lesson14.repository.MediaItemRepository; import java.io.IOException; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +14,7 @@ public final class LibraryDbDataLoader implements LibraryDataLoader { @Autowired private MediaItemRepository mediaItemsRepository; @Autowired private LibraryGuestRepository libraryGuestRepository; + @Autowired private LibraryUserRepository libraryUserRepository; @Override public LibraryDataModel loadData() throws IOException { @@ -20,6 +22,7 @@ public LibraryDataModel loadData() throws IOException { model.mediaItems = mediaItemsRepository.findAll(); model.guests = libraryGuestRepository.findAll(); + model.users = libraryUserRepository.findAll(); return model; } diff --git a/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/models/LibraryDataModel.java b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/models/LibraryDataModel.java index 21581f4b..6c1d3816 100644 --- a/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/models/LibraryDataModel.java +++ b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/models/LibraryDataModel.java @@ -16,6 +16,7 @@ public class LibraryDataModel { public List mediaItems; public List guests; + public List users; public List getMediaItems() { List results = new ArrayList<>(); diff --git a/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/models/LibraryUserModel.java b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/models/LibraryUserModel.java new file mode 100644 index 00000000..0ede0650 --- /dev/null +++ b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/models/LibraryUserModel.java @@ -0,0 +1,15 @@ +package com.codedifferently.lesson14.models; + +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "library_users") +public class LibraryUserModel { + @Id public String id; + public String email; + public String first_name; + public String last_name; + public String password; +} diff --git a/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/repository/LibraryUserRepository.java b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/repository/LibraryUserRepository.java new file mode 100644 index 00000000..b742cee1 --- /dev/null +++ b/lesson_14/db/db_app/src/main/java/com/codedifferently/lesson14/repository/LibraryUserRepository.java @@ -0,0 +1,10 @@ +package com.codedifferently.lesson14.repository; + +import com.codedifferently.lesson14.models.LibraryUserModel; +import java.util.List; +import org.springframework.data.repository.CrudRepository; + +public interface LibraryUserRepository extends CrudRepository { + @Override + List findAll(); +} diff --git a/lesson_14/db/db_app/src/main/resources/queries/mohamedibrahim.sql b/lesson_14/db/db_app/src/main/resources/queries/mohamedibrahim.sql new file mode 100644 index 00000000..0189dbac --- /dev/null +++ b/lesson_14/db/db_app/src/main/resources/queries/mohamedibrahim.sql @@ -0,0 +1,24 @@ +SELECT type, COUNT(*) +FROM media_items +GROUP BY type; + +SELECT SUM(pages) +FROM media_items, checked_out_items +WHERE id = item_id ; + +SELECT G.type, G.name, CI.* +FROM guests G +LEFT JOIN checked_out_items CI +ON G.email = CI.email; + +CREATE TABLE library_users( +id VARCHAR(36) PRIMARY KEY, +email VARCHAR(320), +first_name VARCHAR(50), +last_name VARCHAR(50), +password VARCHAR(72)); + +INSERT INTO library_users(id, email,first_name, last_name, password) +VALUES ("2584d0d6-fe06-46f2-be8b-6f1a31b57fb3","johnjr@book.com","John", "Book Jr.", "$2a$12$pKO91AkPiVjNjPX0f8Cu1Os6zPO3e7slKayXMGXgeTr2grCwM.0Hu"); + +SELECT * FROM library_users; \ No newline at end of file diff --git a/lesson_14/db/db_app/src/main/resources/sqlite/data.db b/lesson_14/db/db_app/src/main/resources/sqlite/data.db index 8baa982d..f986e307 100644 Binary files a/lesson_14/db/db_app/src/main/resources/sqlite/data.db and b/lesson_14/db/db_app/src/main/resources/sqlite/data.db differ