Rework naming, remove usage of metadata in favor of dataType to b…

…e more explicit
Altinn · Dec 18, 2024 · 58884cd · 58884cd
1 parent 252fc94
commit 58884cd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/backend/src/Designer/Controllers/DatamodelsController.cs b/backend/src/Designer/Controllers/DatamodelsController.cs
@@ -250,24 +250,24 @@ public async Task<IActionResult> UseXsdFromRepo(string org, string repository, s
         }
 
         /// <summary>
-        /// Gets the model metadata for a given model.
+        /// Gets the dataType for a given datamodel.
         /// </summary>
-        [HttpGet("datamodel/{modelName}/metadata")]
+        [HttpGet("datamodel/{modelName}/dataType")]
         [UseSystemTextJson]
-        public async Task<IActionResult> GetModelMetadata(string org, string repository, string modelName)
+        public async Task<IActionResult> GetModelDataType(string org, string repository, string modelName)
         {
-            var dataTypeConfiguration = await _schemaModelService.GetModelMetadata(org, repository, modelName);
+            DataType dataTypeConfiguration = await _schemaModelService.GetModelDataType(org, repository, modelName);
             return Ok(dataTypeConfiguration);
         }
 
         /// <summary>
-        /// Updates the model metadata for a given model.
+        /// Updates the dataType for a given model.
         /// </summary>
-        [HttpPut("datamodel/{modelName}/metadata")]
+        [HttpPut("datamodel/{modelName}/dataType")]
         [UseSystemTextJson]
-        public async Task UpdateModelMetadata(string org, string repository, string modelName, [FromBody] DataType dataType)
+        public async Task SetModelDataType(string org, string repository, string modelName, [FromBody] DataType dataType)
         {
-            await _schemaModelService.UpdateModelMetadata(org, repository, modelName, dataType);
+            await _schemaModelService.SetModelDataType(org, repository, modelName, dataType);
         }
 
         private static string GetFileNameFromUploadedFile(IFormFile thefile)

diff --git a/backend/src/Designer/Services/Implementation/SchemaModelService.cs b/backend/src/Designer/Services/Implementation/SchemaModelService.cs
@@ -436,17 +436,17 @@ private bool NamespaceNeedsToBeSeparated(ApplicationMetadata application,
             return application.DataTypes.All(d => d.AppLogic?.ClassRef != $"Altinn.App.Models.{csharpModelName}");
         }
 
-        public async Task<DataType> GetModelMetadata(string org, string app, string modelName)
+        public async Task<DataType> GetModelDataType(string org, string app, string modelId)
         {
             ApplicationMetadata applicationMetadata = await _applicationMetadataService.GetApplicationMetadataFromRepository(org, app);
-            DataType dataType = applicationMetadata.DataTypes.Find((dataType) => dataType.Id == modelName);
+            DataType dataType = applicationMetadata.DataTypes.Find((dataType) => dataType.Id == modelId);
             return dataType;
         }
 
-        public async Task UpdateModelMetadata(string org, string app, string modelName, DataType dataType)
+        public async Task SetModelDataType(string org, string app, string modelId, DataType dataType)
         {
             ApplicationMetadata applicationMetadata = await _applicationMetadataService.GetApplicationMetadataFromRepository(org, app);
-            applicationMetadata.DataTypes.RemoveAll((dataType) => dataType.Id == modelName);
+            applicationMetadata.DataTypes.RemoveAll((dataType) => dataType.Id == modelId);
             applicationMetadata.DataTypes.Add(dataType);
             await _applicationMetadataService.UpdateApplicationMetaDataLocally(org, app, applicationMetadata);
         }

diff --git a/backend/src/Designer/Services/Interfaces/ISchemaModelService.cs b/backend/src/Designer/Services/Interfaces/ISchemaModelService.cs
@@ -86,13 +86,13 @@ public interface ISchemaModelService
         Task<ModelMetadata> GenerateModelMetadataFromJsonSchema(AltinnRepoEditingContext altinnRepoEditingContext, string relativeFilePath, CancellationToken cancellationToken = default);
 
         /// <summary>
-        /// Gets the model metadata for a given model.
+        /// Gets the dataType for a given model.
         /// </summary>
-        Task<DataType> GetModelMetadata(string org, string app, string modelName);
+        Task<DataType> GetModelDataType(string org, string app, string modelId);
 
         /// <summary>
-        /// Updates the model metadata for a given model.
+        /// Updates the dataType for a given model.
         /// </summary>
-        Task UpdateModelMetadata(string org, string app, string modelName, DataType dataType);
+        Task SetModelDataType(string org, string app, string modelId, DataType dataType);
     }
 }