goa_model_gen 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8acbfbf3f1441f36b014cf90e8f442637a3acf766683fe29f7d7c3adda6a11e9
-  data.tar.gz: 6e2565c972898acfb5fbfbd9430d70aeabe8c13cb386e9b0915b24f1193dee04
+  metadata.gz: e0cacd5ba7fc52902ba68ae788e6e4ec5a50fb6dd663da221d995c81b425f560
+  data.tar.gz: 71368a7fdecfbdac2cc28168df06f583891833f8067c662323576ff58060fd87
 SHA512:
-  metadata.gz: 91b451a21d658126db5bdc729c0305088f5c5a9096370fa3241345122505fa7102550608ec60e72ae7df0449d811671918fd12d637b9a59663a149afd7dcd467
-  data.tar.gz: 2d9ddf2229fb5d158e103db041f2b9e1c571bcd9e2b993087cef32eb99517809e531b7050632df098c2791b6d09070ab92d4a0a5f7ae47898fa527cc4e5576b3
+  metadata.gz: 70e0595b798469b555cf54c3fd277c5768a4ca3972a1654ec345c3d95d68cee0657fea988e43e27a8aed168ca7e360fb840a8ca8a3ca2f14aa23d81ffd74b649
+  data.tar.gz: 9d3390c47308bada677ce7ed720fa39984a86013a49d0c0c010cec95c7e77c41ace145137d988f80206d32a814e0f433bce9ac971b918135e05893c93a3985bd

data/lib/goa_model_gen/cli.rb

@@ -2,6 +2,7 @@ require "goa_model_gen"
 
 require "thor"
 
+require "goa_model_gen/logger"
 require "goa_model_gen/config"
 require "goa_model_gen/loader"
 require "goa_model_gen/generator"
@@ -9,17 +10,18 @@ require "goa_model_gen/generator"
 module GoaModelGen
   class Cli < Thor
     class_option :version, type: :boolean, aliases: 'v', desc: 'Show version before processing'
+    class_option :log_level, type: :string, aliases: 'l', desc: 'Log level, one of  debug,info,warn,error,fatal. The default value is info'
     class_option :config, type: :string, aliases: 'c', default: './goa_model_gen.yaml', desc: 'Path to config file. You can generate it by config subcommand'
 
     desc "config", "Generate config file"
     def config(path = './goa_model_gen.yaml')
-      show_version_if_required
+      setup
       open(path, 'w'){|f| f.puts(Config.new.fulfill.to_yaml) }
     end
 
     desc "bootstrap", "Generate files not concerned with model"
     def bootstrap
