Merge #315: feat: [#303] store in the database the torrent fields creation_date c…

josecelano · josecelano · commit 41c80f359490 · 2023-11-09T16:39:39.000Z
c22f661 refactor: [#303] store in the database the torrent fields creation date created by encoding (Mario) c3d69f4 feat: [#303] store in the database the torrent fields creation date created_by encoding (MMelchor) aadde22 refactor: [#303] store in the database the torrent fields creation date created_by encoding (MMelchor) 0a48536 refactor: [#303] store in the database the torrent fields creation_date created_by encoding (MMelchor) b738291 feat: [#303] store in the database the torrent fields creation_date created_by encoding (MMelchor) Pull request description: Resolves #303. ACKs for top commit: josecelano: ACK c22f661 Tree-SHA512: 98e112f731b1ddd0f53eac8d55e01a7f77ec556fed32cfb07c42028c68bcdf0d27a7dcd615d97a6f04109f07707c748aa8d3fb7faed79d8997769ff1bec56961
diff --git a/migrations/mysql/20230921211523_torrust_add_creation_date_field_to_torrent.sql b/migrations/mysql/20230921211523_torrust_add_creation_date_field_to_torrent.sql
@@ -0,0 +1 @@
+ALTER TABLE torrust_torrents ADD COLUMN creation_date BIGINT NULL;
diff --git a/migrations/mysql/20230921211551_torrust_add_created_by_to_torrent.sql b/migrations/mysql/20230921211551_torrust_add_created_by_to_torrent.sql
@@ -0,0 +1 @@
+ALTER TABLE torrust_torrents ADD COLUMN created_by TEXT NULL;
diff --git a/migrations/mysql/20230921211559_torrust_add_encoding_to_torrent.sql b/migrations/mysql/20230921211559_torrust_add_encoding_to_torrent.sql
@@ -0,0 +1 @@
+ALTER TABLE torrust_torrents ADD COLUMN `encoding` TEXT NULL;
diff --git a/migrations/sqlite3/20230921211523_torrust_add_creation_date_field_to_torrent.sql b/migrations/sqlite3/20230921211523_torrust_add_creation_date_field_to_torrent.sql
@@ -0,0 +1 @@
+ALTER TABLE "torrust_torrents" ADD COLUMN "creation_date" BIGINT NULL;
diff --git a/migrations/sqlite3/20230921211551_torrust_add_created_by_to_torrent.sql b/migrations/sqlite3/20230921211551_torrust_add_created_by_to_torrent.sql
@@ -0,0 +1 @@
+ALTER TABLE "torrust_torrents" ADD COLUMN "created_by" TEXT NULL;
diff --git a/migrations/sqlite3/20230921211559_torrust_add_encoding_to_torrent.sql b/migrations/sqlite3/20230921211559_torrust_add_encoding_to_torrent.sql
@@ -0,0 +1 @@
+ALTER TABLE "torrust_torrents" ADD COLUMN `encoding` TEXT NULL;
diff --git a/src/databases/mysql.rs b/src/databases/mysql.rs
@@ -387,6 +387,9 @@ impl Database for Mysql {
             tt.size AS file_size,
             tt.name,
             tt.comment,
+            tt.creation_date,
+            tt.created_by,
+            tt.`encoding`,
             CAST(COALESCE(sum(ts.seeders),0) as signed) as seeders,
             CAST(COALESCE(sum(ts.leechers),0) as signed) as leechers
             FROM torrust_torrents tt
@@ -465,8 +468,11 @@ impl Database for Mysql {
             root_hash,
             `source`,
             comment,
-            date_uploaded
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, UTC_TIMESTAMP())",
+            date_uploaded,
+            creation_date,
+            created_by,
+            `encoding`
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, UTC_TIMESTAMP(), ?, ?, ?)",
         )
         .bind(uploader_id)
         .bind(metadata.category_id)
