add support slice primitives

cjp2600 · Apr 19, 2019 · 41819b2 · 41819b2
1 parent 4364745
commit 41819b2
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 1,254 deletions.
diff --git a/plugin/options/bom.pb.go b/plugin/options/bom.pb.go
diff --git a/plugin/options/bom.proto b/plugin/options/bom.proto
@@ -42,6 +42,7 @@ message BomTag {
     optional bool skip = 4;
     optional bool mongoObjectId = 5;
     optional bool update = 6;
+    optional bool additional = 7;
 }
 
 // To be used in (leiu of) the interceptor

diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -235,12 +235,19 @@ func (p *MongoPlugin) generateModelsStructures(message *descriptor.DescriptorPro
 		}
 
 		if bomField != nil && bomField.Tag.GetMongoObjectId() {
-			idName := ""
-			if bomField.Tag.GetIsID() {
-				idName = "`_id, omitempty`"
+
+			repeated := field.IsRepeated()
+			if repeated {
+				p.P(fieldName, ` `, `[]primitive.ObjectID`)
+			} else {
+				idName := ""
+				if bomField.Tag.GetIsID() {
+					idName = "`_id, omitempty`"
+				}
+				p.P(fieldName, ` `, `primitive.ObjectID`, idName)
 			}
-			p.P(fieldName, ` `, `primitive.ObjectID`, idName)
 			p.usePrimitive = true
+
 		} else if p.IsMap(field) {
 			m := p.GoMapType(nil, field)
 			//_, keyField, keyAliasField := m.GoType, m.KeyField, m.KeyAliasField
@@ -369,7 +376,22 @@ func (p *MongoPlugin) GenerateFieldConversion(field *descriptor.FieldDescriptorP
 
 	} else {
 		if bomField != nil && bomField.Tag.GetMongoObjectId() {
-			p.P(`resp.`, fieldName, ` = e.`, fieldName, `.Hex()`)
+
+			repeated := field.IsRepeated()
+			if repeated {
+
+				p.P(`if len(e.`, fieldName, `) > 0 {`)
+				p.P(`var sub`, fieldName, goTyp)
+				p.P(`for _, b := range `, `e.`, fieldName, `{`)
+				p.P(`sub`, fieldName, ` = append(sub`, fieldName, `, b.Hex())`)
+				p.P(`}`)
+				p.P(`resp.`, fieldName, ` = sub`, fieldName)
+				p.P(`}`)
+
+			} else {
+				p.P(`resp.`, fieldName, ` = e.`, fieldName, `.Hex()`)
+			}
+
 		} else {
 			p.P(`resp.`, fieldName, ` = e.`, fieldName)
 		}
@@ -444,9 +466,16 @@ func (p *MongoPlugin) ToMongoGenerateFieldConversion(field *descriptor.FieldDesc
 
 	} else if bomField != nil && bomField.Tag.GetMongoObjectId() {
 
-		p.P(`if len(e.`, fieldName, `) > 0 {`)
-		p.P(`resp.`, fieldName, ` = bom.ToObj(e.`, fieldName, `)`)
-		p.P(`}`)
+		repeated := field.IsRepeated()
+		if repeated {
+			p.P(`if len(e.`, fieldName, `) > 0 {`)
+			p.P(`resp.`, fieldName, ` = bom.ToObjects(e.`, fieldName, `)`)
+			p.P(`}`)
+		} else {
+			p.P(`if len(e.`, fieldName, `) > 0 {`)
+			p.P(`resp.`, fieldName, ` = bom.ToObj(e.`, fieldName, `)`)
+			p.P(`}`)
+		}
 
 	} else {
 		p.P(`resp.`, fieldName, ` = e.`, fieldName)