Remove the schedule_expression from the database & other fixes

Author: sandhose

crates/storage-pg/.sqlx/query-d6c4cc9b04086f1b6ffad30d8a859e9fc0bf8a1fe9002dc3854ae28e65fc7943.json renamed to crates/storage-pg/.sqlx/query-245cab1cf7d9cf4e94cdec91ecb4dc8e678278121efbe1f66bcdc24144d684d0.json

@@ -6,11 +6,7 @@
 -- Add a table to track the state of scheduled recurring jobs.
 CREATE TABLE queue_schedules (
     -- A unique name for the schedule
-    schedule_name TEXT PRIMARY KEY,
-
-    -- The cron expression to use to schedule the job. This is there just for
-    -- convenience, as this is defined by the backend
-    schedule_expression TEXT NOT NULL,
+    schedule_name TEXT NOT NULL PRIMARY KEY,
 
     -- The last time the job was scheduled. If NULL, it means that the job was
     -- never scheduled.
@@ -22,7 +18,7 @@ CREATE TABLE queue_schedules (
         REFERENCES queue_jobs (queue_job_id)
 );
 
--- When a job is scheduled from a recurreing schedule, we keep a column
+-- When a job is scheduled from a recurring schedule, we keep a column
 -- referencing the name of the schedule
 ALTER TABLE queue_jobs
     ADD COLUMN schedule_name TEXT

crates/storage-pg/.sqlx/query-3355b3b5729d8240297a5ac8111ce891e626a82dcb78ff85f2b815d9329ff936.json

@@ -8,7 +8,7 @@
 
 use async_trait::async_trait;
 use chrono::{DateTime, Utc};
-use mas_storage::queue::{QueueScheduleRepository, Schedule, ScheduleStatus};
+use mas_storage::queue::{QueueScheduleRepository, ScheduleStatus};
 use sqlx::PgConnection;
 
 use crate::{DatabaseError, ExecuteExt};
@@ -45,22 +45,17 @@ impl From<ScheduleLookup> for ScheduleStatus {
 }
 
 #[async_trait]
-impl<'c> QueueScheduleRepository for PgQueueScheduleRepository<'c> {
+impl QueueScheduleRepository for PgQueueScheduleRepository<'_> {
     type Error = DatabaseError;
 
-    async fn setup(&mut self, schedules: &[(&'static str, Schedule)]) -> Result<(), Self::Error> {
+    async fn setup(&mut self, schedules: &[&'static str]) -> Result<(), Self::Error> {
         sqlx::query!(
             r#"
-                INSERT INTO queue_schedules (schedule_name, schedule_expression)
-                SELECT * FROM UNNEST($1::text[], $2::text[]) AS t (schedule_name, schedule_expression)
-                ON CONFLICT (schedule_name) DO UPDATE
-                    SET schedule_expression = EXCLUDED.schedule_expression
+                INSERT INTO queue_schedules (schedule_name)
+                SELECT * FROM UNNEST($1::text[]) AS t (schedule_name)
+                ON CONFLICT (schedule_name) DO NOTHING
             "#,
-            &schedules.iter().map(|(name, _)| (*name).to_owned()).collect::<Vec<_>>(),
-            &schedules
-                .iter()
-                .map(|(_, schedule)| schedule.source().to_owned())
-                .collect::<Vec<_>>()
+            &schedules.iter().map(|&s| s.to_owned()).collect::<Vec<_>>(),
         )
         .traced()
         .execute(&mut *self.conn)
@@ -74,7 +69,7 @@ impl<'c> QueueScheduleRepository for PgQueueScheduleRepository<'c> {
             ScheduleLookup,
             r#"
                 SELECT
-                    queue_schedules.schedule_name as "schedule_name!",
+                    queue_schedules.schedule_name,
                     queue_schedules.last_scheduled_at,
                     queue_jobs.status IN ('completed', 'failed') as last_scheduled_job_completed
                 FROM queue_schedules

crates/storage-pg/.sqlx/query-3e6e3aad53b22fc53eb3ee881b29bb249b18ced57d6a4809dffc23972b3e9423.json

@@ -7,7 +7,6 @@
 
 use async_trait::async_trait;
 use chrono::{DateTime, Duration, Utc};
-use cron::Schedule;
 use opentelemetry::trace::TraceContextExt;
 use rand_core::RngCore;
 use serde::{Deserialize, Serialize};