sis_core 1.0.4 → 1.0.9

data/app/uploaders/sis/core/photo_uploader.rb

@@ -0,0 +1,51 @@
+module Sis
+  module Core
+    class PhotoUploader < CarrierWave::Uploader::Base
+      # Include RMagick or MiniMagick support:
+      # include CarrierWave::RMagick
+      # include CarrierWave::MiniMagick
+
+      # Choose what kind of storage to use for this uploader:
+      storage :file
+      # storage :fog
+
+      # Override the directory where uploaded files will be stored.
+      # This is a sensible default for uploaders that are meant to be mounted:
+      def store_dir
+        "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      end
+
+      # Provide a default URL as a default if there hasn't been a file uploaded:
+      # def default_url(*args)
+      #   # For Rails 3.1+ asset pipeline compatibility:
+      #   # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+      #
+      #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+      # end
+
+      # Process files as they are uploaded:
+      # process scale: [200, 300]
+      #
+      # def scale(width, height)
+      #   # do something
+      # end
+
+      # Create different versions of your uploaded files:
+      # version :thumb do
+      #   process resize_to_fit: [50, 50]
+      # end
+
+      # Add a white list of extensions which are allowed to be uploaded.
+      # For images you might use something like this:
+      def extension_whitelist
+        %w[jpg jpeg gif png]
+      end
+
+      # Override the filename of the uploaded files:
+      # Avoid using model.id or version_name here, see uploader/store.rb for details.
+      # def filename
+      #   "something.jpg" if original_filename
+      # end
+    end
+  end
+end

data/config/routes.rb

@@ -1,2 +1,8 @@
 Sis::Core::Engine.routes.draw do
+  resources :users, only: [:create]
+  post '/login', controller: :users, action: :login
+  get '/menus', controller: :menus, action: :menu
+  post '/sign_in', controller: :users, action: :sign_in
+  post '/generate_recovery_token', controller: :users, action: :generate_recovery_token
+  post '/reset_password', controller: :users, action: :reset_password
 end

data/db/migrate/20200106133937_create_sis_core_applicants.rb

@@ -1,9 +1,23 @@
 class CreateSisCoreApplicants < ActiveRecord::Migration[6.0]
   def change
     create_table :sis_core_applicants do |t|
-      t.string :full_name, null: false
-      t.string :email, null: false, unique: true
-      t.string :phone_number, null: false
+      t.string :first_name, null: false
+      t.string :middle_name, null: false
+      t.string :last_name, null: false
+      t.string :password_digest, null: false
+      t.string :email, null: false
+      t.string :alternative_email_address
+      t.string :primary_phone_number
+      t.string :alternative_telephone_number
+      t.date :date_of_birth
+      t.string :gender
+      t.string :nationality
+      t.string :address
+      t.string :photo
+      t.string :reset_password_token
+      t.datetime :reset_password_sent_at
+      t.string :secret_question
+      t.string :secret_question_answer
 
       t.timestamps
     end

data/db/migrate/20200107094449_create_sis_core_applications.rb

@@ -1,14 +1,8 @@
 class CreateSisCoreApplications < ActiveRecord::Migration[6.0]
   def change
     create_table :sis_core_applications do |t|
-      t.string :full_name, null: false
-      t.string :email, null: false
-      t.integer :age, null: false
-      t.string :gender, null: false
-      t.string :nationality, null: false
       t.string :status, null: false, default: 'Draft'
       t.boolean :payment_made, null: false, default: false
-      t.string :address
       t.string :payment_information
       t.date :application_date
       t.references :applicant,
@@ -19,6 +13,10 @@ class CreateSisCoreApplications < ActiveRecord::Migration[6.0]
                    null: false,
                    index: { name: 'applications_on_ap_indx' },
                    foreign_key: { to_table: :sis_core_academic_programmes }
+      t.references :application_setup,
+                   null: false,
+                   index: { name: 'application_setup_on_ap_indx' },
+                   foreign_key: { to_table: :sis_core_application_setups }
 
       t.timestamps
     end

