abizvn-cms 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba582710db4f69bcd4763391b110d3fe1475dc186d6af48bc0a264b3670808e
-  data.tar.gz: de72b53fc5d6b651d1f00b4494a58652db9cfbe6c3f163ebf3e8be7079a07709
+  metadata.gz: 6c689fc2686c612d20f01b31437aaf1ad3abc02a7d0f8bfc2b204014e00a2d51
+  data.tar.gz: fd1d98a454e3f95672905fd81912bf0518468b0295577927a4cc43bd58baae6a
 SHA512:
-  metadata.gz: 8c366eb41c5eed5dad90ce1045a0bfca578e374b3cc0800f1c2e555d0b525e808aeaf1bebf72bad111a148cbea8604a1763546c2092c196a212e0b4ecec9b275
-  data.tar.gz: 2b4c819554f7420a9f45f35a34a71884fa020078c98a8268e355e0ab8e37a0dc54fc1f8fd1f7680b0eff00ebba5251620014f0ed4b7f001b2681bd68cfe004dd
+  metadata.gz: 5390b9b6533ca97f07686e6d7fc4ff53db816139f18ed7a55d4de26f5bedd3ad2a6d2472d15612f838a28de3bd9502c2ed261a4fcf89a06dc551cfaef1818e13
+  data.tar.gz: 40d48576996fc044850a44457e64aa558e1761e0a4f1e22085e2f495d91bd8ee27aa66c0c3ca7b6329eecf657e97c200c1288d5950be98a65b1ef0e61bb9a198

data/app/models/abizvn/cms/article.rb

@@ -9,7 +9,7 @@ module Abizvn
       scope :ordered, -> { order(updated_at: :desc) }
 
       belongs_to :status, class_name: 'Abizvn::General::GeneralSetting'
-      belongs_to :category, class_name: 'Category', counter_cache: true
+      belongs_to :category, class_name: Abizvn::Cms.category_class, counter_cache: true
 
       has_many :comments, as: :commentable, dependent: :destroy
 

data/app/models/abizvn/cms/category.rb

@@ -5,9 +5,11 @@ module Abizvn
     
       self.table_name = 'cms_categories'
 
-      belongs_to :general, class_name: 'Abizvn::General::GeneralSetting'
-
+      belongs_to :status, class_name: 'Abizvn::General::GeneralSetting'
+      
       has_many :articles, foreign_key: :category_id
+
+      validates :status, :code, :name, presence: true
     end
   end
 end

data/app/serializers/abizvn/cms/category_lite_serializer.rb

@@ -3,15 +3,7 @@ module Abizvn
     class CategoryLiteSerializer
       include JSONAPI::Serializer
 
-      attributes :id
-
-      attribute :code do |entity|
-        entity.general.code
-      end
-
-      attribute :value do |entity|
-        entity.general.value
-      end
+      attributes :id, :code, :name, :updated_at
     end
   end
 end

data/app/services/abizvn/cms/cms_service.rb

@@ -0,0 +1,49 @@
+module Abizvn
+  module Cms
+    class CmsService
+      STATUS_PUBLIC = 'public'.freeze
+      
+      STATUS_TABLE_NAME = GeneralSetting.table_name
+      ARTICLE_TABLE_NAME = Article.table_name
+  
+      def self.get_articles_by_status(status_codes, filter_options)
+        category_id = filter_options[:category_id]
+        article_id = filter_options[:article_id]
+    
+        query = Article.joins(:status).where("#{STATUS_TABLE_NAME}.code": status_codes).ordered
+        
+        if category_id.present?
+          query = query.where(category_id: category_id)
+        elsif article_id.present?
+          query = query.where(category_id: Article.select(:category_id).where(slug: article_id))
+        end
+    
+        return query
+      end
+    
+      def self.find_article(id, status_code)
+        Article.joins(:status, :category).includes(:category).where("#{STATUS_TABLE_NAME}.code": status_code).friendly.find(id)
+      end
+
+      def self.get_categories_with_latest_articles(category_tag = nil, nb_articles = 5)
+        subquery = Article.joins(:status, :category)
+                    .select("#{ARTICLE_TABLE_NAME}.*, ROW_NUMBER() OVER (PARTITION BY category_id ORDER BY #{ARTICLE_TABLE_NAME}.updated_at DESC) as row_num")
+                    .where("#{STATUS_TABLE_NAME}.code": STATUS_PUBLIC)
+                    .to_sql
+    
+        articles = Article.select('*')
+                    .from("(#{subquery}) as articles_with_row_numbers")
+                    .where('row_num <= ?', nb_articles)
+                    .includes(:category)
+
+        if category_tag.present?
+          articles = articles.where("#{Category.table_name}.tag": category_tag)
+        end
+    
+        categories = articles.map(&:category).uniq.sort { |c| c.order }
+        
+        return [categories, articles]
+      end
+    end
+  end
+end

data/db/migrate/20250426050330_update_category_remove_general.rb

@@ -0,0 +1,22 @@
+class UpdateCategoryRemoveGeneral < ActiveRecord::Migration[7.2]
+  def change
+    change_table :cms_categories do |t|
+      t.string :code
+      t.string :name
+      t.references :status, foreign_key: { to_table: :general_settings }, index: true
+    end
+
+    execute <<-SQL
+      UPDATE cms_categories
+      SET code = gs.code,
+          name = gs.value
+      FROM general_settings gs
+      WHERE cms_categories.general_id = gs.id
+    SQL
+    
+    change_column_null :cms_categories, :code, false
+    change_column_null :cms_categories, :name, false
+
+    remove_reference :cms_categories, :general, index: true, foreign_key: { to_table: :general_settings }
+  end
+end

data/db/migrate/20250427041233_add_order_to_category.rb

@@ -0,0 +1,5 @@
+class AddOrderToCategory < ActiveRecord::Migration[7.2]
+  def change
+    add_column :cms_categories, :order, :integer, default: 0, null: false
+  end
+end

data/lib/abizvn/cms/version.rb

@@ -1,5 +1,5 @@
-module Abizvn
-  module Cms
-    VERSION = "0.1.2"
-  end
-end
+module Abizvn
+  module Cms
+    VERSION = "0.2.1"
+  end
+end

data/lib/abizvn/cms.rb

@@ -1,8 +1,12 @@
-require "abizvn/cms/version"
-require "abizvn/cms/engine"
-
-module Abizvn
-  module Cms
-    # Your code goes here...
-  end
-end
+require "abizvn/cms/version"
+require "abizvn/cms/engine"
+
+module Abizvn
+  module Cms
+    mattr_accessor :category_class
+
+    def self.category_class
+      @@category_class ||= "Category"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abizvn-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Juan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -173,12 +173,15 @@ files:
 - app/serializers/abizvn/cms/article_serializer.rb
 - app/serializers/abizvn/cms/category_articles_serializer.rb
 - app/serializers/abizvn/cms/category_lite_serializer.rb
+- app/services/abizvn/cms/cms_service.rb
 - app/views/layouts/abizvn/cms/application.html.erb
 - config/routes.rb
 - db/migrate/20250117094449_create_category.rb
 - db/migrate/20250117094450_create_articles.rb
 - db/migrate/20250119070204_add_articles_count_to_category.rb
 - db/migrate/20250301063841_add_slug_to_articles.rb
+- db/migrate/20250426050330_update_category_remove_general.rb
+- db/migrate/20250427041233_add_order_to_category.rb
 - lib/abizvn/cms.rb
 - lib/abizvn/cms/engine.rb
 - lib/abizvn/cms/version.rb