sequence_generator 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e55f6f57bd7c3014db8e95c9e66ae667fdecf7d8e3d77c51232c11032d8a9f90
-  data.tar.gz: d75a36677cbd8afb30c97ed4a889952185c6d9f0e02f1b6679087f33fb4aeb65
+  metadata.gz: 730320846bf82a04b0f08f199803de03fd0f1037e859d2236b389e460d6bca4f
+  data.tar.gz: 94ec5407c51a8e6a6d587c8baf07d05d1a6dd5d10fe8ea6195b9974914d4d195
 SHA512:
-  metadata.gz: bd12d1e96af4563be08389f825316003c7156f9fbc78e84dde916459f04287b8649d04ad9ee350735bc12bc1e728e3deeadbfd467141711e5819f3119f4aa002
-  data.tar.gz: cbeeceb4256a02b81971a6c125e6e9e1f223f92686500a44c34c6ed50c056f7135ead5339569d02ead08177a3ae5acf86dc9e699aa407ebd99b85fb6a972f9e8
+  metadata.gz: 8836008c72b37abacd8ec7e838209a9c19db6839afb14be383b6bfd354a580e2893160b51154bda187f238726db06468d876d29bf220fc781bcc5d39d4319851
+  data.tar.gz: '035679a3abd92ba4e19ec0117a54063ec1f4177eede9e4a952feaa7d7d36d8e30e5bf33b25161c2dc9f8349b65b842c99842a09ba32733e3e82d33e101cdec1c'

data/app/controllers/sequence_generator/sequences_controller.rb

@@ -25,10 +25,10 @@ module SequenceGenerator
       end
     end
 
-    def fetch
+    def index
       sequences = Sequence.where(scope: params[:branch_id], purpose: params[:purpose])
       if sequences.present?
-        render json: sequences, root: sequences, status: :ok
+        render json: sequences, each_erializer: SequenceSerializer, root: false, status: :ok
       else
         api_error(status: :unprocessable_entity,
                   message: 'Sequences Not found'
@@ -36,51 +36,6 @@ module SequenceGenerator
       end
     end
 
-    def index
-        sequence = Sequence.where(purpose: params[:purpose], scope: params[:scope])
-                           .where('valid_from <= ? AND valid_till >= ?', Time.now, Time.now).first
-        if sequence
-          sequence_number = sequence.generate_sequence_number
-          render json: { sequence_number: sequence_number, purpose: params[:purpose],
-                         scope: params[:scope] }, status: :ok
-        else
-          original_sequence = Sequence.where(purpose: params[:purpose], scope: params[:scope]).last
-          if original_sequence.nil?
-            api_error(status: :unprocessable_entity,
-                      message: 'Sequence is not Created')
-          else
-            valid_from = original_sequence.valid_from
-            valid_till = original_sequence.valid_till
-            new_start_at = original_sequence.sequential_id
-            difference = (valid_till - valid_from).to_i
-            new_valid_from = Date.today
-            new_valid_till = new_valid_from + difference
-            if original_sequence.reset_from_next_year
-              sequence = Sequence.create!(original_sequence.as_json.except('id', 'start_at',
-                                                                           'valid_from', 'valid_till',
-                                                                           'sequential_id',
-                                                                           'created_at', 'updated_at')
-                                              .merge!(start_at: 1,
-                                                      valid_from: new_valid_from,
-                                                      valid_till: new_valid_till,
-                                                      sequential_id: 0))
-            else
-              sequence = Sequence.create!(original_sequence.as_json.except('id', 'start_at',
-                                                                           'valid_from', 'valid_till',
-                                                                           'sequential_id',
-                                                                           'created_at', 'updated_at')
-                                              .merge!(start_at: new_start_at,
-                                                      valid_from: new_valid_from,
-                                                      valid_till: new_valid_till,
-                                                      sequential_id: new_start_at))
-            end
-            sequence_number = sequence.generate_sequence_number
-            render json: { sequence_number: sequence_number, purpose: params[:purpose],
-                           scope: params[:scope] }, status: :ok
-          end
-        end
-    end
-
     private
 
     def transactions_filter

data/app/models/concerns/act_as_sequenced.rb

@@ -48,7 +48,11 @@ module SequenceGenerator
 
           if self.sequence_generator_id.present?
             sequence = Sequence.find(sequence_generator_id)
-            assign_attributes(options[:column]=> sequence.generate_sequence_number)
+            if sequence.scope.to_s == send(options[:scope]).to_s
+              assign_attributes(options[:column]=> sequence.generate_sequence_number)
+            else
+              errors.add(:sequential_id, 'Sequence is not associated with your branch')
+            end
           else
             sequence = Sequence.where(purpose: options[:purpose], scope: send(options[:scope]))
                            .where('valid_from <= ? AND valid_till >= ?', Time.now, Time.now).first

data/config/initializers/active_model_serializers.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+ActiveModel::Serializer.config.adapter = :attributes
+ActiveModelSerializers.config.default_includes = '**'

data/config/routes.rb

@@ -1,5 +1,4 @@
 SequenceGenerator::Engine.routes.draw do
-  resources :sequences do
-    get '/fetch', to: 'sequences#fetch'
-  end
+  resources :sequences
+  # get '/sequences/fetch', to: 'sequences#fetch', controller: 'sequences'
 end

data/lib/sequence_generator/version.rb

@@ -1,3 +1,3 @@
 module SequenceGenerator
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequence_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - vimox-shah
@@ -146,6 +146,7 @@ files:
 - app/serailizers/sequence_generator/base_serializer.rb
 - app/serailizers/sequence_generator/sequence_serializer.rb
 - app/views/layouts/sequence_generator/application.html.erb
+- config/initializers/active_model_serializers.rb
 - config/initializers/cors.rb
 - config/routes.rb
 - db/migrate/20180330090901_create_sequence_generator_sequences.rb