@@ -479,6 +485,9 @@ impl Database for Mysql {
         .bind(root_hash)
         .bind(torrent.info.source.clone())
         .bind(torrent.comment.clone())
+        .bind(torrent.creation_date)
+        .bind(torrent.created_by.clone())
+        .bind(torrent.encoding.clone())
         .execute(&mut *tx)
         .await
         .map(|v| i64::try_from(v.last_insert_id()).expect("last ID is larger than i64"))
@@ -754,6 +763,9 @@ impl Database for Mysql {
             tt.size AS file_size,
             tt.name,
             tt.comment,
+            tt.creation_date,
+            tt.created_by,
+            tt.`encoding`,
             CAST(COALESCE(sum(ts.seeders),0) as signed) as seeders,
             CAST(COALESCE(sum(ts.leechers),0) as signed) as leechers
             FROM torrust_torrents tt
@@ -782,6 +794,9 @@ impl Database for Mysql {
             tt.size AS file_size,
             tt.name,
             tt.comment,
+            tt.creation_date,
+            tt.created_by,
+            tt.`encoding`,
             CAST(COALESCE(sum(ts.seeders),0) as signed) as seeders,
             CAST(COALESCE(sum(ts.leechers),0) as signed) as leechers
             FROM torrust_torrents tt
diff --git a/src/databases/sqlite.rs b/src/databases/sqlite.rs
@@ -377,6 +377,9 @@ impl Database for Sqlite {
             tt.size AS file_size,
             tt.name,
             tt.comment,
+            tt.creation_date,
+            tt.created_by,
+            tt.`encoding`,
             CAST(COALESCE(sum(ts.seeders),0) as signed) as seeders,
             CAST(COALESCE(sum(ts.leechers),0) as signed) as leechers
             FROM torrust_torrents tt
@@ -455,8 +458,11 @@ impl Database for Sqlite {
             root_hash,
             `source`,
             comment,
-            date_uploaded
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%d %H:%M:%S',DATETIME('now', 'utc')))",
+            date_uploaded,
+            creation_date,
+            created_by,
+            `encoding`
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, strftime('%Y-%m-%d %H:%M:%S',DATETIME('now', 'utc')), ?, ?, ?)",
         )
         .bind(uploader_id)
         .bind(metadata.category_id)
@@ -469,6 +475,9 @@ impl Database for Sqlite {
         .bind(root_hash)
         .bind(torrent.info.source.clone())
         .bind(torrent.comment.clone())
+        .bind(torrent.creation_date)
+        .bind(torrent.created_by.clone())
+        .bind(torrent.encoding.clone())
         .execute(&mut *tx)
         .await
         .map(|v| v.last_insert_rowid())
@@ -743,6 +752,9 @@ impl Database for Sqlite {
             tt.size AS file_size,
             tt.name,
             tt.comment,
+            tt.creation_date,
+            tt.created_by,
+            tt.`encoding`,
             CAST(COALESCE(sum(ts.seeders),0) as signed) as seeders,
             CAST(COALESCE(sum(ts.leechers),0) as signed) as leechers
             FROM torrust_torrents tt
@@ -770,6 +782,9 @@ impl Database for Sqlite {
             tt.size AS file_size,
             tt.name,
             tt.comment,
+            tt.creation_date,
+            tt.created_by,
+            tt.`encoding`,
             CAST(COALESCE(sum(ts.seeders),0) as signed) as seeders,
             CAST(COALESCE(sum(ts.leechers),0) as signed) as leechers
             FROM torrust_torrents tt
diff --git a/src/models/response.rs b/src/models/response.rs
@@ -63,6 +63,9 @@ pub struct TorrentResponse {
     pub tags: Vec<TorrentTag>,
     pub name: String,
     pub comment: Option<String>,
+    pub creation_date: Option<i64>,
+    pub created_by: Option<String>,
+    pub encoding: Option<String>,
 }
 
 impl TorrentResponse {
@@ -85,6 +88,9 @@ impl TorrentResponse {
             tags: vec![],
             name: torrent_listing.name,
             comment: torrent_listing.comment,
+            creation_date: torrent_listing.creation_date,
+            created_by: torrent_listing.created_by,
+            encoding: torrent_listing.encoding,
         }
     }
 }
diff --git a/src/models/torrent.rs b/src/models/torrent.rs
@@ -25,6 +25,9 @@ pub struct TorrentListing {
     pub leechers: i64,
     pub name: String,
     pub comment: Option<String>,
+    pub creation_date: Option<i64>,
+    pub created_by: Option<String>,
+    pub encoding: Option<String>,
 }
 
 #[derive(Debug, Display, PartialEq, Eq, Error)]
diff --git a/src/models/torrent_file.rs b/src/models/torrent_file.rs
@@ -88,12 +88,12 @@ impl Torrent {
             info: info_dict,
             announce: None,
             nodes: None,
-            encoding: None,
+            encoding: db_torrent.encoding.clone(),
             httpseeds: None,
             announce_list: Some(torrent_announce_urls),
-            creation_date: None,
+            creation_date: db_torrent.creation_date,
             comment: db_torrent.comment.clone(),
-            created_by: None,
+            created_by: db_torrent.created_by.clone(),
         }
     }
 
@@ -303,6 +303,9 @@ pub struct DbTorrent {
     pub private: Option<u8>,
     pub root_hash: i64,
     pub comment: Option<String>,
+    pub creation_date: Option<i64>,
+    pub created_by: Option<String>,
+    pub encoding: Option<String>,
 }
 
 #[allow(clippy::module_name_repetitions)]
diff --git a/src/services/torrent_file.rs b/src/services/torrent_file.rs
@@ -19,6 +19,9 @@ pub struct CreateTorrentRequest {
     // Other fields of the root level metainfo dictionary
     pub announce_urls: Vec<Vec<String>>,
     pub comment: Option<String>,
+    pub creation_date: Option<i64>,
+    pub created_by: Option<String>,
+    pub encoding: Option<String>,
 }
 
 impl CreateTorrentRequest {
@@ -35,12 +38,12 @@ impl CreateTorrentRequest {
             info: info_dict,
             announce: None,
             nodes: None,
-            encoding: None,
+            encoding: self.encoding.clone(),
             httpseeds: None,
             announce_list: Some(self.announce_urls.clone()),
-            creation_date: None,
+            creation_date: self.creation_date,
             comment: self.comment.clone(),
-            created_by: None,
+            created_by: self.created_by.clone(),
         }
     }
 
@@ -93,6 +96,9 @@ pub fn generate_random_torrent(id: Uuid) -> Torrent {
         files: torrent_files,
         announce_urls: torrent_announce_urls,
         comment: None,
+        creation_date: None,
+        created_by: None,
+        encoding: None,
     };
 
     create_torrent_req.build_torrent()
diff --git a/tests/common/contexts/torrent/file.rs b/tests/common/contexts/torrent/file.rs
@@ -12,8 +12,9 @@ use which::which;
 pub struct TorrentFileInfo {
     pub name: String,
     pub comment: Option<String>,
-    pub creation_date: Option<u64>,
+    pub creation_date: Option<i64>,
     pub created_by: Option<String>,
+    pub encoding: Option<String>,
     pub source: Option<String>,
     pub info_hash: String,
     pub torrent_size: u64,
diff --git a/tests/common/contexts/torrent/responses.rs b/tests/common/contexts/torrent/responses.rs
@@ -41,6 +41,9 @@ pub struct ListItem {
     pub leechers: i64,
     pub name: String,
     pub comment: Option<String>,
+    pub creation_date: Option<i64>,
+    pub created_by: Option<String>,
+    pub encoding: Option<String>,
 }
 
 #[derive(Deserialize, PartialEq, Debug)]
@@ -66,6 +69,9 @@ pub struct TorrentDetails {
     pub tags: Vec<Tag>,
     pub name: String,
     pub comment: Option<String>,
+    pub creation_date: Option<i64>,
+    pub created_by: Option<String>,
+    pub encoding: Option<String>,
 }
 
 #[derive(Deserialize, PartialEq, Debug)]
diff --git a/tests/e2e/web/api/v1/contexts/torrent/asserts.rs b/tests/e2e/web/api/v1/contexts/torrent/asserts.rs
@@ -26,14 +26,6 @@ pub async fn canonical_torrent_for(
     uploaded_torrent.announce = Some(build_announce_url(&tracker_url, &tracker_key));
     uploaded_torrent.announce_list = Some(build_announce_list(&tracker_url, &tracker_key));
 
-    // These fields are not persisted in the database yet.
-    // See https://github.com/torrust/torrust-index/issues/284
-    // They are ignore when the user uploads the torrent. So the stored
-    // canonical torrent does not contain them.
-    uploaded_torrent.encoding = None;
-    uploaded_torrent.creation_date = None;
-    uploaded_torrent.created_by = None;
-
     uploaded_torrent
 }
 
diff --git a/tests/e2e/web/api/v1/contexts/torrent/contract.rs b/tests/e2e/web/api/v1/contexts/torrent/contract.rs
@@ -213,6 +213,9 @@ mod for_guests {
             tags: vec![],
             name: test_torrent.index_info.name.clone(),
             comment: test_torrent.file_info.comment.clone(),
+            creation_date: test_torrent.file_info.creation_date,
+            created_by: test_torrent.file_info.created_by.clone(),
+            encoding: test_torrent.file_info.encoding.clone(),
         };
 
         assert_expected_torrent_details(&torrent_details_response.data, &expected_torrent);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE torrust_torrents ADD COLUMN creation_date BIGINT NULL;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ALTER TABLE torrust_torrents ADD COLUMN `encoding` TEXT NULL;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE "torrust_torrents" ADD COLUMN "creation_date" BIGINT NULL;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+ALTER TABLE "torrust_torrents" ADD COLUMN `encoding` TEXT NULL;
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ pub struct TorrentResponse {`
`63`	`63`	`pub tags: Vec<TorrentTag>,`
`64`	`64`	`pub name: String,`
`65`	`65`	`pub comment: Option<String>,`
	`66`	`+ pub creation_date: Option<i64>,`
	`67`	`+ pub created_by: Option<String>,`
	`68`	`+ pub encoding: Option<String>,`
`66`	`69`	`}`
`67`	`70`
`68`	`71`	`impl TorrentResponse {`
`@@ -85,6 +88,9 @@ impl TorrentResponse {`
`85`	`88`	`tags: vec![],`
`86`	`89`	`name: torrent_listing.name,`
`87`	`90`	`comment: torrent_listing.comment,`
	`91`	`+ creation_date: torrent_listing.creation_date,`
	`92`	`+ created_by: torrent_listing.created_by,`
	`93`	`+ encoding: torrent_listing.encoding,`
`88`	`94`	`}`
`89`	`95`	`}`
`90`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ pub struct TorrentListing {`
`25`	`25`	`pub leechers: i64,`
`26`	`26`	`pub name: String,`
`27`	`27`	`pub comment: Option<String>,`
	`28`	`+ pub creation_date: Option<i64>,`
	`29`	`+ pub created_by: Option<String>,`
	`30`	`+ pub encoding: Option<String>,`
`28`	`31`	`}`
`29`	`32`
`30`	`33`	`#[derive(Debug, Display, PartialEq, Eq, Error)]`