rider-kick 0.0.12 → 0.0.14

data/lib/generators/rider_kick/templates/.rubocop.yml

@@ -9,7 +9,6 @@ inherit_gem: { rubocop-rails-omakase: rubocop.yml }
 
 AllCops:
   SuggestExtensions: false
-  TargetRubyVersion: 3.3.4
   DisabledByDefault: true
   Exclude:
     - '**/templates/**/*'
@@ -20,8 +19,11 @@ AllCops:
     - 'db/**/*'
     - 'config/**/*'
     - 'script/**/*'
+    - 'bin/*'
     - 'public/views/*'
     - 'bin/**/*'
+    - 'config/**/*'
+    - 'db/**/*'
     - 'tmp/**/*'
     - 'spec/spec_helper.rb'
     - 'spec/rails_helper.rb'
@@ -1092,9 +1094,6 @@ Style/CommandLiteral:
 Style/ConstantVisibility:
   Enabled: true
 
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 Style/Documentation:
   Enabled: false
 
@@ -1134,3 +1133,5 @@ Naming/MethodParameterName:
 Layout/ClassStructure:
   Enabled: true
 
+Style/WordArray:
+  EnforcedStyle: brackets

data/lib/generators/rider_kick/templates/config/initializers/version.rb.tt

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module <%= Rails.application.class.module_parent_name %>
+module <%= Rails.application&.class&.module_parent_name || 'MyApp' %>
   VERSION = '0.0.1'
   public_constant :VERSION
 end

data/lib/generators/rider_kick/templates/db/migrate/20220613145533_init_database.rb

@@ -1,4 +1,4 @@
-class InitDatabase < ActiveRecord::Migration[7.2]
+class InitDatabase < ActiveRecord::Migration[8.1]
   def change
     enable_extension 'pgcrypto'
   end

data/lib/generators/rider_kick/templates/db/structures/example.yaml.tt

@@ -1,100 +1,206 @@
+# RiderKick Structure Definition for <%= @scope_class %>
+# This file acts as a centralized contract for code generation.
+# Modifying this file and re-running 'rider_kick:scaffold' will update the domain logic.
+
 model: <%= @model_class %>
 resource_name: <%= @scope_path %>
-resource_owner_id: <%= @resource_owner_id %>
-actor: <%= @actor %>
+resource_owner_id: <%= @resource_owner_id %> # account_id
+resource_owner: <%= @resource_owner %> # account
+actor: <%= @actor %> # user
+actor_id: <%= @actor_id %> # user_id
+
 fields:
-<% @model_class.columns.each do |field| -%>
-  - <%= field.name.to_s %>
+<% @fields.each do |f| -%>
+- <%= f %>
 <% end -%>
-<% @uploaders.each do |field| -%>
-  - <%= field %>
+<% @uploaders.each do |f| -%>
+- <%= f %>
 <% end -%>
+
+<% if entity_uploader_definitions.empty? -%>
+uploaders: []
+<% else -%>
 uploaders:
-<% @uploaders.each do |field| -%>
-  - <%= field %>
+<% entity_uploader_definitions.each do |uploader_hash| -%>
+- { name: '<%= uploader_hash[:name] %>', type: '<%= uploader_hash[:type] %>' }
+<% end -%>
 <% end -%>
+
+<% search_able_fields = arg_settings['search_able'].to_s.split(',').map(&:strip).reject(&:blank?) -%>
+<% if search_able_fields.empty? -%>
+search_able: []
+<% else -%>
 search_able:
