From 0ea212bf65a5bfbacf418e0f69842ae5372ed403 Mon Sep 17 00:00:00 2001
From: Zin Moe <zin.moe@code2lab.com>
Date: Mon, 27 Jan 2020 18:17:13 +0630
Subject: [PATCH] modify app_id generator

---
 .../settings/employees_controller.rb          |  2 +-
 app/models/employee.rb                        |  9 ++++----
 app/models/printer/printer_worker.rb          | 22 +++++++++----------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb
index bcbec6ff..8b057263 100755
--- a/app/controllers/settings/employees_controller.rb
+++ b/app/controllers/settings/employees_controller.rb
@@ -41,7 +41,7 @@ class Settings::EmployeesController < ApplicationController
   end 
 
   def change_app_token
-    @employee.app_token = @employee.generate_app_token #SecureRandom.hex(10)
+    @employee.app_token = @employee.generate_app_token
     @employee.save
     flash[:notice] = 'Auth Token was successfully updated.' 
     redirect_to settings_employee_url(@employee)
diff --git a/app/models/employee.rb b/app/models/employee.rb
index 5532b11d..bd4f9159 100755
--- a/app/models/employee.rb
+++ b/app/models/employee.rb
@@ -12,7 +12,7 @@ class Employee < ApplicationRecord
   validates :emp_id, uniqueness: true, numericality: true, length: {in: 1..4}, allow_blank: true
   validates :password, numericality: true, length: {in: 3..9}, allow_blank: true
 
-  before_create :generate_app_id, :generate_app_token , if: Proc.new { self.role == "application" }
+  before_save :generate_app_id, :generate_app_token , if: Proc.new { self.role == "application" }
   # Employee Image Uploader
   mount_uploader :image_path, EmployeeImageUploader
 
@@ -90,15 +90,14 @@ class Employee < ApplicationRecord
   end
 
   def generate_app_id
-    # return if self.role != 'application'
-    self.app_id = SecureRandom.urlsafe_base64(nil, false)
+    return if self.app_id.present?
+    self.app_id = SecureRandom.hex(8)
   rescue ActiveRecord::RecordNotUnique
     retry
   end
 
   def generate_app_token
-    # return if self.role != 'application'
-    self.app_token = SecureRandom.hex(10)
+    self.app_token = SecureRandom.hex(8)
   rescue ActiveRecord::RecordNotUnique
     retry
   end
diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index 5d7cce22..d30af42d 100755
--- a/app/models/printer/printer_worker.rb
+++ b/app/models/printer/printer_worker.rb
@@ -42,17 +42,17 @@ class Printer::PrinterWorker
   end
 
   def print(file_path, printer_destination = nil )
-    # if printer_destination.nil?
-    #   printer_destination = self.printer_destination
-    # end
+    if printer_destination.nil?
+      printer_destination = self.printer_destination
+    end
 
-    # copy = self.print_copies
-    # #Print only when printer information is not null
-    # if !self.printer_destination.nil?
-    #   (1..copy).each do
-    #     page = Cups::PrintJob.new(file_path, printer_destination)
-    #     page.print
-    #   end
-    # end
+    copy = self.print_copies
+    #Print only when printer information is not null
+    if !self.printer_destination.nil?
+      (1..copy).each do
+        page = Cups::PrintJob.new(file_path, printer_destination)
+        page.print
+      end
+    end
   end
 end