data/db/migrate/20200107101638_create_sis_core_application_documents.rb

@@ -1,7 +1,7 @@
 class CreateSisCoreApplicationDocuments < ActiveRecord::Migration[6.0]
   def change
     create_table :sis_core_application_documents do |t|
-      t.string :document, null: false
+      t.string :document
       t.references :document_requirement,
                    null: false,
                    index: { name: 'ad_on_adr_indx' },

data/db/migrate/20200507114003_create_sis_core_users.rb

@@ -0,0 +1,17 @@
+class CreateSisCoreUsers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_users do |t|
+      t.string :first_name, null: false
+      t.string :last_name, null: false
+      t.string :email, null: false
+      t.boolean :active, default: true
+      t.string :password_digest, null: false
+      t.string :reset_password_token
+      t.datetime :reset_password_sent_at
+      t.string :secret_question
+      t.string :secret_question_answer
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200511165121_create_sis_core_application_modules.rb

@@ -0,0 +1,15 @@
+class CreateSisCoreApplicationModules < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_application_modules do |t|
+      t.string :code, null: false
+      t.string :name, null: false
+
+      t.timestamps
+    end
+
+    create_table :sis_core_application_modules_users, id: false do |t|
+      t.belongs_to :application_module, index: { name: 'app_module_on_app_modules_usr_indx' }
+      t.belongs_to :user, index: { name: 'usr_on_app_modules_usr_indx' }
+    end
+  end
+end

data/db/migrate/20200511165241_create_sis_core_user_roles.rb

@@ -0,0 +1,15 @@
+class CreateSisCoreUserRoles < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_user_roles do |t|
+      t.string :name, null: false
+      t.references :application_module, index: { name: 'app_module_on_usr_role_indx' }
+
+      t.timestamps
+    end
+
+    create_table :sis_core_user_roles_users, id: false do |t|
+      t.belongs_to :user, index: { name: 'usr_on_usr_role_usrs_indx' }
+      t.belongs_to :user_role, index: { name: 'usr_role_on_usr_role_usrs_indx' }
+    end
+  end
+end

data/db/migrate/20200511165450_create_sis_core_menus.rb

@@ -0,0 +1,18 @@
+class CreateSisCoreMenus < ActiveRecord::Migration[6.0]
+  def change
+    create_table :sis_core_menus do |t|
+      t.string :text, null: false
+      t.string :icon_cls
+      t.string :location
+      t.integer :parent_id
+      t.references :application_module, index: { name: 'app_module_on_menus_indx' }
+
+      t.timestamps
+    end
+
+    create_table :sis_core_menus_user_roles, id: false do |t|
+      t.belongs_to :menu, index: { name: 'menu_on_menus_usr_role_indx' }
+      t.belongs_to :user_role, index: { name: 'usr_role_on_menus_usr_role_indx' }
+    end
+  end
+end

data/lib/authorize_request.rb

@@ -0,0 +1,18 @@
+class AuthorizeRequest
+  class << self
+    def user(headers)
+      @user ||= User.find(decoded_auth_token(headers)[:id]) if decoded_auth_token(headers)
+      @user || nil
+    end
+
+    def decoded_auth_token(headers)
+      @decoded_auth_token ||= JsonWebToken.decode(http_auth_header(headers)) if http_auth_header(headers)
+    end
+
+    def http_auth_header(headers)
+      return headers['Authorization'].split(' ').last if headers['Authorization'].present?
+
+      nil
+    end
+  end
+end

data/lib/json_web_token.rb

@@ -0,0 +1,12 @@
+class JsonWebToken
+  class << self
+    def encode(payload)
+      JWT.encode(payload, Rails.application.secrets.secret_key_base)
+    end
+
+    def decode(token)
+      body = JWT.decode(token, Rails.application.secrets.secret_key_base)[0]
+      HashWithIndifferentAccess.new body
+    end
+  end
+end

data/lib/sis/core/engine.rb

@@ -4,6 +4,8 @@ module Sis
       isolate_namespace Sis::Core
 
       config.generators.api_only = true