-<% contract_fields.each do |field| -%>
-<% if ['title', 'name'].include?(field) -%>
-  - <%= field %>
+<% search_able_fields.each do |f| -%>
+- <%= f %>
+<% end -%>
+<% end -%>
+
+# ---- Enriched metadata (opsional, untuk tooling/insight) ----
+schema:
+  columns:
+<% if columns_meta.empty? -%>
+  []
+<% else -%>
+<% columns_meta.each do |c| -%>
+  - name: <%= c[:name] %>
+    type: <%= c[:type] %>
+    sql_type: <%= c[:sql_type] || 'null' %>
+    null: <%= c[:null] || 'false' %>
+<% if c[:default].present? -%>
+    default: <%= c[:default].inspect %>
+<% end -%>
+<% if c[:precision] || c[:scale] -%>
+    precision: <%= c[:precision] || 'null' %>
+    scale: <%= c[:scale] || 'null' %>
+<% end -%>
+<% if c[:limit] -%>
+    limit: <%= c[:limit] %>
+<% end -%>
+<% end -%>
+<% end -%>
+  foreign_keys:
+<% (fkeys_meta.presence || []).each do |fk| -%>
+  - column: <%= fk[:column] %>
+    to_table: <%= fk[:to_table] %>
 <% end -%>
+<% if fkeys_meta.empty? -%>
+    []
 <% end -%>
+  indexes:
+<% (indexes_meta.presence || []).each do |ix| -%>
+  - columns: [<%= ix[:columns].join(', ') %>]
+    unique: <%= ix[:unique] %>
+<% end -%>
+<% if indexes_meta.empty? -%>
+    []
+<% end -%>
+  enums:
+<% if enums_meta.present? -%>
+<% enums_meta.each do |name, map| -%>
+  <%= name %>: <%= map.keys %>
+<% end -%>
+<% else -%>
+    {}
+<% end -%>
+
 controllers:
   list_fields:
-<% @fields.each do |field| -%>
-    - <%= field %>
+<% @fields.each do |f| -%>
+  - <%= f %>
+<% end -%>
+<% if @fields.empty? -%>
+    []
 <% end -%>
   show_fields:
-<% @model_class.columns.each do |field| -%>
-    - <%= field.name.to_s %>
+<% (@columns.map { |c| c[:name] } + @uploaders).uniq.each do |f| -%>
+  - <%= f %>
 <% end -%>
-<% @uploaders.each do |field| -%>
-    - <%= field %>
+<% if (@columns.map { |c| c[:name] } + @uploaders).uniq.empty? -%>
+    []
 <% end -%>
   form_fields:
-<% (@fields).each do |field| -%>
-    - name: <%= field %>
-      type: string
-<% end -%>
-<% (@uploaders).each do |field| -%>
-<% if is_singular?(field) -%>
-    - name: <%= field %>
-      type: file
+<% if @fields.empty? && @uploaders.empty? -%>
+    []
 <% else -%>
-    - name: <%= field %>
-      type: files
+<% @fields.each do |f| -%>
+<% if @uploaders.include?(f) -%>
+  - name: <%= f %>
+    type: <%= is_singular?(f) ? 'file' : 'files' %>
+<% else -%>
+  - name: <%= f %>
+    type: <%= get_column_type(f) %>
+<% end -%>
 <% end -%>
+<% @uploaders.each do |f| -%>
+<% unless @fields.include?(f) -%>
+  - name: <%= f %>
+    type: <%= is_singular?(f) ? 'file' : 'files' %>
 <% end -%>
+<% end -%>
+<% end -%>
+
 domains:
   action_list:
     use_case:
       contract:
+<% if contract_lines_for_list.empty? -%>
+        []
+<% else -%>
+<% contract_lines_for_list.each do |line| -%>
+        - <%= line %>
+<% end -%>
+<% end -%>
+    repository:
+      filters:
+<% if repository_list_filters.empty? -%>
+        []
+<% else -%>
+<% repository_list_filters.each do |line| -%>
+        - <%= line %>
+<% end -%>
+<% end -%>
+
   action_fetch_by_id:
     use_case:
       contract:
