goa_model_gen 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1cbf0e7e1039ded1a97f1dc9617c85d21996f4214d71573caa471d05626a64f
-  data.tar.gz: dc287e330dd2358fe1919c50fcd273c241f78f2399d2df9d400e082c74ecedd3
+  metadata.gz: c67de54e5abf8bccd463399f089b2d1ca6dd608c771dae7e4102e3c742a63a66
+  data.tar.gz: 9fbcbec4ed85e6e30f87ff8da15a2599c38089aa19fbefb857a1d50066f19aad
 SHA512:
-  metadata.gz: 5de9f390e887538d65adf1713b7e44bebc2f7ca36edd93b899b9b19f4d8cd0b773d0c36e1814934ff3f6afa902b6d0338a4c5dcf1ab94e27fdaf5eeef38f1d77
-  data.tar.gz: 80a4e1fd36da7db714a843ac30836f9c13ddceafdde17eda2c1a380dbd313ac5dac5b2d230ec3dd955dbeee44ff5c294238be5daba850fd9fe13bd0dadf16817
+  metadata.gz: b05112dfd0abc2818371f55103d60f137994e3ea60d1e8503e576c04bc0331bf2bba591b8282bd3931b9048c194d0cf5d88ba2ab4246d43d9800e5d756747512
+  data.tar.gz: d28035567f27259a583a270dc2142083850955bc2067a71ad0954a7b987fff881fad3d6d7d94082365075018ae6139a97f85c803143d8f20e5b5bffd08f6a1f7

data/lib/goa_model_gen/templates/store.go.erb

@@ -8,6 +8,7 @@
 			import "google.golang.org/appengine/log"
 			import config.model_package_path
 			import :goon, "#{config.store_package_path}/goon_store"
+      import :goonorig, "github.com/mjibson/goon"
 
       model_name = "model.#{model.name}"
 -%>
@@ -24,22 +25,54 @@ type <%= store_name %> struct{
 <%- end -%>
 }
 
+func (s *<%= store_name %>) KindName() string {
+	return "<%= model.name%>"
+}
+
+func (s *<%= store_name %>) Query() *datastore.Query {
+	q := datastore.NewQuery(s.KindName())
+	if s.Binder != nil {
+		q = s.Binder.Query(q)
+	}
+	return q
+}
+
+func (s *<%= store_name %>) Run(ctx context.Context, q *datastore.Query) *goonorig.Iterator {
+	g := goon.FromContext(ctx)
+	return g.Run(q)
+}
+
 func (s *<%= store_name %>) All(ctx context.Context) ([]*<%= model_name %>, error) {
-	return s.Select(ctx, s.Query(ctx))
+	return s.AllBy(ctx, s.Query())
 }
 
-func (s *<%= store_name %>) Select(ctx context.Context, q *datastore.Query) ([]*<%= model_name %>, error) {
+func (s *<%= store_name %>) AllBy(ctx context.Context, q *datastore.Query) ([]*<%= model_name %>, error) {
 	g := goon.FromContext(ctx)
 	r := []*<%= model_name %>{}
-	log.Infof(ctx, "q is %v\n", q)
 	_, err := g.GetAll(q.EventualConsistency(), &r)
 	if err != nil {
-		log.Errorf(ctx, "Failed to Select <%= model_name %> because of %v\n", err)
+		log.Errorf(ctx, "Failed to AllBy <%= model_name %> because of %v\n", err)
 		return nil, err
 	}
 	return r, nil
 }
 
+func (s *<%= store_name %>) Select(ctx context.Context, q *datastore.Query) ([]*<%= model_name %>, error) {
+    return s.AllBy(ctx, q)
+}
+
+func (s *<%= store_name %>) FirstBy(ctx context.Context, q *datastore.Query) (*<%= model_name %>, error) {
+		r, err := s.AllBy(ctx, q.Limit(1))
+		if err != nil {
+				return nil, err
+		}
+		if len(r) > 0 {
+				return r[0], nil
+		} else {
+				return nil, nil
+		}
+}
+
 func (s *<%= store_name %>) CountBy(ctx context.Context, q *datastore.Query) (int, error) {
 	g := goon.FromContext(ctx)
 	c, err := g.Count(q)
@@ -50,17 +83,6 @@ func (s *<%= store_name %>) CountBy(ctx context.Context, q *datastore.Query) (in
 	return c, nil
 }
 
-func (s *<%= store_name %>) Query(ctx context.Context) *datastore.Query {
-	g := goon.FromContext(ctx)
-	k := g.Kind(new(<%= model_name %>))
-	// log.Infof(ctx, "Kind for <%= model_name %> is %v\n", k)
-	q := datastore.NewQuery(k)
-	if s.Binder != nil {
-		q = s.Binder.Query(q)
-	}
-	return q
-}
-
 func (s *<%= store_name %>) ByID(ctx context.Context, <%= model.id_name_var %> <%= model.id_golang_type %>) (*<%= model_name %>, error) {
 <%- if model.parent -%>
 	r := <%= model_name %>{ParentKey: s.ParentKey, <%= model.id_name %>: <%= model.id_name_var %>}
@@ -250,7 +272,7 @@ func (s *<%= store_name %>) ValidateUniqueness(ctx context.Context, m *<%= model
 <%- end -%>
 	}
 	for field, value := range conditions {
-		q := s.Query(ctx).Filter(field + " =", value)
+		q := s.Query().Filter(field + " =", value)
 		c, err := s.CountBy(ctx, q)
 		if err != nil {
 			return err

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor