Song URL: DB schema and data for ES, adapt Insert Song form

isra00 · Apr 28, 2024 · ae99ab7 · ae99ab7
1 parent bfd5166
commit ae99ab7
Show file tree

Hide file tree

Showing 7 changed files with 1,166 additions and 1,153 deletions.
diff --git a/create_tables.sql b/create_tables.sql
@@ -66,6 +66,7 @@ CREATE TABLE `song` (
   `people_lowest_note` char(3) DEFAULT NULL,
   `people_highest_note` char(3) DEFAULT NULL,
   `artistic_adjustment` tinyint DEFAULT NULL,
+  `url` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id_song`),
   UNIQUE KEY `slug` (`slug`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1205 DEFAULT CHARSET=utf8mb3;

diff --git a/song_data.sql b/song_data.sql
diff --git a/src/NeoTransposer/Domain/Repository/SongRepository.php b/src/NeoTransposer/Domain/Repository/SongRepository.php
@@ -23,7 +23,8 @@ public function createSong(
         string $peopleHighestNote,
         bool $firstChordIsNote,
         string $slug,
-        array $chords
+        array $chords,
+        ?string $url = null
     ): void;
 
     public function slugAlreadyExists(string $slug): bool;

diff --git a/src/NeoTransposer/Domain/Service/SongCreator.php b/src/NeoTransposer/Domain/Service/SongCreator.php
@@ -23,7 +23,8 @@ public function createSong(
         string $peopleLowestNote,
         string $peopleHighestNote,
         bool $firstChordIsNote,
-        array $chords
+        array $chords,
+        ?string $url = null
     ): void {
 
         $this->songRepository->createSong(
@@ -36,7 +37,8 @@ public function createSong(
             $peopleHighestNote,
             $firstChordIsNote,
             $this->getSlug($title, $idBook),
-            $chords
+            $chords,
+            $url
         );
     }
 

diff --git a/src/NeoTransposer/Infrastructure/SongRepositoryMysql.php b/src/NeoTransposer/Infrastructure/SongRepositoryMysql.php
@@ -108,7 +108,8 @@ public function createSong(
         string $peopleHighestNote,
         bool $firstChordIsNote,
         string $slug,
-        array $chords
+        array $chords,
+        ?string $url = null
     ): void {
 
         $this->dbConnection->insert('song', [
@@ -120,7 +121,8 @@ public function createSong(
 			'people_lowest_note' 	=> $peopleLowestNote,
 			'people_highest_note' 	=> $peopleHighestNote,
 			'first_chord_is_tone' 	=> $firstChordIsNote,
-			'slug'	 				=> $slug
+			'slug'	 				=> $slug,
+			'url'	 				=> $url
 		]);
 
 		$idSong = $this->dbConnection->lastInsertId();

diff --git a/templates/insert_song.twig b/templates/insert_song.twig
@@ -15,10 +15,15 @@
 		</select>
 	</p>
 
-	<p class="field-title">
+	<p class="field-wide">
 		<label for="title">Title:</label>
 		<input type="text" name="title" id="title" size="50" autofocus required>
 	</p>
+
+	<p class="field-wide">
+		<label for="url">URL:</label>
+		<input name="url" id="url" type="text" size="50" pattern="^https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$">
+	</p>
 
 	<p>
 		<label for="page">Page:</label>

diff --git a/web/static/style.css b/web/static/style.css
@@ -1654,7 +1654,7 @@ h2.step-1 {
 	width: 2.5em;
 	font-size: 1em;
 }
-.insert-song .field-title input[type=text] {
+.insert-song .field-wide input[type=text] {
 	width: auto;
 }