Switch to not exists and fix path deletion

helium · May 14, 2024 · 7e447ab · 7e447ab
1 parent 9cc4cc6
commit 7e447ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/mobile_verifier/migrations/33_data_sets.sql b/mobile_verifier/migrations/33_data_sets.sql
@@ -1,16 +1,16 @@
-CREATE TYPE data_set_status AS enum (
+CREATE TYPE IF NOT EXISTS data_set_status AS enum (
        'pending',
        'downloaded',
        'processed'
 );
 
-CREATE TYPE data_set_type AS enum (
+CREATE TYPE IF NOT EXISTS data_set_type AS enum (
        'urbanization',
        'footfall',
        'landtype'
 );
 
-CREATE TABLE data_sets (
+CREATE TABLE IF NOT EXISTS data_sets (
        filename TEXT PRIMARY KEY,
        data_set data_set_type NOT NULL,
        time_to_use TIMESTAMPTZ NOT NULL,

diff --git a/mobile_verifier/src/boosting_oracles/data_sets.rs b/mobile_verifier/src/boosting_oracles/data_sets.rs
@@ -396,10 +396,8 @@ async fn delete_old_data_sets(
         let prefix = &cap[1];
         let timestamp = cap[2].parse::<u64>()?.to_timestamp_millis()?;
         if prefix == data_set_type.to_prefix() && timestamp < time_to_use {
-            let mut path = data_set_directory.to_path_buf();
-            path.push(data_set.path());
             tracing::info!(data_set = &*file_name, "Deleting old data set file");
-            tokio::fs::remove_file(path).await?;
+            tokio::fs::remove_file(data_set.path()).await?;
         }
     }
     Ok(())