mark deprecated api

DenysVuika · Jul 3, 2023 · b88d05f · b88d05f
1 parent f605727
commit b88d05f
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 6 deletions.
diff --git a/src/db.rs b/src/db.rs
@@ -115,9 +115,13 @@ pub struct ProjectInfo {
 
 #[derive(Debug, Serialize)]
 pub struct CodeWarning {
+ pub oid: u64,
+ pub sid: i64,
  pub path: String,
  pub message: String,
  pub url: String,
+ pub tag: String,
+ pub date: String,
 }
 
 #[derive(Serialize)]
@@ -447,14 +451,54 @@ pub fn get_file_types(conn: &Connection, sid: i64) -> Result<HashMap<String, i64
  Ok(file_types)
 }
 
-pub fn get_warnings(conn: &Connection, sid: i64) -> Result<Vec<CodeWarning>> {
- let mut stmt = conn.prepare("SELECT path, message, url FROM warnings WHERE sid=:sid;")?;
+pub fn get_project_warnings(conn: &Connection, pid: i64) -> Result<Vec<CodeWarning>> {
+ let mut stmt = conn.prepare(
+ "
+ SELECT warnings.OID, warnings.sid, warnings.path, warnings.message, warnings.url,
+ snapshots.tag, DATE(snapshots.timestamp) as time 
+ FROM warnings
+ LEFT JOIN snapshots ON snapshots.OID = warnings.sid
+ WHERE snapshots.pid=:pid
+ ORDER BY snapshots.timestamp",
+ )?;
+
+ let rows = stmt
+ .query_map(named_params! { ":pid": pid }, |row| {
+ Ok(CodeWarning {
+ oid: row.get(0)?,
+ sid: row.get(1)?,
+ path: row.get(2)?,
+ message: row.get(3)?,
+ url: row.get(4)?,
+ tag: row.get(5)?,
+ date: row.get(6)?,
+ })
+ })?
+ .filter_map(|entry| entry.ok())
+ .collect();
+ Ok(rows)
+}
+
+pub fn get_snapshot_warnings(conn: &Connection, sid: i64) -> Result<Vec<CodeWarning>> {
+ let mut stmt = conn.prepare(
+ "
+ SELECT warnings.sid, warnings.path, warnings.message, warnings.url,
+ snapshots.tag, DATE(snapshots.timestamp) as time 
+ FROM warnings
+ LEFT JOIN snapshots ON snapshots.OID = warnings.sid
+ WHERE snapshots.OID=:sid
+ ORDER BY snapshots.timestamp",
+ )?;
  let rows = stmt
  .query_map(named_params! { ":sid": sid }, |row| {
  Ok(CodeWarning {
- path: row.get(0)?,
- message: row.get(1)?,
- url: row.get(2)?,
+ oid: row.get(0)?,
+ sid: row.get(1)?,
+ path: row.get(2)?,
+ message: row.get(3)?,
+ url: row.get(4)?,
+ tag: row.get(5)?,
+ date: row.get(6)?,
  })
  })?
  .filter_map(|entry| entry.ok())

diff --git a/src/server.rs b/src/server.rs
@@ -32,6 +32,7 @@ pub async fn run_server(working_dir: PathBuf, open: bool) -> Result<()> {
  web::scope("/api")
  .service(get_projects)
  .service(get_tags)
+ .service(get_project_warnings)
  .service(get_angular_metadata)
  .service(get_snapshots)
  .service(get_angular)
@@ -80,6 +81,17 @@ async fn get_tags(path: web::Path<i64>, data: web::Data<AppState>) -> Result<imp
  Ok(web::Json(result))
 }
 
+#[get("/projects/{pid}/warnings")]
+async fn get_project_warnings(
+ path: web::Path<i64>,
+ data: web::Data<AppState>,
+) -> Result<impl Responder> {
+ let pid = path.into_inner();
+ let conn = &data.connection;
+ let result = db::get_project_warnings(conn, pid).unwrap_or(vec![]);
+ Ok(web::Json(result))
+}
+
 #[get("/reports/{pid}/angular")]
 async fn get_angular_metadata(
  path: web::Path<i64>,
@@ -138,14 +150,16 @@ async fn get_snapshot_project(
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{id}/warnings")]
 async fn get_warnings(path: web::Path<i64>, data: web::Data<AppState>) -> Result<impl Responder> {
  let sid = path.into_inner();
  let conn = &data.connection;
- let result = db::get_warnings(conn, sid).unwrap_or(vec![]);
+ let result = db::get_snapshot_warnings(conn, sid).unwrap_or(vec![]);
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{id}/authors")]
 async fn get_authors(path: web::Path<i64>, data: web::Data<AppState>) -> Result<impl Responder> {
  let sid = path.into_inner();
@@ -154,6 +168,7 @@ async fn get_authors(path: web::Path<i64>, data: web::Data<AppState>) -> Result<
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{id}/file-types")]
 async fn get_file_types(path: web::Path<i64>, data: web::Data<AppState>) -> Result<impl Responder> {
  let sid = path.into_inner();
@@ -162,6 +177,7 @@ async fn get_file_types(path: web::Path<i64>, data: web::Data<AppState>) -> Resu
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{id}/packages")]
 async fn get_packages(path: web::Path<i64>, data: web::Data<AppState>) -> Result<impl Responder> {
  let sid = path.into_inner();
@@ -170,6 +186,7 @@ async fn get_packages(path: web::Path<i64>, data: web::Data<AppState>) -> Result
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{id}/dependencies")]
 async fn get_dependencies(
  path: web::Path<i64>,
@@ -181,6 +198,7 @@ async fn get_dependencies(
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{id}/unit-tests")]
 async fn get_unit_tests(path: web::Path<i64>, data: web::Data<AppState>) -> Result<impl Responder> {
  let sid = path.into_inner();
@@ -189,6 +207,7 @@ async fn get_unit_tests(path: web::Path<i64>, data: web::Data<AppState>) -> Resu
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{id}/e2e-tests")]
 async fn get_e2e_tests(path: web::Path<i64>, data: web::Data<AppState>) -> Result<impl Responder> {
  let sid = path.into_inner();
@@ -200,6 +219,7 @@ async fn get_e2e_tests(path: web::Path<i64>, data: web::Data<AppState>) -> Resul
  Ok(web::Json(result))
 }
 
+#[deprecated]
 #[get("/snapshots/{snapshot}")]
 async fn view_snapshot_details(path: web::Path<i64>) -> Result<HttpResponse> {
  let sid = path.into_inner();