-      show_version_if_required
+      setup
       generator = new_generator
       {
         "templates/goon.go.erb" => "model/goon.go",
@@ -31,7 +33,7 @@ module GoaModelGen
 
     desc "show FILE1...", "Show model info from definition files"
     def show(*paths)
-      show_version_if_required
+      setup
       load_types_for(paths) do |source_file|
         puts "types in #{source_file.yaml_path}"
         puts YAML.dump(source_file.types)
@@ -40,14 +42,14 @@ module GoaModelGen
 
     desc "model FILE1...", "Generate model files from definition files"
     def model(*paths)
-      show_version_if_required
+      setup
       load_types_for(paths) do |source_file|
         generator = new_generator.tap{|g| g.source_file = source_file }
         [
           {path: 'templates/model.go.erb', suffix: '.go', overwrite: true},
           {path: 'templates/model_validation.go.erb', suffix: '_validation.go', overwrite: false},
         ].each do |d|
-          dest = File.join(cfg.model_dir, File.basename(source_file.path, ".*") + d[:suffix])
+          dest = File.join(cfg.model_dir, File.basename(source_file.yaml_path, ".*") + d[:suffix])
           generator.run(d[:path], dest, overwrite: d[:overwrite])
         end
       end
@@ -55,7 +57,7 @@ module GoaModelGen
 
     desc "converter FILE1...", "Generate converter files from definition files and swagger.yaml"
     def converter(*paths)
-      show_version_if_required
+      setup
       load_types_for(paths) do |source_file|
         generator = new_generator.tap{|g| g.source_file = source_file }
         dest = File.join(cfg.controller_dir, File.basename(source_file.yaml_path, ".*") + "_conv.go")
@@ -71,8 +73,9 @@ module GoaModelGen
     end
 
     no_commands do
-      def show_version_if_required
+      def setup
         show_version if options[:version]
+        GoaModelGen::Logger.setup(options[:log_level] || 'info')
       end
 
       def show_version

data/lib/goa_model_gen/field.rb

@@ -9,6 +9,8 @@ module GoaModelGen
     attr_reader :name, :type, :default
     attr_accessor :format # for swagger. See https://swagger.io/docs/specification/data-models/data-types/
     attr_accessor :required
+    attr_accessor :validation
+    attr_accessor :swagger_name
     attr_reader :type_obj
     attr_reader :datastore_tag
 
@@ -18,6 +20,9 @@ module GoaModelGen
       @format = attrs['format']
       @required = attrs['required']
       @default = attrs['default']
+      @validation = attrs['validation']
+      @goa_name = attrs['goa_name']
+      @swagger_name = attrs['swagger_name']
       @datastore_tag = attrs['datastore_tag']
     end
 
@@ -25,7 +30,11 @@ module GoaModelGen
     PRIMITIVE_TYPES = %w[bool int int64 float string time.Time uuid.UUID *datastore.Key]
 
     def goa_name
-      Goa.capitalize_join(name.split("_"))
+      @goa_name.presence || Goa.capitalize_join(swagger_name.split("_"))
+    end
+
+    def swagger_name
+      @swagger_name.presence ||name.underscore
     end
 
     def primitive?
@@ -54,10 +63,12 @@ module GoaModelGen
     def tag
       json_tag = name.underscore.dup
       json_tag << ',omitempty' if nullable?
-      validate_tag = 'required' unless nullable?
+      validate_tags = nullable? ? [] : ['required']
+      validate_tags << validation.presence
+      validate_tags.compact!
       [
         ['json', json_tag],
-        ['validate', validate_tag],
+        ['validate', validate_tags.join(',').presence],
         ['datastore', datastore_tag],
       ].map{|k,v| v ? "#{k}:\"#{v}\"" : nil}.compact.join(' ')
     end
@@ -66,6 +77,10 @@ module GoaModelGen
       "#{ name } #{ type } `#{ tag }`"
     end
 
+    def type_package
+      type.include?('.') ? type.split('.', 2).first.sub(/\A\*/, '') : nil
+    end
+
     # https://swagger.io/docs/specification/data-models/data-types/
     # https://tour.golang.org/basics/11
     # https://golang.org/pkg/go/types/#pkg-variables

data/lib/goa_model_gen/generator.rb

@@ -20,11 +20,47 @@ module GoaModelGen
       @golang_helper ||= GolangHelper.new
     end
 
+    def package(name = nil)
+      if name
+        @package = name
+      else
+        @package
+      end
+    end
+
+    def dependencies
+      @dependencies ||= []
+    end
+
+    def clear_dependencies
+      @dependencies = nil
+    end
+
+    def import(*packages)
+      packages.each do |package|
+        dependencies.push(package) unless dependencies.include?(package)
+      end
+    end
+
+    GO_BASE_PATH = File.expand_path('../templates/base.go.erb', __FILE__)
+
+    PACKAGE_FOR_IMPORT = {
+      "datastore" => "google.golang.org/appengine/datastore",
+    }
+
     def generate(template_path)
+      clear_dependencies
+
       abs_path = File.expand_path('../' + template_path, __FILE__)
       erb = ERB.new(File.read(abs_path), nil, "-")
       erb.filename = abs_path
-      content = erb.result(binding)
+      body = erb.result(binding).strip
+
+      raise "No package given in #{abs_path}" if package.blank?
+
+      base = ERB.new(File.read(GO_BASE_PATH), nil, "-")
+      base.filename = GO_BASE_PATH
+      base.result(binding).strip
     end
 
     def run(template_path, output_path, overwrite: false)

data/lib/goa_model_gen/loader.rb

@@ -2,6 +2,7 @@ require "goa_model_gen"
 
 require "yaml"
 
+require "goa_model_gen/logger"
 require "goa_model_gen/type"
 require "goa_model_gen/field"
 require "goa_model_gen/source_file"
@@ -72,7 +73,7 @@ module GoaModelGen
     def load(name)
       d = lookup(name)
       unless d
-        $stderr.puts("WARNING #{name} not found in #{path}")
+        GoaModelGen.logger.info("#{name} not found in #{path}")
         return nil
       end
       build_type(name, d)

data/lib/goa_model_gen/logger.rb

@@ -0,0 +1,24 @@
+require "goa_model_gen"
+
+require "logger"
+
+module GoaModelGen
+  class << self
+    def logger
+      @logger ||= ::Logger.new($stderr)
+    end
+  end
+
+  module Logger
+    class << self
+      def setup(log_level)
+        GoaModelGen.logger.level =
+          case log_level
+          when Integer then log_level
+          when String then ::Logger::SEV_LABEL.index(log_level.upcase)
+          else raise "Unsupported log_level: [#{log_level.class.name}] #{log_level.inspect}"
+          end
+      end
+    end
+  end
+end

data/lib/goa_model_gen/source_file.rb

@@ -2,30 +2,11 @@
 require 'goa_model_gen'
 require 'goa_model_gen/type'
 
-require "active_support/core_ext/string"
-
 module GoaModelGen
   class SourceFile
     attr_reader :yaml_path, :types
     def initialize(yaml_path, types)
       @yaml_path, @types = yaml_path, types
     end
-
-    def model_dependencies
-      @model_dependencies ||= calc_model_dependencies
-    end
-
-    def calc_model_dependencies
-      r = []
-      r << "github.com/goadesign/goa/uuid" if types.any?(&:use_uuid?)
-      if types.any?(&:store?)
-        r << "fmt"
-        r << "golang.org/x/net/context"
-        r << "google.golang.org/appengine/datastore"
-        r << "google.golang.org/appengine/log"
-      end
-      r << "time" if types.any?(&:has_time_field?)
-      r.uniq
-    end
   end
 end

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

@@ -0,0 +1,9 @@
+package <%= package %>
+
+<%- unless dependencies.empty? -%>
+import (
+<%= golang_helper.partition(dependencies).map{|group| group.map{|path| "\t\"#{path}\"" }.join("\n") }.join("\n\n") %>
+)
+<%- end -%>
+
+<%= body %>

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

@@ -7,15 +7,14 @@ def method_calling_exp(m, argument)
   end
 end
 -%>
-package controller
-
-import (
-	"<%= config.go_package %>/app"
-	"<%= config.go_package %>/model"
-)
+<%- package 'controller' -%>
 
 <%- source_file.types.select(&:gen_converter?).each do |type| -%>
 <%-   if type.payload -%>
+<%-
+        import "#{config.go_package}/app"
+        import "#{config.go_package}/model"
+-%>
 func <%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %>) (*model.<%= type.name %>, error) {
 	model := &model.<%= type.name %>{}
 	if err := CopyFrom<%= type.name %>PayloadToModel(payload, model); err != nil {
@@ -34,7 +33,7 @@ func CopyFrom<%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %
 
 <%-
       type.fields_including_id.each do |f|
-      pf = type.payload.fields.detect{|pf| f.name.underscore == pf.name }
+      pf = type.payload.fields.detect{|pf| pf.name == f.swagger_name }
       if pf.nil?
 -%>
   // <%= f.name %> not found in payload fields
@@ -43,11 +42,11 @@ func CopyFrom<%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %
         simple, with_error, method_name = f.payload_assignment_options(pf)
 -%>
 <%-     if simple -%>
-  model.<%= f.name %> = payload.<%= f.name %>
+  model.<%= f.name %> = payload.<%= f.goa_name %>
 <%-     elsif !with_error -%>
-  model.<%= f.name %> = <%= method_calling_exp(method_name, "payload.#{f.name}") %>
+  model.<%= f.name %> = <%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>
 <%-     else -%>
-  if v, err := <%= method_calling_exp(method_name, "payload.#{f.name}") %>; err != nil {
+  if v, err := <%= method_calling_exp(method_name, "payload.#{f.goa_name}") %>; err != nil {
     return err
   } else {
     model.<%= f.name %> = v
@@ -55,7 +54,7 @@ func CopyFrom<%= type.name %>PayloadToModel(payload *app.<%= type.payload_name %
 <%-     end -%>
 <%-   end -%>
 <%- end -%>
-<%- type.payload.field_diffs(type.fields_including_id.map{|f| f.name.underscore}).each do |pf| -%>
+<%- type.payload.field_diffs(type.fields_including_id.map{|f| f.swagger_name}).each do |pf| -%>
   // No model field for payload field "<%= pf.name %>"
 <%- end -%>
   return nil
@@ -71,7 +70,7 @@ func <%= type.name %>ModelToMediaType(model *model.<%= type.name %>) (*app.<%= t
 
 <%-
       type.fields_including_id.each do |f|
-        mf = type.media_type.fields.detect{|mf| f.name.underscore == mf.name }
+        mf = type.media_type.fields.detect{|mf| f.swagger_name == mf.name }
         if mf.nil?
 -%>
   // <%= f.name %> not found for media type field
@@ -80,19 +79,19 @@ func <%= type.name %>ModelToMediaType(model *model.<%= type.name %>) (*app.<%= t
           simple, with_error, method_name = f.media_type_assignment_options(mf)
 -%>
 <%-       if simple -%>
-  r.<%= mf.goa_name %> = model.<%= f.name %>
+  r.<%= f.goa_name %> = model.<%= f.name %>
 <%-       elsif !with_error -%>
-  r.<%= mf.goa_name %> = <%= method_calling_exp(method_name, "model.#{f.name}") %>
+  r.<%= f.goa_name %> = <%= method_calling_exp(method_name, "model.#{f.name}") %>
 <%-       else -%>
   if val, err := <%= method_calling_exp(method_name, "model.#{f.name}") %>; err != nil {
      return nil, err
   } else {
-    r.<%= mf.goa_name %> = val
+    r.<%= f.goa_name %> = val
   }
 <%-       end
         end -%>
 <%-   end -%>
-<%-   type.media_type.field_diffs(type.fields_including_id.map{|f| f.name.underscore}).each do |mf| -%>
+<%-   type.media_type.field_diffs(type.fields_including_id.map{|f| f.swagger_name}).each do |mf| -%>
     // No model field for media type field "<%= mf.name %>"
 <%-   end -%>
   return r, nil

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

@@ -1,11 +1,12 @@
-package controller
-
-import (
-  "fmt"
-	"strconv"
-
-	"google.golang.org/appengine/datastore"
-)
+<%- package 'controller' -%>
+
+<%-
+  import(
+    "fmt",
+    "strconv",
+    "google.golang.org/appengine/datastore",
+  )
+-%>
 
 var NoModelGiven = fmt.Errorf("No model given")
 var NoPayloadGiven = fmt.Errorf("No payload given")

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

@@ -1,10 +1,11 @@
-package model
+<%- package 'model' -%>
 
-import (
-	"golang.org/x/net/context"
-
-	"github.com/mjibson/goon"
-)
+<%-
+  import(
+    "golang.org/x/net/context",
+    "github.com/mjibson/goon",
+  )
+-%>
 
 // // Use the following code if you want to change kind name from model struct name.
 // var ModelNameToKindMap = map[string]string{

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

@@ -1,22 +1,17 @@
-package model
-
-<%- unless source_file.model_dependencies.empty? -%>
-import (
-<%- golang_helper.partition(source_file.model_dependencies).each do |group| -%>
-<%-   group.each do |path| -%>
-  "<%= path %>"
-<%-   end -%>
-
-<%- end -%>
-)
-<%- end -%>
+<%- package "model" -%>
 
 <%- source_file.types.each do |type| -%>
 <%-   if !type.fields.empty? -%>
+<%-
+        type.field_type_packages.each do |pkg|
+          import(PACKAGE_FOR_IMPORT[pkg] || pkg)
+        end
+-%>
 type <%= type.name %> struct {
 <%-     if type.goon -%>
 	<%= type.id_definition %>
 <%-       if type.parent -%>
+<%-         import "google.golang.org/appengine/datastore" -%>
 	ParentKey *datastore.Key `datastore:"-" goon:"parent" json:"-"`
 <%-       end -%>
 <%-     end -%>
@@ -61,6 +56,7 @@ func (m *<%= model.name %>) PrepareToUpdate() error {
 }
 
 <%-   if model.parent -%>
+<%-     import "context" -%>
 func (m *<%= model.name %>) Parent(ctx context.Context) (*<%= model.parent %>, error) {
   parentStore := &<%= model.parent %>Store{}
 	return parentStore.ByKey(ctx, m.ParentKey)
@@ -68,215 +64,3 @@ func (m *<%= model.name %>) Parent(ctx context.Context) (*<%= model.parent %>, e
 <%-   end -%>
 
 <%- end -%>
-
-<%- source_file.types.select(&:store?).each do |model| -%>
-<%- store_name = "#{model.name}Store" -%>
-type <%= store_name %> struct{
-<%- if model.parent -%>
-	ParentKey *datastore.Key
-<%- end -%>
-}
-
-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 %>{}
-	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)
-		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 %>}
-<%- else -%>
-	r := <%= model.name %>{<%= model.id_name %>: <%= model.id_name_var %>}
-<%- end -%>
-  err := s.Get(ctx, &r)
-	if err != nil {
-		return nil, err
-	}
-	return &r, nil
-}
-
-func (s *<%= store_name %>) ByKey(ctx context.Context, key *datastore.Key) (*<%= model.name %>, error) {
-	if err := s.IsValidKey(ctx, key); err != nil {
-		log.Errorf(ctx, "<%= store_name %>.ByKey got Invalid key: %v because of %v\n", key, err)
-		return nil, err
-	}
-
-<%- if model.parent -%>
-	r := <%= model.name %>{ParentKey: key.Parent(), <%= model.id_name %>: key.<%= model.key_id_method %>()}
-<%- else -%>
-	r := <%= model.name %>{<%= model.id_name %>: key.<%= model.key_id_method %>()}
-<%- end -%>
-	err := s.Get(ctx, &r)
-	if err != nil {
-		return nil, err
-	}
-	return &r, nil
-}
-
-func (s *<%= store_name %>) Get(ctx context.Context, m *<%= model.name %>) error {
-	g := GoonFromContext(ctx)
-	err := g.Get(m)
-	if err != nil {
-		log.Errorf(ctx, "Failed to Get <%= model.name %> because of %v\n", err)
-		return err
-	}
-<%- if model.parent -%>
-	if err := s.ValidateParent(m); err != nil {
-		log.Errorf(ctx, "Invalid parent key for <%= model.name %> because of %v\n", err)
-		return err
-	}
-<%- end -%>
-
-	return nil
-}
-
-func (s *<%= store_name %>) IsValidKey(ctx context.Context, key *datastore.Key) error {
-	if key == nil {
-		return fmt.Errorf("key is nil")
-	}
-	g := GoonFromContext(ctx)
-	expected := g.Kind(&<%= model.name %>{})
-	if key.Kind() != expected {
-		return fmt.Errorf("key kind must be %s but was %s", expected, key.Kind())
-	}
-<%- if model.parent -%>
-	if key.Parent() == nil {
-		return fmt.Errorf("key parent must not be nil but was nil")
-	}
-<%- end -%>
-	return nil
-}
-
-func (s *<%= store_name %>) Exist(ctx context.Context, m *<%= model.name %>) (bool, error) {
-	g := GoonFromContext(ctx)
-	key, err := g.KeyError(m)
-	if err != nil {
-		log.Errorf(ctx, "Failed to Get Key of %v because of %v\n", m, err)
-		return false, err
-	}
-	_, err = s.ByKey(ctx, key)
-	if err == datastore.ErrNoSuchEntity {
-		return false, nil
-	} else if err != nil {
-		log.Errorf(ctx, "Failed to get existance of %v because of %v\n", m, err)
-		return false, err
-	} else {
-		return true, nil
-	}
-}
-
-func (s *<%= store_name %>) Create(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
-  err := m.PrepareToCreate()
-  if err != nil {
-    return nil, err
-  }
-	if err := m.Validate(); err != nil {
-		return nil, err
-	}
-
-<%- if model.goon['id_type'] == 'string' -%>
-	exist, err := s.Exist(ctx, m)
-	if err != nil {
-		return nil, err
-	}
-	if exist {
-		log.Errorf(ctx, "Failed to create %v because of another entity has same key\n", m)
-		return nil, fmt.Errorf("Duplicate <%= model.goon['id_name'] %> error: %q of %v\n", m.<%= model.goon['id_name'] %>, m)
-	}
-<%- end -%>
-
-  return s.Put(ctx, m)
-}
-
-func (s *<%= store_name %>) Update(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
-  err := m.PrepareToUpdate()
-  if err != nil {
-    return nil, err
-  }
-	if err := m.Validate(); err != nil {
-		return nil, err
-	}
-
-<%- if model.goon['id_type'] == 'string' -%>
-	exist, err := s.Exist(ctx, m)
-	if err != nil {
-		return nil, err
-	}
-	if !exist {
-		log.Errorf(ctx, "Failed to update %v because it doesn't exist\n", m)
-		return nil, fmt.Errorf("No data to update %q of %v\n", m.<%= model.goon['id_name'] %>, m)
-	}
-<%- end -%>
-
-  return s.Put(ctx, m)
-}
-
-func (s *<%= store_name %>) Put(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
-<%- if model.goon['id_type'] == 'UUID' -%>
-	if m.Id == "" {
-		m.Id = uuid.NewV4().String()
-	}
-<%- end -%>
-<%- if model.parent -%>
-	if err := s.ValidateParent(m); err != nil {
-		log.Errorf(ctx, "Invalid parent key for <%= model.name %> because of %v\n", err)
-		return nil, err
-	}
-<%- end -%>
-	g := GoonFromContext(ctx)
-	key, err := g.Put(m)
-	if err != nil {
-		log.Errorf(ctx, "Failed to Put %v because of %v\n", m, err)
-		return nil, err
-	}
-	return key, nil
-}
-
-<%- if model.parent -%>
-func (s *<%= store_name %>) ValidateParent(m *<%= model.name %>) error {
-	if s.ParentKey == nil {
-	  return nil
-	}
-	if m.ParentKey == nil {
-		m.ParentKey = s.ParentKey
-	}
-	if !s.ParentKey.Equal(m.ParentKey) {
-	  return fmt.Errorf("Invalid ParentKey for %v", m)
-	}
-	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 key of %v because of %v\n", m, err)
-		return err
-	}
-	if err := g.Delete(key); err != nil {
-		log.Errorf(ctx, "Failed to Delete %v because of %v\n", m, err)
-		return err
-	}
-	return nil
-}
-
-<%- end -%>

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

@@ -0,0 +1,222 @@
+<%- package "model" -%>
+
+<%- source_file.types.select(&:store?).each do |model| -%>
+<%-   store_name = "#{model.name}Store" -%>
+<%-
+      import(
+        "context",
+        "fmt",
+        "google.golang.org/appengine/datastore",
+        "google.golang.org/appengine/log",
+      )
+-%>
+type <%= store_name %> struct{
+<%- if model.parent -%>
+	ParentKey *datastore.Key
+<%- end -%>
+}
+
+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 %>{}
+	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)
+		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 %>}
+<%- else -%>
+	r := <%= model.name %>{<%= model.id_name %>: <%= model.id_name_var %>}
+<%- end -%>
+  err := s.Get(ctx, &r)
+	if err != nil {
+		return nil, err
+	}
+	return &r, nil
+}
+
+func (s *<%= store_name %>) ByKey(ctx context.Context, key *datastore.Key) (*<%= model.name %>, error) {
+	if err := s.IsValidKey(ctx, key); err != nil {
+		log.Errorf(ctx, "<%= store_name %>.ByKey got Invalid key: %v because of %v\n", key, err)
+		return nil, err
+	}
+
+<%- if model.parent -%>
+	r := <%= model.name %>{ParentKey: key.Parent(), <%= model.id_name %>: key.<%= model.key_id_method %>()}
+<%- else -%>
+	r := <%= model.name %>{<%= model.id_name %>: key.<%= model.key_id_method %>()}
+<%- end -%>
+	err := s.Get(ctx, &r)
+	if err != nil {
+		return nil, err
+	}
+	return &r, nil
+}
+
+func (s *<%= store_name %>) Get(ctx context.Context, m *<%= model.name %>) error {
+	g := GoonFromContext(ctx)
+	err := g.Get(m)
+	if err != nil {
+		log.Errorf(ctx, "Failed to Get <%= model.name %> because of %v\n", err)
+		return err
+	}
+<%- if model.parent -%>
+	if err := s.ValidateParent(m); err != nil {
+		log.Errorf(ctx, "Invalid parent key for <%= model.name %> because of %v\n", err)
+		return err
+	}
+<%- end -%>
+
+	return nil
+}
+
+func (s *<%= store_name %>) IsValidKey(ctx context.Context, key *datastore.Key) error {
+	if key == nil {
+		return fmt.Errorf("key is nil")
+	}
+	g := GoonFromContext(ctx)
+	expected := g.Kind(&<%= model.name %>{})
+	if key.Kind() != expected {
+		return fmt.Errorf("key kind must be %s but was %s", expected, key.Kind())
+	}
+<%- if model.parent -%>
+	if key.Parent() == nil {
+		return fmt.Errorf("key parent must not be nil but was nil")
+	}
+<%- end -%>
+	return nil
+}
+
+func (s *<%= store_name %>) Exist(ctx context.Context, m *<%= model.name %>) (bool, error) {
+	g := GoonFromContext(ctx)
+	key, err := g.KeyError(m)
+	if err != nil {
+		log.Errorf(ctx, "Failed to Get Key of %v because of %v\n", m, err)
+		return false, err
+	}
+	_, err = s.ByKey(ctx, key)
+	if err == datastore.ErrNoSuchEntity {
+		return false, nil
+	} else if err != nil {
+		log.Errorf(ctx, "Failed to get existance of %v because of %v\n", m, err)
+		return false, err
+	} else {
+		return true, nil
+	}
+}
+
+func (s *<%= store_name %>) Create(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
+  err := m.PrepareToCreate()
+  if err != nil {
+    return nil, err
+  }
+	if err := m.Validate(); err != nil {
+		return nil, err
+	}
+
+<%- if model.goon['id_type'] == 'string' -%>
+	exist, err := s.Exist(ctx, m)
+	if err != nil {
+		return nil, err
+	}
+	if exist {
+		log.Errorf(ctx, "Failed to create %v because of another entity has same key\n", m)
+		return nil, fmt.Errorf("Duplicate <%= model.goon['id_name'] %> error: %q of %v\n", m.<%= model.goon['id_name'] %>, m)
+	}
+<%- end -%>
+
+  return s.Put(ctx, m)
+}
+
+func (s *<%= store_name %>) Update(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
+  err := m.PrepareToUpdate()
+  if err != nil {
+    return nil, err
+  }
+	if err := m.Validate(); err != nil {
+		return nil, err
+	}
+
+<%- if model.goon['id_type'] == 'string' -%>
+	exist, err := s.Exist(ctx, m)
+	if err != nil {
+		return nil, err
+	}
+	if !exist {
+		log.Errorf(ctx, "Failed to update %v because it doesn't exist\n", m)
+		return nil, fmt.Errorf("No data to update %q of %v\n", m.<%= model.goon['id_name'] %>, m)
+	}
+<%- end -%>
+
+  return s.Put(ctx, m)
+}
+
+func (s *<%= store_name %>) Put(ctx context.Context, m *<%= model.name %>) (*datastore.Key, error) {
+<%- if model.goon['id_type'] == 'UUID' -%>
+<%-   import "github.com/goadesign/goa/uuid" -%>
+	if m.Id == "" {
+		m.Id = uuid.NewV4().String()
+	}
+<%- end -%>
+<%- if model.parent -%>
+	if err := s.ValidateParent(m); err != nil {
+		log.Errorf(ctx, "Invalid parent key for <%= model.name %> because of %v\n", err)
+		return nil, err
+	}
+<%- end -%>
+	g := GoonFromContext(ctx)
+	key, err := g.Put(m)
+	if err != nil {
+		log.Errorf(ctx, "Failed to Put %v because of %v\n", m, err)
+		return nil, err
+	}
+	return key, nil
+}
+
+<%- if model.parent -%>
+func (s *<%= store_name %>) ValidateParent(m *<%= model.name %>) error {
+	if s.ParentKey == nil {
+	  return nil
+	}
+	if m.ParentKey == nil {
+		m.ParentKey = s.ParentKey
+	}
+	if !s.ParentKey.Equal(m.ParentKey) {
+	  return fmt.Errorf("Invalid ParentKey for %v", m)
+	}
+	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 key of %v because of %v\n", m, err)
+		return err
+	}
+	if err := g.Delete(key); err != nil {
+		log.Errorf(ctx, "Failed to Delete %v because of %v\n", m, err)
+		return err
+	}
+	return nil
+}
+
+<%- end -%>

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

@@ -1,10 +1,7 @@
-package model
-
-import (
-	"gopkg.in/go-playground/validator.v9"
-)
+<%- package "model" -%>
 
 <%- source_file.types.select(&:store?).each do |model| -%>
+<%-   import "gopkg.in/go-playground/validator.v9" -%>
 func (m *<%= model.name %>) Validate() error {
 	validator := validator.New()
 	return validator.Struct(m)

data/lib/goa_model_gen/type.rb

@@ -25,6 +25,10 @@ module GoaModelGen
     def has_time_field?
       fields.any?{|f| f.type =~ TIME_TYPE_PATTERN}
     end
+
+    def field_type_packages
+      fields.map(&:type_package).compact.uniq.sort
+    end
   end
 
   class Model < Type
@@ -93,7 +97,7 @@ module GoaModelGen
     end
 
     def assign_swagger_types(loader)
-      $stderr.puts "assign_swagger_types for #{name.inspect}"
+      GoaModelGen.logger.debug "assign_swagger_types for #{name.inspect}"
       # Original Type: VmDisk
       # Swagger type : VmDisk
       # Goa struct   : VMDisk

data/lib/goa_model_gen/version.rb

@@ -1,3 +1,3 @@
 module GoaModelGen
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goa_model_gen
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - akm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -122,11 +122,14 @@ files:
 - lib/goa_model_gen/goa.rb
 - lib/goa_model_gen/golang_helper.rb
 - lib/goa_model_gen/loader.rb
+- lib/goa_model_gen/logger.rb
 - lib/goa_model_gen/source_file.rb
+- lib/goa_model_gen/templates/base.go.erb
 - lib/goa_model_gen/templates/converter.go.erb
 - lib/goa_model_gen/templates/converter_base.go.erb
 - lib/goa_model_gen/templates/goon.go.erb
 - lib/goa_model_gen/templates/model.go.erb
+- lib/goa_model_gen/templates/model_store.go.erb
 - lib/goa_model_gen/templates/model_validation.go.erb
 - lib/goa_model_gen/type.rb
 - lib/goa_model_gen/version.rb
@@ -150,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generate model files for goa in golang