-        - required(:id).filled(:string)
+        - "required(:id).filled(:string)"
+<% if @resource_owner_id.present? -%>
+        - "required(:<%= @resource_owner_id %>).filled(:string)"
+<% end -%>
+<% search_able_fields = arg_settings['search_able'].to_s.split(',').map(&:strip).reject(&:blank?) -%>
+<% if search_able_fields.any? -%>
+<% search_able_fields.each do |f| -%>
+        # optional search fields: <%= f %>
+<% end -%>
+<% end -%>
+
   action_create:
     use_case:
       contract:
-<% (@fields + @uploaders).each do |field| -%>
-  <% column_type = get_column_type(field) -%>
-  <% dry_type = @type_mapping[column_type.to_s] || ':string' -%>
-<% if @uploaders.include?(field) -%>
-<% if is_singular?(field) -%>
-    - optional(:<%= field %>).maybe(<%= dry_type %>)
-<% else -%>
-    - optional(:<%= field %>).maybe(:array)
+<% if @resource_owner_id.present? -%>
+        - "required(:<%= @resource_owner_id %>).filled(:string)"
 <% end -%>
+<% if contract_lines_for_create.empty? && !@resource_owner_id.present? -%>
+        []
 <% else -%>
-    - required(:<%= field %>).filled(<%= dry_type %>)
+<% contract_lines_for_create.each do |line| -%>
+        - <%= line %>
 <% end -%>
 <% end -%>
+
   action_update:
     use_case:
       contract:
-        - required(:id).filled(:string)
-<% (@fields + @uploaders).each do |field| -%>
-<% column_type = get_column_type(field) -%>
-<% dry_type = @type_mapping[column_type.to_s] || ':string' -%>
-<% if @uploaders.include?(field) -%>
-<% if is_singular?(field) -%>
-        - optional(:<%= field %>).maybe(<%= dry_type %>)
-<% else -%>
-        - optional(:<%= field %>).maybe(:array)
-<% end -%>
-<% else -%>
-        - optional(:<%= field %>).maybe(<%= dry_type %>)
+        - "required(:id).filled(:string)"
+<% if @resource_owner_id.present? -%>
+        - "required(:<%= @resource_owner_id %>).filled(:string)"
 <% end -%>
+<% contract_lines_for_update.each do |line| -%>
+        - <%= line %>
 <% end -%>
+
   action_destroy:
     use_case:
       contract:
-        - required(:id).filled(:string)
+        - "required(:id).filled(:string)"
+<% if @resource_owner_id.present? -%>
+        - "required(:<%= @resource_owner_id %>).filled(:string)"
+<% end -%>
+
 entity:
   skipped_fields:
     - id
     - created_at
     - updated_at
-<% if @model_class.columns.map(&:name).include?(:type) -%>
+<% if @columns.map { |c| c[:name] }.include?('type') -%>
     - type
+<% end -%>
+  db_attributes:
+<% if entity_db_fields.empty? -%>
+    []
+<% else -%>
+<% entity_db_fields.each do |field| -%>
+    - <%= field %>
+<% end -%>
 <% end -%>

data/lib/generators/rider_kick/templates/domains/core/builders/builder.rb.tt

@@ -1,25 +1,51 @@
 # frozen_string_literal: true
 
-class Core::Builders::<%=  @subject_class %> < RiderKick::Builders::AbstractActiveRecordEntityBuilder
-  acts_as_builder_for_entity Core::Entities::<%= @subject_class%>
+class <%= domain_class_name %>::Builders::<%= @subject_class %> < RiderKick::Builders::AbstractActiveRecordEntityBuilder
+  acts_as_builder_for_entity <%= domain_class_name %>::Entities::<%= @subject_class%>
 
 <% if @uploaders.present? -%>
   def attributes_for_entity
     {
-<% @uploaders.each_with_index do |field, index| -%>
-<% if is_singular?(field) -%>
-      <%= field %>: (Rails.application.routes.url_helpers.polymorphic_url(params.<%= field %>) rescue '')<%= ',' if index < @uploaders.size - 1 %>
+<% @uploaders.each_with_index do |uploader, index| -%>
+<% if uploader.type == 'single' -%>
+      <%= uploader.name %>_url: with_<%= uploader.name %>_url(@params)<%= index < @uploaders.length - 1 ? ',' : '' %>
 <% else -%>
-      <%= field %>: build_assets(params.<%= field %>)<%= ',' if index < @uploaders.size - 1 %>
+      <%= uploader.name %>_urls: with_<%= uploader.name %>_urls(@params)<%= index < @uploaders.length - 1 ? ',' : '' %>
 <% end -%>
 <% end -%>
     }
   end
 
