Add not-seeded state for tenant

Author: vknaisl

wizard-server/src/Wizard/Api/Resource/Config/ClientConfigDTO.hs

@@ -8,7 +8,10 @@ import Wizard.Model.Tenant.Config.TenantConfig
 import Wizard.Model.User.UserProfile
 
 data ClientConfigDTO
-  = HousekeepingInProgressClientConfigDTO
+  = NotSeededClientConfigDTO
+      { message :: String
+      }
+  | HousekeepingInProgressClientConfigDTO
       { message :: String
       }
   | ClientConfigDTO

wizard-server/src/Wizard/Model/Tenant/Tenant.hs

@@ -26,7 +26,8 @@ data Tenant = Tenant
   deriving (Show, Eq, Generic)
 
 data TenantState
-  = PendingHousekeepingTenantState
+  = NotSeededTenantState
+  | PendingHousekeepingTenantState
   | HousekeepingInProgressTenantState
   | ReadyForUseTenantState
   deriving (Show, Eq, Generic, Read)

wizard-server/src/Wizard/Service/Config/Client/ClientConfigService.hs

@@ -32,6 +32,8 @@ getClientConfig mServerUrl mClientUrl = do
       else getCurrentTenant
   unless tenant.enabled (throwError . NotExistsError $ _ERROR_VALIDATION__TENANT_OR_ACTIVE_PLAN_ABSENCE (fromMaybe "not-provided" mServerUrl))
   case tenant.state of
+    NotSeededTenantState -> do
+      return $ NotSeededClientConfigDTO {message = "We’re currently preparing the instance for you"}
     PendingHousekeepingTenantState -> do
       let mCreatedByUuid = fmap (.uuid) mCurrentUser
       migrateToLatestMetamodelVersionCommand tenant mCreatedByUuid

wizard-server/src/Wizard/Service/Tenant/TenantMapper.hs

@@ -100,8 +100,8 @@ fromAdminCreateDTO reqDto aUuid serverConfig now =
         , updatedAt = now
         }
 
-fromCommand :: CreateOrUpdateTenantCommand -> ServerConfig -> UTCTime -> UTCTime -> Tenant
-fromCommand command serverConfig createdAt updatedAt =
+fromCommand :: CreateOrUpdateTenantCommand -> TenantState -> ServerConfig -> UTCTime -> UTCTime -> Tenant
+fromCommand command state serverConfig createdAt updatedAt =
   let (serverDomain, url) =
         case command.customDomain of
           Just customDomain -> (customDomain, f' "https://%s" [customDomain])
@@ -121,7 +121,7 @@ fromCommand command serverConfig createdAt updatedAt =
         , analyticsClientUrl = Just $ createReportingClientUrl url
         , signalBridgeUrl = serverConfig.cloud.signalBridgeUrl
         , enabled = command.enabled
-        , state = ReadyForUseTenantState
+        , state = state
         , createdAt = createdAt
         , updatedAt = updatedAt
         }
@@ -144,7 +144,7 @@ fromChangeDTO tenant reqDto serverConfig =
         , analyticsClientUrl = Just $ createReportingClientUrl url
         , signalBridgeUrl = tenant.signalBridgeUrl
         , enabled = tenant.enabled
-        , state = ReadyForUseTenantState
+        , state = tenant.state
         , createdAt = tenant.createdAt
         , updatedAt = tenant.updatedAt
         }

wizard-server/src/Wizard/Service/Tenant/TenantService.hs

@@ -81,7 +81,7 @@ createTenantByCommand :: CreateOrUpdateTenantCommand -> AppContextM ()
 createTenantByCommand command = do
   now <- liftIO getCurrentTime
   serverConfig <- asks serverConfig
-  let tenant = fromCommand command serverConfig now now
+  let tenant = fromCommand command NotSeededTenantState serverConfig now now
   insertTenant tenant
   createConfig tenant.uuid now
   createLimitBundle tenant.uuid now
@@ -115,7 +115,7 @@ modifyTenantFromCommand command =
     now <- liftIO getCurrentTime
     serverConfig <- asks serverConfig
     tenant <- findTenantByUuid command.uuid
-    let updatedTenant = fromCommand command serverConfig tenant.createdAt now
+    let updatedTenant = fromCommand command tenant.state serverConfig tenant.createdAt now
     updateTenantByUuid updatedTenant
     modifyLimitBundle command.uuid command.limits
     return updatedTenant