feat: replace updated_at by version for observatory

src/declarations/observatory/observatory.did.d.ts

@@ -28,6 +28,7 @@ export interface CronTab {
 	updated_at: bigint;
 	mission_control_id: Principal;
 	created_at: bigint;
+	version: [] | [bigint];
 }
 export interface DeleteControllersArgs {
 	controllers: Array<Principal>;
@@ -78,8 +79,8 @@ export interface SetControllersArgs {
 }
 export interface SetCronTab {
 	cron_jobs: CronJobs;
-	updated_at: [] | [bigint];
 	mission_control_id: Principal;
+	version: [] | [bigint];
 }
 export interface _SERVICE {
 	del_controllers: ActorMethod<[DeleteControllersArgs], undefined>;

src/declarations/observatory/observatory.factory.did.js

@@ -22,7 +22,8 @@ export const idlFactory = ({ IDL }) => {
 		cron_jobs: CronJobs,
 		updated_at: IDL.Nat64,
 		mission_control_id: IDL.Principal,
-		created_at: IDL.Nat64
+		created_at: IDL.Nat64,
+		version: IDL.Opt(IDL.Nat64)
 	});
 	const CanisterStatusType = IDL.Variant({
 		stopped: IDL.Null,
@@ -81,8 +82,8 @@ export const idlFactory = ({ IDL }) => {
 	});
 	const SetCronTab = IDL.Record({
 		cron_jobs: CronJobs,
-		updated_at: IDL.Opt(IDL.Nat64),
-		mission_control_id: IDL.Principal
+		mission_control_id: IDL.Principal,
+		version: IDL.Opt(IDL.Nat64)
 	});
 	return IDL.Service({
 		del_controllers: IDL.Func([DeleteControllersArgs], [], []),

src/declarations/observatory/observatory.factory.did.mjs

@@ -22,7 +22,8 @@ export const idlFactory = ({ IDL }) => {
 		cron_jobs: CronJobs,
 		updated_at: IDL.Nat64,
 		mission_control_id: IDL.Principal,
-		created_at: IDL.Nat64
+		created_at: IDL.Nat64,
+		version: IDL.Opt(IDL.Nat64)
 	});
 	const CanisterStatusType = IDL.Variant({
 		stopped: IDL.Null,
@@ -81,8 +82,8 @@ export const idlFactory = ({ IDL }) => {
 	});
 	const SetCronTab = IDL.Record({
 		cron_jobs: CronJobs,
-		updated_at: IDL.Opt(IDL.Nat64),
-		mission_control_id: IDL.Principal
+		mission_control_id: IDL.Principal,
+		version: IDL.Opt(IDL.Nat64)
 	});
 	return IDL.Service({
 		del_controllers: IDL.Func([DeleteControllersArgs], [], []),

src/frontend/src/lib/api/observatory.api.ts

@@ -2,7 +2,6 @@ import type { ArchiveStatuses, CronJobs, CronTab } from '$declarations/observato
 import type { OptionIdentity } from '$lib/types/itentity';
 import { getObservatoryActor } from '$lib/utils/actor.juno.utils';
 import type { Principal } from '@dfinity/principal';
-import { toNullable } from '@dfinity/utils';
 
 export const getCronTab = async (identity: OptionIdentity): Promise<[] | [CronTab]> => {
 	const { get_cron_tab } = await getObservatoryActor(identity);
@@ -25,10 +24,10 @@ export const setCronTab = async ({
 	cron_jobs: CronJobs;
 	identity: OptionIdentity;
 }): Promise<CronTab> => {
-	const actor = await getObservatoryActor(identity);
-	return actor.set_cron_tab({
+	const { set_cron_tab } = await getObservatoryActor(identity);
+	return set_cron_tab({
 		mission_control_id: missionControlId,
 		cron_jobs,
-		updated_at: toNullable(cronTab?.updated_at)
+		version: cronTab?.version ?? []
 	});
 };

src/observatory/observatory.did

@@ -21,6 +21,7 @@ type CronTab = record {
   updated_at : nat64;
   mission_control_id : principal;
   created_at : nat64;
+  version : opt nat64;
 };
 type DeleteControllersArgs = record { controllers : vec principal };
 type ListStatuses = record {
@@ -67,8 +68,8 @@ type SetControllersArgs = record {
 };
 type SetCronTab = record {
   cron_jobs : CronJobs;
-  updated_at : opt nat64;
   mission_control_id : principal;
+  version : opt nat64;
 };
 service : () -> {
   del_controllers : (DeleteControllersArgs) -> ();

src/observatory/src/store.rs

@@ -2,12 +2,12 @@ use crate::types::interface::SetCronTab;
 use crate::types::state::{ArchiveStatuses, CronTab, CronTabs, StableState};
 use crate::STATE;
 use ic_cdk::api::time;
-use junobuild_shared::assert::assert_timestamp;
+use junobuild_shared::assert::{assert_version};
 use junobuild_shared::controllers::{
     delete_controllers as delete_controllers_impl, set_controllers as set_controllers_impl,
 };
 use junobuild_shared::types::interface::SetController;
-use junobuild_shared::types::state::{ControllerId, SegmentsStatuses, UserId};
+use junobuild_shared::types::state::{ControllerId, SegmentsStatuses, Timestamp, UserId, Version};
 
 ///
 /// CronJobs
@@ -37,10 +37,10 @@ fn set_cron_tab_impl(
 ) -> Result<CronTab, String> {
     let current_tab = state.cron_tabs.get(user);
 
-    // Validate timestamp
+    // Validate version
     match current_tab {
         None => (),
-        Some(current_tab) => match assert_timestamp(cron_tab.updated_at, current_tab.updated_at) {
+        Some(current_tab) => match assert_version(cron_tab.version, current_tab.version) {
             Ok(_) => (),
             Err(e) => {
                 return Err(e);
@@ -50,18 +50,24 @@ fn set_cron_tab_impl(
 
     let now = time();
 
-    let created_at: u64 = match current_tab {
+    let created_at: Timestamp = match current_tab {
         None => now,
         Some(current_tab) => current_tab.created_at,
     };
 
+    let version: Version = match current_tab {
+        None => 1,
+        Some(current_rule) => current_rule.version.unwrap_or_default() + 1,
+    };
+
     let updated_at: u64 = now;
 
     let new_cron_tab = CronTab {
         mission_control_id: cron_tab.mission_control_id,
         cron_jobs: cron_tab.cron_jobs.clone(),
         created_at,
         updated_at,
+        version: Some(version),
     };
 
     state.cron_tabs.insert(*user, new_cron_tab.clone());

src/observatory/src/types.rs

@@ -1,9 +1,7 @@
 pub mod state {
     use candid::{CandidType, Deserialize};
     use junobuild_shared::types::cronjob::CronJobs;
-    use junobuild_shared::types::state::{
-        ArchiveTime, Controllers, MissionControlId, SegmentsStatuses, Timestamp, UserId,
-    };
+    use junobuild_shared::types::state::{ArchiveTime, Controllers, MissionControlId, SegmentsStatuses, Timestamp, UserId, Version};
     use std::collections::HashMap;
 
     pub type CronTabs = HashMap<UserId, CronTab>;
@@ -26,6 +24,7 @@ pub mod state {
         pub cron_jobs: CronJobs,
         pub created_at: Timestamp,
         pub updated_at: Timestamp,
+        pub version: Option<Version>,
     }
 
     #[derive(Default, CandidType, Deserialize, Clone)]
@@ -43,9 +42,7 @@ pub mod state {
 pub mod interface {
     use candid::{CandidType, Deserialize};
     use junobuild_shared::types::cronjob::CronJobs;
-    use junobuild_shared::types::state::{
-        ArchiveTime, MissionControlId, SegmentsStatuses, Timestamp,
-    };
+    use junobuild_shared::types::state::{ArchiveTime, MissionControlId, SegmentsStatuses, Version};
 
     #[derive(Default, CandidType, Deserialize, Clone)]
     pub struct ListStatusesArgs {
@@ -63,6 +60,6 @@ pub mod interface {
     pub struct SetCronTab {
         pub mission_control_id: MissionControlId,
         pub cron_jobs: CronJobs,
-        pub updated_at: Option<Timestamp>,
+        pub version: Option<Version>,
     }
 }