-private
+  private
+<% end -%>
+  <%- @uploaders.each do |uploader| -%>
+  <%- if uploader.type == 'single' -%>
+  # Metode ini akan dipanggil untuk mengisi ':<%= uploader.name %>_url'
+  def with_<%= uploader.name %>_url(model)
+    return nil unless model.<%= uploader.name %>.attached?
 
-  def build_assets(assets)
-    assets.to_a.map { |asset| Rails.application.routes.url_helpers.polymorphic_url(asset) rescue '' }.compact
+    # Anda bisa mengubah logika ini, misal menggunakan Rails.application.routes.url_helpers
+    # jika Anda membutuhkan URL yang absolut.
+    model.<%= uploader.name %>.url
+  rescue StandardError
+    nil
   end
-<% end -%>
+
+  <%- else -%>
+  # Metode ini akan dipanggil untuk mengisi ':<%= uploader.name %>_urls'
+  def with_<%= uploader.name %>_urls(model)
+    return [] unless model.<%= uploader.name %>.attached?
+
+    model.<%= uploader.name %>.map do |attachment|
+      # Anda bisa mengubah logika ini juga
+      attachment.url
+    rescue StandardError
+      nil
+    end.compact
+  end
+
+  <%- end -%>
+  <%- end -%>
+
 end
+

data/lib/generators/rider_kick/templates/domains/core/builders/builder_spec.rb.tt

@@ -0,0 +1,219 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe <%= domain_class_name %>::Builders::<%= @subject_class %>, type: :builder do
+  describe '#build' do
+    let(:<%= @variable_subject %>) do
+      ClassStubber::Model.new(
+        'id' => 'test-id-123',
+<% 
+# Get uploader field names to exclude from entity_db_fields
+uploader_names = @uploaders.map { |u| u.name.to_s }
+-%>
+<% @entity_db_fields.each do |field| -%>
+<% next if uploader_names.include?(field.to_s) -%>
+<% column_meta = get_column_meta(field) -%>
+<% case column_meta[:type].to_s -%>
+<% when 'datetime', 'timestamp' -%>
+        '<%= field %>' => Time.current,
+<% when 'date' -%>
+        '<%= field %>' => Date.current,
+<% when 'time' -%>
+        '<%= field %>' => Time.current,
+<% when 'boolean' -%>
+        '<%= field %>' => true,
+<% when 'integer', 'bigint' -%>
+        '<%= field %>' => 123,
+<% when 'decimal', 'float' -%>
+        '<%= field %>' => 123.45,
+<% else -%>
+        '<%= field %>' => '<%= field %>_value',
+<% end -%>
+<% end -%>
+<% @uploaders.each do |uploader| -%>
+<% if uploader.type == 'single' -%>
+        '<%= uploader.name %>' => ClassStubber::ActiveStorageAttachment.new_single('http://example.com/<%= uploader.name %>.jpg'),
+<% else -%>
+        '<%= uploader.name %>' => ClassStubber::ActiveStorageAttachment.new_multiple([
+          'http://example.com/<%= uploader.name %>_1.jpg',
+          'http://example.com/<%= uploader.name %>_2.jpg'
+        ]),
+<% end -%>
+<% end -%>
+        'created_at' => Time.current,
+        'updated_at' => Time.current
+      )
+    end
+
+    let(:builder) { described_class.new(<%= @variable_subject %>) }
+
+    it 'builds entity from model' do
+      entity = builder.build
+
+      expect(entity).to be_a(<%= domain_class_name %>::Entities::<%= @subject_class %>)
+      expect(entity.id).to eq('test-id-123')
+<% @entity_db_fields.first(2).each do |field| -%>
+<% column_meta = get_column_meta(field) -%>
+<% case column_meta[:type].to_s -%>
+<% when 'datetime', 'timestamp', 'time' -%>
+      expect(entity.<%= field %>).to be_a(Time)
+<% when 'date' -%>
+      expect(entity.<%= field %>).to be_a(Date)
+<% when 'boolean' -%>
+      expect(entity.<%= field %>).to eq(true)
+<% when 'integer', 'bigint' -%>
+      expect(entity.<%= field %>).to eq(123)
+<% when 'decimal', 'float' -%>
+      expect(entity.<%= field %>).to eq(123.45)
+<% else -%>
+      expect(entity.<%= field %>).to eq('<%= field %>_value')
+<% end -%>
+<% end -%>
+    end
+
+    it 'includes all required entity attributes', :aggregate_failures do
+      entity = builder.build
+      
+      # Entity must have these attributes (keys must exist, values can be nil for optional)
+      expect(entity).to respond_to(:id)
+<% @entity_db_fields.each do |field| -%>
+<% next if uploader_names.include?(field.to_s) -%>
+      expect(entity).to respond_to(:<%= field %>)
+<% end -%>
+<% @uploaders.each do |uploader| -%>
+<% if uploader.type == 'single' -%>
+      expect(entity).to respond_to(:<%= uploader.name %>_url)
+<% else -%>
+      expect(entity).to respond_to(:<%= uploader.name %>_urls)
+<% end -%>
+<% end -%>
+      expect(entity).to respond_to(:created_at)
+      expect(entity).to respond_to(:updated_at)
+    end
+<% if @uploaders.present? -%>
+
+    describe '#attributes_for_entity' do
+      it 'returns hash with uploader attributes', :aggregate_failures do
+        attributes = builder.send(:attributes_for_entity)
+        
+        expect(attributes).to be_a(Hash)
+<% @uploaders.each do |uploader| -%>
+<% if uploader.type == 'single' -%>
+        expect(attributes).to have_key(:<%= uploader.name %>_url)
+<% else -%>
+        expect(attributes).to have_key(:<%= uploader.name %>_urls)
+<% end -%>
+<% end -%>
+      end
+
+      it 'generates correct URL attributes', :aggregate_failures do
+        attributes = builder.send(:attributes_for_entity)
+        
+<% @uploaders.each do |uploader| -%>
+<% if uploader.type == 'single' -%>
+        expect(attributes[:<%= uploader.name %>_url]).to eq('http://example.com/<%= uploader.name %>.jpg')
+<% else -%>
+        expect(attributes[:<%= uploader.name %>_urls]).to be_an(Array)
+        expect(attributes[:<%= uploader.name %>_urls].size).to eq(2)
+<% end -%>
+<% end -%>
+      end
+    end
+<% end -%>
+
+    it 'ensures all entity attributes have correct keys and types', :aggregate_failures do
+      entity = builder.build
+      entity_hash = entity.to_h
+      
+      # All entity attributes must have keys in the hash (source of truth from entity)
+      expect(entity_hash).to have_key(:id)
+      expect(entity.id).to be_a(String)
+<% @entity_db_fields.each do |field| -%>
+<% next if uploader_names.include?(field.to_s) -%>
+<% column_meta = get_column_meta(field) -%>
+      
+      expect(entity_hash).to have_key(:<%= field %>)
+<% case column_meta[:type].to_s -%>
+<% when 'datetime', 'timestamp', 'time' -%>
+      expect(entity.<%= field %>).to be_a(Time) if entity.<%= field %>.present?
+<% when 'date' -%>
+      expect(entity.<%= field %>).to be_a(Date) if entity.<%= field %>.present?
+<% when 'boolean' -%>
+      expect([TrueClass, FalseClass, NilClass]).to include(entity.<%= field %>.class)
+<% when 'integer', 'bigint' -%>
+      expect(entity.<%= field %>).to be_a(Integer) if entity.<%= field %>.present?
+<% when 'decimal', 'float' -%>
+      expect(entity.<%= field %>).to be_a(Numeric) if entity.<%= field %>.present?
+<% else -%>
+      expect(entity.<%= field %>).to be_a(String).or be_nil
+<% end -%>
+<% end -%>
+<% @uploaders.each do |uploader| -%>
+<% if uploader.type == 'single' -%>
+      
+      expect(entity_hash).to have_key(:<%= uploader.name %>_url)
+      expect(entity.<%= uploader.name %>_url).to be_a(String).or be_nil
+<% else -%>
+      
+      expect(entity_hash).to have_key(:<%= uploader.name %>_urls)
+      expect(entity.<%= uploader.name %>_urls).to be_a(Array)
+<% end -%>
+<% end -%>
+      
+      expect(entity_hash).to have_key(:created_at)
+      expect(entity.created_at).to be_a(Time) if entity.created_at.present?
+      
+      expect(entity_hash).to have_key(:updated_at)
+      expect(entity.updated_at).to be_a(Time) if entity.updated_at.present?
+    end
+
+    it 'validates entity type schema definitions', :aggregate_failures do
+      # Verify entity has correct Dry::Types definitions
+      schema = <%= domain_class_name %>::Entities::<%= @subject_class %>.schema
+      
+      # ID must be required (not optional)
+      id_key = schema.key(:id)
+      expect(id_key.required?).to be true
+      # Check if type is not nilable (Constrained means not optional)
+      expect(id_key.type.to_s).to match(/Constrained|Strict/)
+<% @entity_db_fields.each do |field| -%>
+<% next if uploader_names.include?(field.to_s) -%>
+<% column_meta = get_column_meta(field) -%>
+      
+      # <%= field %>: <%= column_meta[:null] ? 'optional' : 'required' %>
+<% if column_meta[:null] -%>
+      # Optional field - can be nil
+      <%= field %>_key = schema.key(:<%= field %>)
+      expect(<%= field %>_key.required?).to be false
+<% else -%>
+      # Required field - not nilable
+      <%= field %>_key = schema.key(:<%= field %>)
+      expect(<%= field %>_key.required?).to be true
+      expect(<%= field %>_key.type.to_s).to match(/Constrained|Strict/)
+<% end -%>
+<% end -%>
+<% @uploaders.each do |uploader| -%>
+<% if uploader.type == 'single' -%>
+      
+      # <%= uploader.name %>_url: optional (uploader can be nil)
+      <%= uploader.name %>_url_key = schema.key(:<%= uploader.name %>_url)
+      expect(<%= uploader.name %>_url_key.required?).to be false
+<% else -%>
+      
+      # <%= uploader.name %>_urls: required (but can be empty array)
+      <%= uploader.name %>_urls_key = schema.key(:<%= uploader.name %>_urls)
+      expect(<%= uploader.name %>_urls_key.required?).to be true
+<% end -%>
+<% end -%>
+      
+      # Timestamps - check their actual definition
+      created_at_key = schema.key(:created_at)
+      updated_at_key = schema.key(:updated_at)
+      
+      # Verify timestamps exist (they might be optional in some entities)
+      expect(schema.keys.map(&:name)).to include(:created_at, :updated_at)
+    end
+  end
+end
+

