goa_model_gen 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94a826ba73aaaf70ac461966a30335bd2172b4b21dc8b2a9cdb67b900c18adb
-  data.tar.gz: c98e3ae9d9e57a0c45bd2cc5fcf8452ae40de3957a7813cb1fc8ba67ce0ff874
+  metadata.gz: 0cef817b3a53794219db9757fa0afe0aa7a288a6bd4b3bce8048ce14a8cb45c6
+  data.tar.gz: 7bc9fdb4fe7722865fa6edd81d5716a1e3f00a1d62d447ca3f292eccc271a471
 SHA512:
-  metadata.gz: 5d4f762066e7d4d2f797a159041833918f955107b51fcb39f52b02050e2eb9252fdc1e594aafc22d30c8d7c8da5aecee58c31df66d522c6f194d52ddf94e6b45
-  data.tar.gz: 8c00b816ebd1805f36f497e9e336794abb403d57dbf5a9282cd6f461246ca8a05bec0b8ec4ee0192ce837f31d3a17cbe3f8a83cdb8a22be8cc33a43a3bcd14cf
+  metadata.gz: cb69b2304c295fd3419b295b5880b741ea3f74aa78ac04a80cb44b4903b08839c7f3f6741b90c9f0a3d6f2c7df3e2e0bd3bba5a2b07ed29d064dc84d7fd7174b
+  data.tar.gz: 2ad75dccfe25fdb3192ba38e3f16ea211f0b0d12ba84c233a219934139373d7d6e11b253cd0685544ebcfe297899ac56a4fe63e6be4d34fddd9daceaa6fac934

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

@@ -80,23 +80,28 @@ type <%= store_name %> struct{
 }
 
 func (s *<%= store_name %>) All(ctx context.Context) ([]*<%= model.name %>, error) {
+	return s.Select(ctx, s.Query(ctx))
+}
+
+func (s *<%= store_name %>) Select(ctx context.Context, q *datastore.Query) ([]*<%= model.name %>, error) {
 	g := GoonFromContext(ctx)
 	r := []*<%= model.name %>{}
-	k := g.Kind(new(<%= model.name %>))
-	log.Infof(ctx, "Kind is %v\n", k)
-	q := datastore.NewQuery(k)
-<%- if model.parent -%>
-	q = q.Ancestor(s.ParentKey)
-<%- end -%>
 	log.Infof(ctx, "q is %v\n", q)
 	_, err := g.GetAll(q.EventualConsistency(), &r)
 	if err != nil {
-		log.Errorf(ctx, "Failed to GetAll <%= model.name %> because of %v\n", err)
+		log.Errorf(ctx, "Failed to Select <%= model.name %> because of %v\n", err)
 		return nil, err
 	}
 	return r, nil
 }
 
+func (s *<%= store_name %>) Query(ctx context.Context) *datastore.Query {
+	g := GoonFromContext(ctx)
+	k := g.Kind(new(<%= model.name %>))
+	// log.Infof(ctx, "Kind for <%= model.name %> is %v\n", k)
+	return datastore.NewQuery(k)
+}
+
 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 %>}
@@ -261,15 +266,15 @@ func (s *<%= store_name %>) ValidateParent(m *<%= model.name %>) error {
 	return nil
 }
 
+<%- end -%>
 func (s *<%= store_name %>) Delete(ctx context.Context, m *<%= model.name %>) error {
 	g := GoonFromContext(ctx)
 	key, err := g.KeyError(m)
 	if err != nil {
-		log.Errorf(ctx, "Failed to Get %v because of %v\n", m, err)
+		log.Errorf(ctx, "Failed to Get key of %v because of %v\n", m, err)
 		return err
 	}
-	err = g.Delete(key)
-	if err != nil {
+	if err := g.Delete(key); err != nil {
 		log.Errorf(ctx, "Failed to Delete %v because of %v\n", m, err)
 		return err
 	}
@@ -277,5 +282,3 @@ func (s *<%= store_name %>) Delete(ctx context.Context, m *<%= model.name %>) er
 }
 
 <%- end -%>
-
-<%- end -%>

data/lib/goa_model_gen/type.rb

@@ -102,8 +102,8 @@ module GoaModelGen
     end
 
     def fields_including_id
-      if goon && goon['id_type'] == 'string'
-        id_field = Field.new(goon['id_name'], {'type' => 'string'})
+      if goon && goon['id_type']
+        id_field = Field.new(id_name, {'type' => goon['id_type']})
         [id_field] + fields
       else
         fields

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor