fix(daemon): make id mandatory

seed-hypermedia · May 17, 2024 · d4d0794 · d4d0794
1 parent 7c852b9
commit d4d0794
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/backend/daemon/api/documents/v1alpha/documents.go b/backend/daemon/api/documents/v1alpha/documents.go
@@ -958,6 +958,10 @@ func (api *Server) MergeChanges(ctx context.Context, in *documents.MergeChangesR
 		return nil, fmt.Errorf("At least two versions are necessary for merging")
 	}
 
+	if in.Id == "" {
+		return nil, fmt.Errorf("Document Id is a mandatory field")
+	}
+
 	allHeads := []cid.Cid{}
 	for _, version := range in.Versions {
 		heads, err := hyper.Version(version).Parse()
@@ -971,9 +975,11 @@ func (api *Server) MergeChanges(ctx context.Context, in *documents.MergeChangesR
 	if err != nil {
 		return nil, err
 	}
+
 	if entity == nil {
-		return nil, fmt.Errorf("void entity after applying all versions")
+		return nil, fmt.Errorf("Error merging. Are all the versions coming from the same document?")
 	}
+
 	del, err := api.getDelegation(ctx)
 	if err != nil {
 		return nil, err

diff --git a/backend/genproto/documents/v1alpha/documents.pb.go b/backend/genproto/documents/v1alpha/documents.pb.go
diff --git a/frontend/packages/shared/src/client/.generated/documents/v1alpha/documents_pb.ts b/frontend/packages/shared/src/client/.generated/documents/v1alpha/documents_pb.ts
@@ -875,14 +875,14 @@ export class ListAccountPublicationsRequest extends Message<ListAccountPublicati
  */
 export class MergeChangesRequest extends Message<MergeChangesRequest> {
   /**
-   * Document ID of the resulting document.
+   * Required. Document ID from which versions are going to be taken.
    *
    * @generated from field: string id = 1;
    */
   id = "";
 
   /**
-   * Required. Versions to be merged into the document ID provided.
+   * Required. Versions to be merged.
    *
    * @generated from field: repeated string versions = 2;
    */

diff --git a/proto/documents/v1alpha/documents.proto b/proto/documents/v1alpha/documents.proto
@@ -231,10 +231,10 @@ service Merge {
 
 // Request for merging changes in a document.
 message MergeChangesRequest {
-  // Document ID of the resulting document.
+  // Required. Document ID from which versions are going to be taken.
   string id = 1;  
 
-  // Required. Versions to be merged into the document ID provided.
+  // Required. Versions to be merged.
   repeated string versions = 2;  
 }
 

diff --git a/proto/documents/v1alpha/go.gensum b/proto/documents/v1alpha/go.gensum
@@ -1,2 +1,2 @@
-srcs: 08d35261ed63c55189dc8f77a350ddbe
-outs: 5f5b631a6f2394e141faaaf1ca01b759
+srcs: 634ff8c56155cd59d4dd78d3d6992cc1
+outs: 64189a6f9d0757ec00633bfedb683d55
diff --git a/proto/documents/v1alpha/js.gensum b/proto/documents/v1alpha/js.gensum
@@ -1,2 +1,2 @@
-srcs: 08d35261ed63c55189dc8f77a350ddbe
-outs: c1ca57f177ed97af902ce3f5639662f8
+srcs: 634ff8c56155cd59d4dd78d3d6992cc1
+outs: 282e9eafe19cffcafa7ee15c32fee33c