data/lib/generators/rider_kick/templates/domains/core/builders/error.rb.tt

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class Core::Builders::Error < RiderKick::Builders::AbstractActiveRecordEntityBuilder
-  acts_as_builder_for_entity Core::Entities::Error
+class <%= domain_class_name %>::Builders::Error < RiderKick::Builders::AbstractActiveRecordEntityBuilder
+  acts_as_builder_for_entity <%= domain_class_name %>::Entities::Error
 end

data/lib/generators/rider_kick/templates/domains/core/builders/pagination.rb.tt

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class Core::Builders::Pagination < RiderKick::Builders::AbstractActiveRecordEntityBuilder
-  acts_as_builder_for_entity Core::Entities::Pagination
+class <%= domain_class_name %>::Builders::Pagination < RiderKick::Builders::AbstractActiveRecordEntityBuilder
+  acts_as_builder_for_entity <%= domain_class_name %>::Entities::Pagination
 
   def attributes_for_entity
     {

data/lib/generators/rider_kick/templates/domains/core/entities/entity.rb.tt

@@ -1,17 +1,35 @@
 # frozen_string_literal: true
 
-class Core::Entities::<%=  @subject_class %> < Dry::Struct
-<% (['id'] + @fields + @uploaders + ['created_at', 'updated_at']).each do |field| -%>
-<% column_type = get_column_type(field) -%>
-<% dry_type = @entity_type_mapping[column_type.to_s] || 'Types::Strict::String' -%>
-<% if @uploaders.include?(field) -%>
-<% if is_singular?(field) -%>
-  attribute :<%= field %>, Types::Strict::String
-<% else -%>
-  attribute :<%= field %>, Types::Strict::Array
-<% end -%>
-<% else -%>
-  attribute :<%= field %>, <%= dry_type %>
-<% end -%>
-<% end -%>
+class <%= domain_class_name %>::Entities::<%= @subject_class %> < Dry::Struct
+  transform_keys(&:to_sym)
+
+  # Atribut Wajib (selalu ada)
+  attribute :id, Types::Strict::String
+  <%- @entity_db_fields.reject { |f| f == 'id' }.each do |field| -%>
+  <%-
+    # Dapatkan tipe data dari pemetaan
+    db_type = get_column_type(field).to_s
+    entity_type = @entity_type_mapping[db_type] || 'Types::Strict::String' # Fallback
+    # Cek nullability dari @columns_meta_hash, BUKAN @model_class.columns_hash
+    column_meta = get_column_meta(field) # Menggunakan helper baru
+    is_nullable = column_meta[:null] == true
+
+    # Terapkan .optional jika nullable di DB
+    entity_type += ".optional" if is_nullable
+  -%>
+  attribute :<%= field %>, <%= entity_type %>
+  <%- end -%>
+
+  # Atribut ini diambil dari 'uploaders' di YAML
+  <%- @uploaders.each do |uploader| -%>
+  <%- if uploader.type == 'single' -%>
+  attribute :<%= uploader.name %>_url, Types::Strict::String.optional
+  <%- else -%>
+  attribute :<%= uploader.name %>_urls, Types::Strict::Array.of(Types::Strict::String).optional
+  <%- end -%>
+  <%- end -%>
+
+  # Atribut Opsional (selalu ada)
+  attribute? :created_at, Types::Strict::Time.optional
+  attribute? :updated_at, Types::Strict::Time.optional
 end

data/lib/generators/rider_kick/templates/domains/core/entities/error.rb.tt

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Core::Entities::Error < Dry::Struct
+class <%= domain_class_name %>::Entities::Error < Dry::Struct
   attribute :attribute, Types::Strict::String
   attribute :type, Types::Strict::String
   attribute :options, Types::Hash.optional

data/lib/generators/rider_kick/templates/domains/core/entities/pagination.rb.tt

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Core::Entities::Pagination < Dry::Struct
+class <%= domain_class_name %>::Entities::Pagination < Dry::Struct
   attribute :total_count, Types::Strict::Integer
   attribute :page, Types::Strict::Integer
   attribute :per_page, Types::Strict::Integer