+      config.eager_load_paths << Sis::Core::Engine.root.join('lib')
+      config.autoload_paths << Sis::Core::Engine.root.join('lib')
 
       config.generators do |g|
         g.test_framework :rspec

data/lib/sis/core/version.rb

@@ -1,5 +1,5 @@
 module Sis
   module Core
-    VERSION = '1.0.4'.freeze
+    VERSION = '1.0.9'.freeze
   end
 end

data/lib/sis_core.rb

@@ -1,5 +1,7 @@
 require 'sis/core'
 require 'sis/core/engine'
-require 'devise_token_auth'
+require 'jwt'
+require 'bcrypt'
 require 'aasm'
-require 'active_model_serializers'
+require 'active_model_serializers'
+require 'carrierwave'

data/spec/factories/sis/core/academic_years.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :academic_year, class: Sis::Core::AcademicYear do
-    year { '2000/01' }
+    year { FFaker::Name.name }
     label { 'Academic year of 2000/01' }
   end
 end

data/spec/factories/sis/core/applicants.rb

@@ -1,7 +1,16 @@
 FactoryBot.define do
   factory :applicant, class: Sis::Core::Applicant do
-    full_name { FFaker::Name.name }
+    first_name { FFaker::Name.name }
+    middle_name { FFaker::Name.name }
+    last_name { FFaker::Name.name }
+    password { FFaker::Name.name }
     email { FFaker::Internet.email }
-    phone_number { FFaker::PhoneNumber.phone_number }
+    primary_phone_number { FFaker::PhoneNumber.phone_number }
+    alternative_telephone_number { FFaker::PhoneNumber.phone_number }
+    date_of_birth { '2000-10-05' }
+    gender { FFaker::Gender.binary }
+    nationality { FFaker::Name.name }
+    address { FFaker::Address.city }
+    photo { FFaker::Name.name }
   end
 end

data/spec/factories/sis/core/application_modules.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :application_module, class: Sis::Core::ApplicationModule do
+    code { FFaker::Name.unique.name }
+    name { FFaker::Name.name }
+  end
+end

data/spec/factories/sis/core/applications.rb

@@ -1,16 +1,11 @@
 FactoryBot.define do
   factory :application, class: Sis::Core::Application do
-    full_name { FFaker::Name.name }
-    email { FFaker::Internet.email }
-    age { FFaker::Random.rand(20..30) }
-    gender { Sis::Core::Application::MALE }
-    nationality { FFaker::Address.country }
     status { :draft }
     payment_made { false }
     payment_information { nil }
-    address { FFaker::Address.street_address }
     application_date { Date.today }
     association :applicant
     association :academic_programme
+    association :application_setup
   end
 end

data/spec/factories/sis/core/menus.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :menu, class: Sis::Core::Menu do
+    text { FFaker::Name.name }
+    icon_cls { 'xf001' }
+    location { '/programme' }
+    parent_id { nil }
+    association :application_module
+  end
+end

data/spec/factories/sis/core/programme_levels.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
   factory :programme_level, class: Sis::Core::ProgrammeLevel, parent: :lookup do
-    type { 'Ecom::Core::ProgrammeLevel' }
+    type { 'Sis::Core::ProgrammeLevel' }
   end
 end

data/spec/factories/sis/core/user_roles.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :user_role, class: Sis::Core::UserRole do
+    name { FFaker::Name.name }
+    association :application_module
+  end
+end

data/spec/factories/sis/core/users.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :user, class: Sis::Core::User do
+    first_name { FFaker::Name.name }
+    last_name { FFaker::Name.name }
+    email { FFaker::Internet.email }
+    active { false }
+    password { FFaker::Name.name }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sis_core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -39,7 +39,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: devise_token_auth
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave-base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.2.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -143,19 +199,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: An engine which contains the core of the student information system app
   as a layer.
 email:
@@ -168,11 +230,14 @@ files:
 - README.md
 - Rakefile
 - app/controllers/sis/core/application_controller.rb
