Ajaku/refactor backend

create_table.sql

@@ -1,10 +1,41 @@
 CREATE TABLE users (
     id serial,
-    user_name varchar(50) NOT NULL UNIQUE,
+    username varchar(50) NOT NULL,
     password varchar(50) NOT NULL,
-    PRIMARY KEY (id)
+    PRIMARY KEY (id),
+    UNIQUE(username, password)
+);
+
+CREATE TABLE artists ( 
+    artist_id serial,
+    artist_name varchar(50) UNIQUE NOT NULL,
+    PRIMARY KEY(artist_id)
+);
+
+CREATE TABLE tracks (
+    track_id serial,
+    track_name varchar(50) UNIQUE NOT NULL,
+    description varchar(500),
+    artist_name varchar(50) NOT NULL,
+    plays integer DEFAULT 0 NOT NULL,
+    track_path varchar(500) NOT NULL,
+    PRIMARY KEY (track_id),
+    FOREIGN KEY (artist_name) REFERENCES artists(artist_name)
+--  genre_id integer NOT NULL,
+--  album_id integer,
+--  art_path varchar(500),
+--  FOREIGN KEY (artist_id) REFERENCES users(id) ON DELETE CASCADE,
+--  FOREIGN KEY (genre_id) REFERENCES genres(id) ON DELETE CASCADE
+);
+
+/*
+CREATE TABLE media ( 
+    user_id integer UNIQUE,
+    track_id integer
 );
+*/
 
+/*
 CREATE TABLE playlists (
     id serial,
     playlist_name varchar(50) NOT NULL,
@@ -13,6 +44,7 @@ CREATE TABLE playlists (
     PRIMARY KEY (id),
     FOREIGN KEY (creator_id) REFERENCES users(id)
 );
+*/
 
 /*
 CREATE TABLE genres (
@@ -34,21 +66,8 @@ CREATE TABLE albums (
 );
 */
 
-CREATE TABLE tracks (
-    id serial,
-    track_name varchar(50) NOT NULL,
-    description varchar(500),
---    artist_id integer NOT NULL,
---    genre_id integer NOT NULL,
---    album_id integer,
-    plays integer DEFAULT 0 NOT NULL,
-    track_path varchar(500) NOT NULL,
-    art_path varchar(500),
-    PRIMARY KEY (id)
---  FOREIGN KEY (artist_id) REFERENCES users(id) ON DELETE CASCADE,
---  FOREIGN KEY (genre_id) REFERENCES genres(id) ON DELETE CASCADE
-);
 
+/*
 CREATE TABLE playlist_tracks (
     id serial,
     playlist_id integer NOT NULL,
@@ -57,6 +76,7 @@ CREATE TABLE playlist_tracks (
     FOREIGN KEY (playlist_id) REFERENCES playlists(id),
     FOREIGN KEY (song_id) REFERENCES tracks(id)
 );
+*/
 
 /*
 CREATE TABLE comments (

init_db.py

@@ -0,0 +1,73 @@
+import psycopg2
+from psycopg2 import sql
+
+import random
+
+def create_db(db_name, user, password, host, port):
+    # Connect to postgresql database first
+    print(f"Created {db_name} database")
+    connection = psycopg2.connect(dbname=db_name, user=user, password=password, host=host, port=port)
+    connection.autocommit = True # Allows us to operate outside of a transaction (basically create database)
+    cursor = connection.cursor()
+
+    # Switch to db to soundclown and create it
+    db_name = "soundclown"
+    cursor.execute(sql.SQL(f"CREATE DATABASE {db_name}"))
+    connection.close()
+    connection = psycopg2.connect(dbname=db_name, user=user, password=password, host=host, port=port)
+    connection.autocommit = True # Allows us to operate outside of a transaction (basically create database)
+    cursor = connection.cursor()
+    print("Created {db_name} database")
+    return connection, cursor
+
+
+def create_table(cursor):
+    # Create tables
+    cursor.execute('''CREATE TABLE users (
+                        user_id serial,
+                        user_name varchar(50) NOT NULL,
+                        password varchar(50) NOT NULL,
+                        PRIMARY KEY (user_id),
+                        UNIQUE(user_name, password)
+                    )''')
+
+    cursor.execute('''CREATE TABLE artists (
+                        artist_id serial,
+                        artist_name varchar(50) UNIQUE NOT NULL,
+                        PRIMARY KEY(artist_id)
+                    )''')
+    cursor.execute('''CREATE TABLE tracks (
+                        track_id serial,
+                        track_name varchar(50) UNIQUE NOT NULL,
+                        description varchar(500),
+                        artist_name varchar(50) NOT NULL,
+                        plays integer DEFAULT 0 NOT NULL,
+                        track_path varchar(500) NOT NULL,
+                        PRIMARY KEY (track_id),
+                        FOREIGN KEY (artist_name) REFERENCES artists(artist_name)
+                    )''')
+
+    print("Finished creating tables")
+
+
+def insert_items(cursor):
+    for i in range(1, 101):
+        user     = f"user{i}"
+        password = f"pw_{i}"
+        cursor.execute(f'''INSERT into users (user_name, password)
+                           VALUES('{user}', '{password}')''')
+
+
+    # Add inserting tracks and artists once I know what they are
+
+
+if __name__ == "__main__":
+    db_name  = "postgres"
+    user     = "postgres"
+    password = "password"
+    host     = "localhost"
+    port     = "5432"
+    connection, cursor = create_db(db_name, user, password, host, port)
+    create_table(cursor)
+    connection.close()
+    print("Done")

pom.xml

@@ -35,8 +35,29 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
+        </dependency>
+		<dependency>
+		  <groupId>org.springframework.boot</groupId>
+		  <artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>4.1.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
 	</dependencies>
-
     <build>
         <plugins>
             <plugin>

requirements.txt

@@ -0,0 +1,6 @@
+certifi==2024.2.2
+charset-normalizer==3.3.2
+idna==3.6
+psycopg2-binary==2.9.9
+requests==2.31.0
+urllib3==2.2.1