update mungos version, remove created_at (its in _id)

Cargo.lock

@@ -1924,9 +1924,9 @@ dependencies = [
 
 [[package]]
 name = "mungos"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa2bb550d786347480949c967a67092b2a92fdbe25e3d6164a4e4cd007787d3"
+checksum = "f32a3939e18dacad44f2a05cf7275fa7cf5eb259da7dd57a4665779dbf59fc4a"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1941,9 +1941,9 @@ dependencies = [
 
 [[package]]
 name = "mungos_derive"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0639b117727cb6875b31551c5458f02acd39bd1bc6c6fc473d1e225f90c6d5ec"
+checksum = "93775f1c1ff78a035cc0cbe735abe5247d4ab0a3b19c2c4fdf16d8fda51bdfee"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -62,5 +62,5 @@ derive_variants = "0.1.1"
 make_option = "0.1.3"
 resolver_api = "0.1.6"
 parse_csl = "0.1.0"
-mungos = "0.4.11"
+mungos = "0.4.13"
 svi = "0.1.4"

core/src/auth/github/mod.rs

@@ -72,7 +72,6 @@ async fn callback(
                 admin: no_users_exist,
                 create_server_permissions: no_users_exist,
                 create_build_permissions: no_users_exist,
-                created_at: ts,
                 updated_at: ts,
                 ..Default::default()
             };

core/src/auth/google/mod.rs

@@ -97,7 +97,6 @@ async fn callback(
                 admin: no_users_exist,
                 create_server_permissions: no_users_exist,
                 create_build_permissions: no_users_exist,
-                created_at: ts,
                 updated_at: ts,
                 ..Default::default()
             };

core/src/auth/local.rs

@@ -38,7 +38,6 @@ impl Resolve<CreateLocalUser> for State {
             admin: no_users_exist,
             create_server_permissions: no_users_exist,
             create_build_permissions: no_users_exist,
-            created_at: ts,
             updated_at: ts,
             ..Default::default()
         };

core/src/requests/write/alerter.rs

@@ -22,7 +22,6 @@ impl Resolve<CreateAlerter, RequestUser> for State {
         let alerter = Alerter {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()
@@ -77,7 +76,6 @@ impl Resolve<CopyAlerter, RequestUser> for State {
         let alerter = Alerter {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()

core/src/requests/write/build.rs

@@ -51,7 +51,6 @@ impl Resolve<CreateBuild, RequestUser> for State {
         let build = Build {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             last_built_at: 0,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
@@ -123,7 +122,6 @@ impl Resolve<CopyBuild, RequestUser> for State {
         let build = Build {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             last_built_at: 0,
             permissions: [(user.id.clone(), PermissionLevel::Update)]

core/src/requests/write/builder.rs

@@ -25,7 +25,6 @@ impl Resolve<CreateBuilder, RequestUser> for State {
         let builder = Builder {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()
@@ -85,7 +84,6 @@ impl Resolve<CopyBuilder, RequestUser> for State {
         let builder = Builder {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()

core/src/requests/write/deployment.rs

@@ -42,7 +42,6 @@ impl Resolve<CreateDeployment, RequestUser> for State {
         let deployment = Deployment {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()
@@ -115,7 +114,6 @@ impl Resolve<CopyDeployment, RequestUser> for State {
         let deployment = Deployment {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()

core/src/requests/write/repo.rs

@@ -37,7 +37,6 @@ impl Resolve<CreateRepo, RequestUser> for State {
         let repo = Repo {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()
@@ -118,7 +117,6 @@ impl Resolve<CopyRepo, RequestUser> for State {
         let repo = Repo {
             id: Default::default(),
             name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()

core/src/requests/write/server.rs

@@ -24,7 +24,6 @@ impl Resolve<CreateServer, RequestUser> for State {
         let server = Server {
             id: Default::default(),
             name: req.name,
-            created_at: start_ts,
             updated_at: start_ts,
             permissions: [(user.id.clone(), PermissionLevel::Update)]
                 .into_iter()

lib/types/src/entities/alerter.rs

@@ -1,17 +1,17 @@
 use derive_builder::Builder;
 use derive_variants::EnumVariants;
-use mungos::{mongodb::bson::serde_helpers::hex_string_as_object_id, MungosIndexed};
+use mungos::{mongodb::bson::serde_helpers::hex_string_as_object_id, derive::{MungosIndexed, StringObjectId}};
 use partial_derive2::Partial;
 use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 use typeshare::typeshare;
 
-use crate::{i64_is_zero, MongoId, I64};
+use crate::{MongoId, I64};
 
 use super::PermissionsMap;
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, StringObjectId)]
 pub struct Alerter {
     #[serde(
         default,
@@ -33,10 +33,6 @@ pub struct Alerter {
     #[builder(setter(skip))]
     pub permissions: PermissionsMap,
 
-    #[serde(default, skip_serializing_if = "i64_is_zero")]
-    #[builder(setter(skip))]
-    pub created_at: I64,
-
     #[serde(default)]
     #[builder(setter(skip))]
     pub updated_at: I64,

lib/types/src/entities/build.rs

@@ -1,20 +1,20 @@
 use derive_builder::Builder;
 use derive_variants::EnumVariants;
 use mungos::{
+    derive::{MungosIndexed, StringObjectId},
     mongodb::bson::{doc, serde_helpers::hex_string_as_object_id},
-    MungosIndexed,
 };
 use partial_derive2::Partial;
 use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 use typeshare::typeshare;
 
-use crate::{i64_is_zero, MongoId, I64};
+use crate::{MongoId, I64};
 
 use super::{EnvironmentVar, PermissionsMap, SystemCommand, Version};
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, StringObjectId)]
 pub struct Build {
     #[serde(
         default,
@@ -36,10 +36,6 @@ pub struct Build {
     #[builder(setter(skip))]
     pub permissions: PermissionsMap,
 
-    #[serde(default, skip_serializing_if = "i64_is_zero")]
-    #[builder(setter(skip))]
-    pub created_at: I64,
-
     #[serde(default)]
     #[builder(setter(skip))]
     pub updated_at: I64,

lib/types/src/entities/builder.rs

@@ -1,12 +1,15 @@
 use derive_builder::Builder;
 use derive_variants::EnumVariants;
-use mungos::{mongodb::bson::serde_helpers::hex_string_as_object_id, MungosIndexed};
+use mungos::{
+    derive::{MungosIndexed, StringObjectId},
+    mongodb::bson::serde_helpers::hex_string_as_object_id,
+};
 use partial_derive2::Partial;
 use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 use typeshare::typeshare;
 
-use crate::{i64_is_zero, MongoId, I64};
+use crate::{MongoId, I64};
 
 use super::PermissionsMap;
 
@@ -14,7 +17,7 @@ use super::PermissionsMap;
 pub type _PartialBuilderConfig = PartialBuilderConfig;
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, StringObjectId)]
 pub struct Builder {
     #[serde(
         default,
@@ -36,10 +39,6 @@ pub struct Builder {
     #[builder(setter(skip))]
     pub permissions: PermissionsMap,
 
-    #[serde(default, skip_serializing_if = "i64_is_zero")]
-    #[builder(setter(skip))]
-    pub created_at: I64,
-
     #[serde(default)]
     #[builder(setter(skip))]
     pub updated_at: I64,

lib/types/src/entities/deployment.rs

@@ -1,20 +1,20 @@
 use derive_builder::Builder;
 use derive_variants::EnumVariants;
 use mungos::{
+    derive::{MungosIndexed, StringObjectId},
     mongodb::bson::{doc, serde_helpers::hex_string_as_object_id},
-    MungosIndexed,
 };
 use partial_derive2::Partial;
 use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 use typeshare::typeshare;
 
-use crate::{i64_is_zero, MongoId, I64};
+use crate::{MongoId, I64};
 
 use super::{EnvironmentVar, PermissionsMap, Version};
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, StringObjectId)]
 pub struct Deployment {
     #[serde(
         default,
@@ -36,10 +36,6 @@ pub struct Deployment {
     #[builder(setter(skip))]
     pub permissions: PermissionsMap,
 
-    #[serde(default, skip_serializing_if = "i64_is_zero")]
-    #[builder(setter(skip))]
-    pub created_at: I64,
-
     #[serde(default)]
     #[builder(setter(skip))]
     pub updated_at: I64,

lib/types/src/entities/mod.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use anyhow::{anyhow, Context};
-use mungos::MungosIndexed;
+use mungos::derive::MungosIndexed;
 use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 use typeshare::typeshare;

lib/types/src/entities/repo.rs

@@ -1,15 +1,18 @@
 use derive_builder::Builder;
-use mungos::{mongodb::bson::serde_helpers::hex_string_as_object_id, MungosIndexed};
+use mungos::{
+    derive::{MungosIndexed, StringObjectId},
+    mongodb::bson::serde_helpers::hex_string_as_object_id,
+};
 use partial_derive2::Partial;
 use serde::{Deserialize, Serialize};
 use typeshare::typeshare;
 
-use crate::{i64_is_zero, MongoId, I64};
+use crate::{MongoId, I64};
 
 use super::{PermissionsMap, SystemCommand};
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, StringObjectId)]
 pub struct Repo {
     #[serde(
         default,
@@ -31,10 +34,6 @@ pub struct Repo {
     #[builder(setter(skip))]
     pub permissions: PermissionsMap,
 
-    #[serde(default, skip_serializing_if = "i64_is_zero")]
-    #[builder(setter(skip))]
-    pub created_at: I64,
-
     #[serde(default)]
     #[builder(setter(skip))]
     pub updated_at: I64,

lib/types/src/entities/server/mod.rs

@@ -1,10 +1,13 @@
 use derive_builder::Builder;
-use mungos::{mongodb::bson::serde_helpers::hex_string_as_object_id, MungosIndexed};
+use mungos::{
+    derive::{MungosIndexed, StringObjectId},
+    mongodb::bson::serde_helpers::hex_string_as_object_id,
+};
 use partial_derive2::Partial;
 use serde::{Deserialize, Serialize};
 use typeshare::typeshare;
 
-use crate::{i64_is_zero, MongoId, I64};
+use crate::{MongoId, I64};
 
 use super::PermissionsMap;
 
@@ -13,7 +16,7 @@ pub mod docker_network;
 pub mod stats;
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, StringObjectId)]
 pub struct Server {
     #[serde(
         default,
@@ -35,10 +38,6 @@ pub struct Server {
     #[builder(setter(skip))]
     pub permissions: PermissionsMap,
 
-    #[serde(default, skip_serializing_if = "i64_is_zero")]
-    #[builder(setter(skip))]
-    pub created_at: I64,
-
     #[serde(default)]
     #[builder(setter(skip))]
     pub updated_at: I64,

lib/types/src/entities/tag.rs

@@ -1,8 +1,8 @@
 use derive_builder::Builder;
 use derive_variants::EnumVariants;
 use mungos::{
+    derive::{MungosIndexed, StringObjectId},
     mongodb::bson::{doc, serde_helpers::hex_string_as_object_id},
-    MungosIndexed,
 };
 use partial_derive2::Partial;
 use serde::{Deserialize, Serialize};
@@ -24,7 +24,7 @@ pub enum Tag {
 }
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, Partial)]
+#[derive(Serialize, Deserialize, Debug, Clone, Builder, MungosIndexed, StringObjectId, Partial)]
 #[partial_derive(Serialize, Deserialize, Debug, Clone)]
 #[unique_doc_index(doc! { "name": 1, "category": 1 })]
 pub struct CustomTag {

lib/types/src/entities/update.rs

@@ -1,6 +1,9 @@
 use async_timing_util::unix_timestamp_ms;
 use derive_variants::EnumVariants;
-use mungos::{mongodb::bson::serde_helpers::hex_string_as_object_id, MungosIndexed};
+use mungos::{
+    derive::{MungosIndexed, StringObjectId},
+    mongodb::bson::serde_helpers::hex_string_as_object_id,
+};
 use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumString};
 use typeshare::typeshare;
@@ -13,7 +16,7 @@ use super::{
 };
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Default, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, MungosIndexed, StringObjectId)]
 pub struct Update {
     #[serde(
         default,

lib/types/src/entities/user.rs

@@ -1,11 +1,14 @@
-use mungos::{mongodb::bson::serde_helpers::hex_string_as_object_id, MungosIndexed};
+use mungos::{
+    derive::{MungosIndexed, StringObjectId},
+    mongodb::bson::serde_helpers::hex_string_as_object_id,
+};
 use serde::{Deserialize, Serialize};
 use typeshare::typeshare;
 
-use crate::{i64_is_zero, MongoId, I64};
+use crate::{MongoId, I64};
 
 #[typeshare]
-#[derive(Serialize, Deserialize, Debug, Clone, Default, MungosIndexed)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, MungosIndexed, StringObjectId)]
 pub struct User {
     #[serde(
         default,
@@ -45,9 +48,6 @@ pub struct User {
     #[serde(default)]
     pub last_update_view: I64,
 
-    #[serde(default, skip_serializing_if = "i64_is_zero")]
-    pub created_at: I64,
-
     #[serde(default)]
     pub updated_at: I64,
 }

lib/types/src/lib.rs

@@ -27,10 +27,6 @@ pub struct MongoIdObj {
     pub oid: String,
 }
 
-fn i64_is_zero(n: &I64) -> bool {
-    *n == 0
-}
-
 pub fn all_logs_success(logs: &Vec<Log>) -> bool {
     for log in logs {
         if !log.success {