UploadModel uploads with incorrect artifact ver

ModelKey is updated to use the newArtifactversion instead of
artifactVersion.
Model Artifact updation is carried out first and then the modelKey is
set.

Issue-ID: AIMLFW-304 and AIMLFW-282
Change-Id: I71d626a419c1b273db89c4115f4b04656765d8de
Signed-off-by: Swaraj Kumar <swaraj.kumar@samsung.com>

diff --git a/apis/mmes_apis.go b/apis/mmes_apis.go
index 34e20e7..3c22883 100644 (file)
--- a/apis/mmes_apis.go
+++ b/apis/mmes_apis.go
@@ -336,8 +336,6 @@ func (m *MmeApiHandler) UploadModel(cont *gin.Context) {
        }
 
        artifactVersion := modelInfo.ModelId.ArtifactVersion
-       modelKey := fmt.Sprintf("%s_%s_%s", modelName, modelVersion, artifactVersion)
-       exportBucket := strings.ToLower(modelName)
        // Update the Artifact-Version
        newArtifactVersion, err := utils.IncrementArtifactVersion(artifactVersion)
        if err != nil {
@@ -350,6 +348,9 @@ func (m *MmeApiHandler) UploadModel(cont *gin.Context) {
                })
                return
        }
+       modelKey := fmt.Sprintf("%s_%s_%s", modelName, modelVersion, newArtifactVersion)
+       exportBucket := strings.ToLower(modelName)
+
        modelInfo.ModelId.ArtifactVersion = newArtifactVersion
        if err := m.iDB.Update(*modelInfo); err != nil {
                statusCode := http.StatusInternalServerError