Merge branch 'code-differently:main' into lesson_26

Author: Cogbonnia

.devcontainer/devcontainer.json

@@ -16,7 +16,10 @@
 		"ghcr.io/devcontainers-contrib/features/ts-node:1": {},
 		"ghcr.io/devcontainers/features/sshd:1": {},
 		"ghcr.io/warrenbuckley/codespace-features/sqlite:1": {},
-     	"ghcr.io/devcontainers/features/github-cli:1": {}
+		"ghcr.io/devcontainers/features/github-cli:1": {},
+		"ghcr.io/devcontainers-extra/features/vercel-cli:1": {},
+		"ghcr.io/audacioustux/devcontainers/flyctl:1": {},
+		"ghcr.io/itsmechlark/features/redis-server:1": {}
 	},
 	"portsAttributes": {
 	  "80": {

lesson_28/README.md

@@ -13,4 +13,27 @@ Please review the following resources before lecture:
 
 ## Homework
 
-TODO(anthonydmays): Make something up right here.
+- [ ] Complete [Loading the Library, Part II](#loading-the-library-part-ii) assignment.
+
+
+### Loading The Library, Part II
+
+Instead of loading our library data from JSON or CSV files as we did in [lesson_10](/lesson_10/), we now want to load data from a proper database. A new implementation of the `LibraryDbDataLoader` data loader has been provided to accomplish this task and is now the [default data loader][library-app] for the app.
+
+To build familiarity in working with databases, you are charged with the following tasks:
+
+* Write a `.sql` script file that queries the following data. Use a unique name for your file and store it in the [queries][queries-dir] directory of the resources folder.
+    * A `SELECT` query that returns the counts of media items by type.
+    * A `SELECT` query that returns the sum of total pages checked out by guests.
+    * A `SELECT` query that shows all 5 guests and any corresponding records in the `checked_out_items` table.
+* Add a new table called `library_users` to the [SQLite database][sqlite-db] that stores a user's id (UUID formatted string), email, first name, last name, and a password (bcrypt encoded string). Add a model and repository that loads the users into the LibraryDataModel (see `LibraryGuestModel` and `LibraryGuestRepository` as examples). Populate the database with a few users.
+
+As before, you can run the app from the console using the following command:
+
+```bash
+./gradlew run --console=plain
+```
+
+[queries-dir]: ./db/db_app/src/main/resources/queries/
+[sqlite-db]: ./db/db_app/src/main/resources/sqlite/
+[library-app]: ./db/db_app/src/main/java/com/codedifferently/lesson28/cli/LibraryApp.java#L26

lesson_28/createdb/createdb.py

@@ -0,0 +1,23 @@
+import os
+import pandas as pd
+import numpy as np
+import sqlite3
+
+# Step 1: Load the CSV file into a pandas DataFrame
+media_items_df = pd.read_csv('/workspaces/code-differently-24-q1/lesson_12/io/io_app/src/main/resources/csv/media_items.csv')
+guests_df = pd.read_csv('/workspaces/code-differently-24-q1/lesson_12/io/io_app/src/main/resources/csv/guests.csv')
+checked_out_items_df = pd.read_csv('/workspaces/code-differently-24-q1/lesson_12/io/io_app/src/main/resources/csv/checked_out_items.csv')
+checked_out_items_df['due_date'] = pd.to_datetime(checked_out_items_df['due_date']).values.astype(np.int64)
+
+# Step 2: Create a connection to the SQLite database
+# Note: This will create the database file if it doesn't exist already
+os.makedirs('/workspaces/code-differently-24-q1/lesson_28/db/db_app/src/main/resources/sqlite/', exist_ok=True)
+conn = sqlite3.connect('../db/db_app/src/main/resources/sqlite/data.db')
+
+# Step 3: Write the DataFrame to the SQLite database
+media_items_df.to_sql('media_items', conn, if_exists='replace', index=False)
+guests_df.to_sql('guests', conn, if_exists='replace', index=False)
+checked_out_items_df.to_sql('checked_out_items', conn, if_exists='replace', index=False)
+
+# Don't forget to close the connection
+conn.close()

lesson_28/createdb/requirements.txt

@@ -0,0 +1 @@
+pandas

lesson_28/db/.gitattributes

@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

lesson_28/db/.gitignore

@@ -0,0 +1,5 @@
+# Ignore Gradle project-specific cache directory
+.gradle
+
+# Ignore Gradle build output directory
+build

lesson_28/db/db_app/build.gradle.kts

@@ -0,0 +1,76 @@
+plugins {
+    // Apply the application plugin to add support for building a CLI application in Java.
+    application
+    eclipse
+    id("com.diffplug.spotless") version "6.25.0"
+	  id("org.springframework.boot") version "3.2.2"
+    id("com.adarshr.test-logger") version "4.0.0"
+    id("io.freefair.lombok") version "8.6"
+}
+
+apply(plugin = "io.spring.dependency-management")
+
+repositories {
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+}
+
+dependencies {
+    // Use JUnit Jupiter for testing.
+    testImplementation("com.codedifferently.instructional:instructional-lib")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
+    testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.assertj:assertj-core:3.25.1")
+    testImplementation("at.favre.lib:bcrypt:0.10.2")
+
+    // This dependency is used by the application.
+    implementation("com.codedifferently.instructional:instructional-lib")
+    implementation("com.google.guava:guava:31.1-jre")
+    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("commons-cli:commons-cli:1.6.0")
+    implementation("org.springframework.boot:spring-boot-starter")
+    implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("com.fasterxml.jackson.core:jackson-databind:2.13.0")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.3")
+    implementation("com.opencsv:opencsv:5.9")
+    implementation("org.apache.commons:commons-csv:1.10.0")
+    implementation("org.xerial:sqlite-jdbc:3.36.0")
+    implementation("org.hibernate.orm:hibernate-community-dialects:6.2.7.Final") 
+}
+
+application {
+    // Define the main class for the application.
+    mainClass.set("com.codedifferently.lesson28.Lesson28")
+}
+
+tasks.named<JavaExec>("run") {
+    standardInput = System.`in`
+}
+
+tasks.named<Test>("test") {
+    // Use JUnit Platform for unit tests.
+    useJUnitPlatform()
+}
+
+
+configure<com.diffplug.gradle.spotless.SpotlessExtension> {
+
+  format("misc", {
+    // define the files to apply `misc` to
+    target("*.gradle", ".gitattributes", ".gitignore")
+
+    // define the steps to apply to those files
+    trimTrailingWhitespace()
+    indentWithTabs() // or spaces. Takes an integer argument if you don't like 4
+    endWithNewline()
+  })
+
+  java {
+    // don't need to set target, it is inferred from java
+
+    // apply a specific flavor of google-java-format
+    googleJavaFormat()
+    // fix formatting of type annotations
+    formatAnnotations()
+  }
+}

lesson_28/db/db_app/lombok.config

@@ -0,0 +1,2 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true

lesson_28/db/db_app/src/main/java/com/codedifferently/lesson28/Lesson28.java

@@ -0,0 +1,38 @@
+package com.codedifferently.lesson28;
+
+import com.codedifferently.lesson28.cli.LibraryApp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@SpringBootApplication(scanBasePackages = "com.codedifferently")
+public class Lesson28 implements CommandLineRunner {
+  @Autowired private LibraryApp libraryApp;
+
+  public static void main(String[] args) {
+    var application = new SpringApplication(Lesson28.class);
+    application.run(args);
+  }
+
+  @Override
+  public void run(String... args) throws Exception {
+    // Don't run as an app if we're running as a JUnit test.
+    if (isJUnitTest()) {
+      return;
+    }
+
+    libraryApp.run(args);
+  }
+
+  private static boolean isJUnitTest() {
+    for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
+      if (element.getClassName().startsWith("org.junit.")) {
+        return true;
+      }
+    }
+    return false;
+  }
+}