Merge branch 'yitsushi:main' into main

yitsushi · Oct 7, 2023 · a665240 · a665240
2 parents 18a5be5 + 74f1c29
commit a665240
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/core/multipart.go b/core/multipart.go
@@ -8,10 +8,11 @@ import (
 const numberOfPartsKeyValue = 2
 
 type multipartField struct {
-	Type  string
-	Name  string
-	Value []byte
-	Ref   string
+	Type      string
+	Name      string
+	Value     []byte
+	Ref       string
+	OmitEmpty bool
 }
 
 func parseMultipartFields(r BaseRequest) map[string]multipartField {
@@ -29,6 +30,10 @@ func parseMultipartFields(r BaseRequest) map[string]multipartField {
 		}
 
 		field := parseTag(tag)
+		if field.OmitEmpty && v.Field(i).IsZero() {
+			continue
+		}
+
 		if field.Name == "" {
 			field.Name = v.Type().Field(i).Name
 		}
@@ -46,7 +51,11 @@ func parseTag(tag string) multipartField {
 
 	for _, part := range strings.Split(tag, ",") {
 		if !strings.Contains(part, "=") {
-			field.Name = part
+			if part == "omitempty" {
+				field.OmitEmpty = true
+			} else {
+				field.Name = part
+			}
 
 			continue
 		}

diff --git a/docs/patterns-and-structure.md b/docs/patterns-and-structure.md
@@ -39,7 +39,7 @@ Example multipart request struct:
 ```go
 // CreateRequest represents a request to create a file.
 type CreateRequest struct {
-	FolderID    string `multipart:"folderId,type=field"`
+	FolderID    string `multipart:"folderId,type=field,omitempty"`
 	Name        string `multipart:"name,type=field"`
 	IsSensitive bool   `multipart:"isSensitive,type=field"`
 	Force       bool   `multipart:"force,type=field"`

diff --git a/services/drive/files/create.go b/services/drive/files/create.go
@@ -7,7 +7,7 @@ import (
 
 // CreateRequest represents a request to create a file.
 type CreateRequest struct {
-	FolderID    string `multipart:"folderId,type=field"`
+	FolderID    string `multipart:"folderId,type=field,omitempty"`
 	Name        string `multipart:"name,type=field"`
 	IsSensitive bool   `multipart:"isSensitive,type=field"`
 	Force       bool   `multipart:"force,type=field"`