+- app/controllers/sis/core/menus_controller.rb
+- app/controllers/sis/core/users_controller.rb
 - app/models/sis/core/academic_programme.rb
 - app/models/sis/core/academic_year.rb
 - app/models/sis/core/applicant.rb
 - app/models/sis/core/application.rb
 - app/models/sis/core/application_document.rb
+- app/models/sis/core/application_module.rb
 - app/models/sis/core/application_record.rb
 - app/models/sis/core/application_setup.rb
 - app/models/sis/core/course.rb
@@ -186,15 +251,18 @@ files:
 - app/models/sis/core/instructor.rb
 - app/models/sis/core/instructor_course.rb
 - app/models/sis/core/lookup.rb
+- app/models/sis/core/menu.rb
 - app/models/sis/core/programme.rb
 - app/models/sis/core/programme_level.rb
 - app/models/sis/core/programme_type.rb
 - app/models/sis/core/semester.rb
-- app/models/sis/core/staff.rb
 - app/models/sis/core/student.rb
-- app/models/user.rb
+- app/models/sis/core/user.rb
+- app/models/sis/core/user_role.rb
+- app/services/sis/core/user_service.rb
+- app/uploaders/sis/core/application_document_uploader.rb
+- app/uploaders/sis/core/photo_uploader.rb
 - config/database.ci.yml
-- config/initializers/devise_token_auth.rb
 - config/routes.rb
 - db/migrate/20200105061717_create_sis_core_lookups.rb
 - db/migrate/20200105072142_create_sis_core_academic_years.rb
@@ -209,14 +277,17 @@ files:
 - db/migrate/20200107302251_create_sis_core_exam_setups.rb
 - db/migrate/20200107333411_create_sis_core_exams.rb
 - db/migrate/20200107434658_create_sis_core_exam_results.rb
-- db/migrate/20200108092202_devise_token_auth_create_users.rb
 - db/migrate/20200307033100_create_sis_core_courses.rb
 - db/migrate/20200307071511_create_sis_core_instructors.rb
 - db/migrate/20200307071736_create_sis_core_instructor_courses.rb
 - db/migrate/20200307072006_create_sis_core_students.rb
 - db/migrate/20200307072317_create_sis_core_course_registrations.rb
-- db/migrate/20200316120805_create_sis_core_staffs.rb
-- db/migrate/20200319074334_modify_user.rb
+- db/migrate/20200507114003_create_sis_core_users.rb
+- db/migrate/20200511165121_create_sis_core_application_modules.rb
+- db/migrate/20200511165241_create_sis_core_user_roles.rb
+- db/migrate/20200511165450_create_sis_core_menus.rb
+- lib/authorize_request.rb
+- lib/json_web_token.rb
 - lib/sis/core.rb
 - lib/sis/core/engine.rb
 - lib/sis/core/version.rb
@@ -226,6 +297,7 @@ files:
 - spec/factories/sis/core/academic_years.rb
 - spec/factories/sis/core/applicants.rb
 - spec/factories/sis/core/application_documents.rb
+- spec/factories/sis/core/application_modules.rb
 - spec/factories/sis/core/application_setups.rb
 - spec/factories/sis/core/applications.rb
 - spec/factories/sis/core/course_registrations.rb
@@ -238,13 +310,14 @@ files:
 - spec/factories/sis/core/instructor_courses.rb
 - spec/factories/sis/core/instructors.rb
 - spec/factories/sis/core/lookups.rb
+- spec/factories/sis/core/menus.rb
 - spec/factories/sis/core/programme_levels.rb
 - spec/factories/sis/core/programme_types.rb
 - spec/factories/sis/core/programmes.rb
 - spec/factories/sis/core/semesters.rb
-- spec/factories/sis/core/staffs.rb
 - spec/factories/sis/core/students.rb
-- spec/factories/users.rb
+- spec/factories/sis/core/user_roles.rb
+- spec/factories/sis/core/users.rb
 homepage: http://www.mks.com.et
 licenses:
 - MIT