优化

internal/data/system_init.go

@@ -18,22 +18,41 @@ import (
 )
 
 func (r *initializationRepo) PersistConfig(context.Context) error { return r.data.persistConfig() }
-func (r *initializationRepo) PersistAdminConfig(_ context.Context, raw []byte) error {
+func (r *initializationRepo) PersistAdminConfig(ctx context.Context, raw []byte) error {
 	currentData, currentAdmin := r.data.runtime.Values()
 	next := proto.Clone(currentAdmin).(*conf.AdminBackend)
 	if err := (protojson.UnmarshalOptions{DiscardUnknown: true}).Unmarshal(raw, next); err != nil {
 		return err
 	}
+	if next.Storage == nil {
+		next.Storage = currentAdmin.Storage
+	}
+	if next.Email == nil {
+		next.Email = currentAdmin.Email
+	}
 	next.ConfigPath = currentAdmin.ConfigPath
+	candidateStorage, err := buildFileStorage(next)
+	if err != nil {
+		return err
+	}
+	if err := r.data.persistStorageIntegrationConfig(ctx, next.Storage); err != nil {
+		return err
+	}
+	if err := r.data.persistEmailIntegrationConfig(ctx, next.Email); err != nil {
+		return err
+	}
 	if err := r.data.persistConfigValues(currentData, next); err != nil {
 		return err
 	}
 	// Writing through the management API updates the same in-memory values
 	// immediately; the file watcher remains the fallback for external edits.
 	r.data.runtime.Replace(currentData, next)
+	if r.data.storage != nil {
+		r.data.storage.replace(candidateStorage)
+	}
 	return nil
 }
-func (r *initializationRepo) PersistRuntimeConfig(_ context.Context, dataRaw, adminRaw []byte) error {
+func (r *initializationRepo) PersistRuntimeConfig(ctx context.Context, dataRaw, adminRaw []byte) error {
 	currentData, currentAdmin := r.data.runtime.Values()
 	nextData := proto.Clone(currentData).(*conf.Data)
 	nextAdmin := proto.Clone(currentAdmin).(*conf.AdminBackend)
@@ -44,11 +63,30 @@ func (r *initializationRepo) PersistRuntimeConfig(_ context.Context, dataRaw, ad
 	if err := options.Unmarshal(adminRaw, nextAdmin); err != nil {
 		return err
 	}
+	if nextAdmin.Storage == nil {
+		nextAdmin.Storage = currentAdmin.Storage
+	}
+	if nextAdmin.Email == nil {
+		nextAdmin.Email = currentAdmin.Email
+	}
 	nextAdmin.ConfigPath = currentAdmin.ConfigPath
+	candidateStorage, err := buildFileStorage(nextAdmin)
+	if err != nil {
+		return err
+	}
+	if err := r.data.persistStorageIntegrationConfig(ctx, nextAdmin.Storage); err != nil {
+		return err
+	}
+	if err := r.data.persistEmailIntegrationConfig(ctx, nextAdmin.Email); err != nil {
+		return err
+	}
 	if err := r.data.persistConfigValues(nextData, nextAdmin); err != nil {
 		return err
 	}
 	r.data.runtime.Replace(nextData, nextAdmin)
+	if r.data.storage != nil {
+		r.data.storage.replace(candidateStorage)
+	}
 	return nil
 }
 func (r *initializationRepo) ReloadConfig(ctx context.Context) error {
@@ -236,6 +274,23 @@ func (r *initializationRepo) Initialize(ctx context.Context, input *biz.Database
 	}); err != nil {
 		return err
 	}
+	currentAdmin := r.data.runtime.Admin()
+	var legacyStorage *conf.AdminBackend_Storage
+	if currentAdmin != nil {
+		legacyStorage = currentAdmin.Storage
+	}
+	storageConfig, err := resolveStorageIntegrationConfig(candidate.WithContext(ctx), legacyStorage)
+	if err != nil {
+		return fmt.Errorf("initialize storage integration configuration: %w", err)
+	}
+	var legacyEmail *conf.AdminBackend_Email
+	if currentAdmin != nil {
+		legacyEmail = currentAdmin.Email
+	}
+	emailConfig, err := resolveEmailIntegrationConfig(candidate.WithContext(ctx), legacyEmail)
+	if err != nil {
+		return fmt.Errorf("initialize email integration configuration: %w", err)
+	}
 	signingKey := uuid.NewString()
 	if err := r.data.persistDatabaseConfig(config, signingKey); err != nil {
 		return fmt.Errorf("persist database configuration: %w", err)
@@ -249,6 +304,8 @@ func (r *initializationRepo) Initialize(ctx context.Context, input *biz.Database
 		currentAdmin.Jwt = &conf.AdminBackend_JWT{}
 	}
 	currentAdmin.Jwt.SigningKey = signingKey
+	currentAdmin.Storage = storageConfig
+	currentAdmin.Email = emailConfig
 	r.data.runtime.Replace(currentData, currentAdmin)
 	activated = true
 	return nil