Merge pull request #1001 from dayuy/main

feat: add latestVersion field of `VersionedDataset.files`
kubeagi · Apr 10, 2024 · 088a3ca · 088a3ca
2 parents c952db2 + dbddcee
commit 088a3ca
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 10 deletions.
diff --git a/apiserver/graph/generated/generated.go b/apiserver/graph/generated/generated.go
diff --git a/apiserver/graph/generated/models_gen.go b/apiserver/graph/generated/models_gen.go
diff --git a/apiserver/graph/schema/versioned_dataset.gql b/apiserver/graph/schema/versioned_dataset.gql
@@ -58,6 +58,7 @@ query getVersionedDataset($name: String!, $namespace: String!, $fileInput: FileF
             count
             size
             versions
+            latestVersion
             creationTimestamp
           }
         }
@@ -98,6 +99,7 @@ query listVersionedDatasets($input: ListVersionedDatasetInput!, $fileInput: File
                   count
                   size
                   versions
+                  latestVersion
                   creationTimestamp
               }
             }

diff --git a/apiserver/graph/schema/versioned_dataset.graphqls b/apiserver/graph/schema/versioned_dataset.graphqls
@@ -86,6 +86,11 @@ type F {
     文件版本列表
     """
     versions: [String!]
+
+    """
+    文件最新版本
+    """
+    latestVersion: String
 }
 
 """

diff --git a/apiserver/pkg/versioneddataset/versioned_dataset.go b/apiserver/pkg/versioneddataset/versioned_dataset.go
@@ -121,27 +121,26 @@ func VersionFiles(ctx context.Context, _ client.Client, input *generated.Version
 		return objectInfoList[i].LastModified.After(objectInfoList[j].LastModified)
 	})
 
-	existMap := make(map[string]struct{})
 	objMap := make(map[string][]string)
 	for _, obj := range objectInfoList {
+		if obj.IsDeleteMarker {
+			continue
+		}
 		objMap[obj.Key] = append(objMap[obj.Key], obj.VersionID)
 	}
-
 	result := make([]generated.PageNode, 0)
 	for _, obj := range objectInfoList {
-		if _, ok := existMap[obj.Key]; ok {
-			continue
-		}
-		if obj.IsDeleteMarker {
+		if !obj.IsLatest || obj.IsDeleteMarker {
 			continue
 		}
 		if keyword == "" || strings.Contains(obj.Key, keyword) {
-			existMap[obj.Key] = struct{}{}
 			lastModifiedTime := obj.LastModified
+			versionID := obj.VersionID
 			tf := generated.F{
-				Path:     strings.TrimPrefix(obj.Key, prefix),
-				Time:     &lastModifiedTime,
-				Versions: objMap[obj.Key],
+				Path:          strings.TrimPrefix(obj.Key, prefix),
+				Time:          &lastModifiedTime,
+				Versions:      objMap[obj.Key],
+				LatestVersion: &versionID,
 			}
 
 			size := utils.BytesToSizedStr(obj.Size)