naf 2.0.4 → 2.1.0

data/app/controllers/naf/historical_jobs_controller.rb

@@ -41,23 +41,29 @@ module Naf
     end
 
     def new
+      @historical_job = Naf::HistoricalJob.new
     end
 
     def create
       @historical_job = Naf::HistoricalJob.new(params[:historical_job])
-      if params[:historical_job][:application_id] && app = Naf::Application.find(params[:historical_job][:application_id])
-        if schedule = app.application_schedule
-          @historical_job = Logical::Naf::JobCreator.new.queue_application_schedule(schedule)
+      if params[:historical_job][:application_id] &&
+        app = Naf::Application.find(params[:historical_job][:application_id])
+
+        if schedule = app.application_schedules.first
+          @historical_job = ::Logical::Naf::ConstructionZone::Boss.new.enqueue_application_schedule(schedule)
           if @historical_job.blank?
-            render json: { success: false,
-                           title: ::Naf::Application.find_by_id(params[:historical_job][:application_id]).title }.to_json
+            render json: {
+              success: false,
+              title: ::Naf::Application.find_by_id(params[:historical_job][:application_id]).title
+            }.to_json
 
             return
           end
         else
           @historical_job.command = app.command
           @historical_job.application_type_id = app.application_type_id
-          @historical_job.application_run_group_restriction_id = Naf::ApplicationRunGroupRestriction.no_limit.id
+          @historical_job.application_run_group_restriction_id =
+            Naf::ApplicationRunGroupRestriction.no_limit.id
           @queued_job = ::Naf::QueuedJob.new
         end
       else
@@ -67,7 +73,8 @@ module Naf
       if @queued_job.present?
         @queued_job.application_type_id = @historical_job.application_type_id
         @queued_job.command = @historical_job.command
-        @queued_job.application_run_group_restriction_id = @historical_job.application_run_group_restriction_id
+        @queued_job.application_run_group_restriction_id =
+          @historical_job.application_run_group_restriction_id
         @queued_job.application_run_group_name = @historical_job.application_run_group_name
         @queued_job.application_run_group_limit = @historical_job.application_run_group_limit
         @queued_job.priority = @historical_job.priority
@@ -123,7 +130,10 @@ module Naf
             end
 
             format.html do
-              redirect_to(@historical_job, notice: "Job '#{@historical_job.command}' was successfully updated.")
+              redirect_to(
+                @historical_job,
+                notice: "Job '#{@historical_job.command}' was successfully updated."
+              )
             end
             format.json do
               render json: { success: true,

data/app/helpers/naf/application_helper.rb

@@ -21,7 +21,8 @@ module Naf
     NAF_CREATE_BLOCKED_RESOURCES = []
     NAF_ALL_VISIBLE_RESOURCES = {
                                   'historical_jobs' => '',
-                                  'applications' => '',
+                                  'scripts' => ['applications',
+                                                'application_schedules'],
                                   'machines' => '',
                                   'runners' => ['machine_runners',
                                                 'machine_runner_invocations'],
@@ -39,7 +40,8 @@ module Naf
 
     def naf_last_queued_at_link(app)
       if historical_job = app.last_queued_job
-        link_to "#{time_ago_in_words(historical_job.created_at, true)} ago, #{historical_job.created_at.localtime.strftime("%Y-%m-%d %r")}",
+        link_to "#{time_ago_in_words(historical_job.created_at, true)} ago, " +
+          "#{historical_job.created_at.localtime.strftime("%Y-%m-%d %r")}",
           naf.historical_job_path(historical_job)
       else
         ""
@@ -49,15 +51,22 @@ module Naf
     def naf_highlight_tab?(tab)
       case tab
         when "machines"
-          [tab, "machine_affinity_slots"].include?(controller_name)
+          [tab,
+           "machine_affinity_slots"].include?(controller_name)
         when "runners"
-          ["machine_runners", "machine_runner_invocations"].include?(controller_name)
+          ["machine_runners",
+           "machine_runner_invocations"].include?(controller_name)
         when "historical_jobs"
-          [tab, "historical_job_affinity_tabs"].include?(controller_name)
-        when "applications"
-          [tab, "application_schedule_affinity_tabs"].include?(controller_name)
+          [tab,
+           "historical_job_affinity_tabs"].include?(controller_name)
+        when "scripts"
+          [tab,
+           "applications",
+           "application_schedules",
+           "application_schedule_affinity_tabs"].include?(controller_name)
         when "loggers"
-          ["logger_styles", "logger_names"].include?(controller_name)
+          ["logger_styles",
+           "logger_names"].include?(controller_name)
         when "janitorial_assignments"
           ["Naf::JanitorialArchiveAssignment",
            "Naf::JanitorialCreateAssignment",
@@ -81,10 +90,10 @@ module Naf
             action: 'show',
             id: params[:historical_job_id]
         when "application_schedule_affinity_tabs"
-          link_to "Back to Application",
-            controller: 'applications',
+          link_to "Back to Application Schedule",
+            controller: 'application_schedules',
             action: 'show',
-            id: params[:application_id]
+            id: params[:application_schedule_id]
         when "machine_affinity_slots"
           link_to "Back to Machine",
             controller: 'machines',
@@ -98,7 +107,8 @@ module Naf
     def naf_nested_resource_index?
       ["historical_job_affinity_tabs",
        "application_schedule_affinity_tabs",
-       "machine_affinity_slots"].include?(controller_name) and !params[:id]
+       "machine_affinity_slots",
+       "application_schedules"].include?(controller_name) and !params[:id]
     end
 
     def naf_table_title
@@ -112,8 +122,6 @@ module Naf
         "Jobs"
       else
         case controller_name
-          when "application_schedule_affinity_tabs"
-            Application.find(params[:application_id]).title + ", Affinity Tabs"
           when "machine_affinity_slots"
             machine = Machine.find(params[:machine_id])
             name = machine.server_name
@@ -159,6 +167,8 @@ module Naf
           link_to "Loggers", naf.logger_styles_path
         when "runners"
           link_to "Runners", naf.machine_runners_path
+        when "scripts"
+          link_to "Scripts", naf.applications_path
         when "janitorial_assignments"
           link_to "Janitorial Assignments", naf.janitorial_archive_assignments_path
         when "janitorial_archive_assignments"
@@ -173,9 +183,14 @@ module Naf
     end
 
     def naf_generate_create_link
-      return "" if NAF_READ_ONLY_RESOURCES.include?(controller_name) or NAF_CREATE_BLOCKED_RESOURCES.include?(controller_name)
-      return link_to "Add a Job", naf.new_historical_job_path, { class: 'add_job' } if naf_display_job_search_link?
-      link_to "Create new #{naf_model_name}", { controller: controller_name, action: 'new' }
+      return '' if NAF_READ_ONLY_RESOURCES.include?(controller_name) ||
+        NAF_CREATE_BLOCKED_RESOURCES.include?(controller_name)
+
+      return link_to "Add a Job",
+        naf.new_historical_job_path,
+        { class: 'add_job' } if naf_display_job_search_link?
+
+      return link_to "Create new #{naf_model_name}", { controller: controller_name, action: 'new' }
     end
 
     def naf_display_job_search_link?
@@ -194,18 +209,25 @@ module Naf
 
     def naf_generate_edit_link
       return "" if NAF_READ_ONLY_RESOURCES.include?(controller_name)
-      link_to "Edit", { controller: controller_name, action: 'edit', id: params[:id] }, class: 'edit'
+      link_to "Edit",
+        { controller: controller_name, action: 'edit', id: params[:id] },
+        class: 'edit'
     end
 
     def naf_generate_back_link
-      link_to "Back to #{naf_make_header(controller_name)}", { controller: controller_name, action: 'index' }, class: 'back'
+      link_to "Back to #{naf_make_header(controller_name)}",
+        { controller: controller_name, action: 'index' },
+        class: 'back'
     end
 
     def naf_generate_destroy_link
-      return "" if NAF_READ_ONLY_RESOURCES.include?(controller_name) or NAF_DESTROY_BLOCKED_RESOURCES.include?(controller_name)
+      return '' if NAF_READ_ONLY_RESOURCES.include?(controller_name) ||
+        NAF_DESTROY_BLOCKED_RESOURCES.include?(controller_name)
+
       case controller_name
         when "application_schedule_affinity_tabs"
-          link_to "Destroy", application_application_schedule_application_schedule_affinity_tab_url(@application, @application_schedule, @record),
+          link_to "Destroy",
+            application_schedule_application_schedule_affinity_tab_url(@application_schedule, @record),
             { confirm: "Are you sure you want to destroy this #{naf_model_name}?",
               method: :delete,
               class: 'destroy' }
@@ -231,7 +253,10 @@ module Naf
       fields = f.fields_for(association, new_object, child_index: "new_#{association}") do |builder|
         render(association.to_s, f: builder)
       end
-      link_to_function(name, "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")", id: 'add_prerequisite')
+      link_to_function(
+        name,
+        "add_fields(this, \"#{association}\", \"#{escape_javascript(fields)}\")", id: 'add_prerequisite'
+      )
     end
 
     def add_color(status)

data/app/models/logical/naf/application.rb

@@ -10,23 +10,12 @@ module Logical
                  :title,
                  :short_name,
                  :script_type_name,
-                 :application_run_group_name,
-                 :application_run_group_restriction_name,
-                 :application_run_group_limit,
-                 :enabled,
-                 :enqueue_backlogs,
-                 :run_time,
-                 :affinities,
-                 :prerequisites,
-                 :deleted,
-                 :visible]
+                 :application_schedules,
+                 :deleted]
 
-      FILTER_FIELDS = [:deleted,
-                       :enabled,
-                       :visible]
+      FILTER_FIELDS = [:deleted]
 
       SEARCH_FIELDS = [:title,
-                       :application_run_group_name,
                        :command,
                        :short_name]
 
@@ -35,31 +24,17 @@ module Logical
       end
 
       def self.search(search)
-        application_scope = ::Naf::Application.
-          joins("LEFT JOIN #{::Naf.schema_name}.application_schedules ON #{::Naf.schema_name}.application_schedules.application_id = #{::Naf.schema_name}.applications.id").
-            order("id desc")
+        application_scope = ::Naf::Application.order("id desc")
 
         FILTER_FIELDS.each do |field|
           if search.present? and search[field].present?
-            application_scope =
-            if field == :enabled || field == :visible
-              application_scope.where(application_schedules: { field => search[field] })
-            else
-              application_scope.where(field => search[field])
-            end
+            application_scope = application_scope.where(field => search[field])
           end
         end
 
         SEARCH_FIELDS.each do |field|
           if search.present? and search[field].present?
-            application_scope =
-            if field == :application_run_group_name
-              application_scope.where(
-                ["lower(#{::Naf.schema_name}.application_schedules.application_run_group_name) ~ ?", Regexp.escape(search[field].downcase)]
-              )
-            else
-              application_scope.where(["lower(#{field}) ~ ?", Regexp.escape(search[field].downcase)])
-            end
+            application_scope = application_scope.where(["lower(#{field}) ~ ?", Regexp.escape(search[field].downcase)])
           end
         end
 
@@ -74,103 +49,11 @@ module Logical
         @app.command
       end
 
-      def run_start_minute
-        output = ""
-        if schedule = @app.application_schedule and schedule.run_start_minute.present?
-          minutes = schedule.run_start_minute % 60
-          hours =   schedule.run_start_minute / 60
-          output << hours.to_s + ":"
-          output << "%02d" % minutes
-          output = Time.parse(output).strftime("%I:%M %p")
-        end
-
-        return output
-      end
-
-      def run_time
-        run_time = run_start_minute.blank? ? run_interval : run_start_minute
-        run_time = "not scheduled" if run_time.blank?
-
-        run_time
-      end
-
-      def run_interval
-        output = ""
-        if schedule = @app.application_schedule and schedule.run_interval.present?
-          time = schedule.run_interval
-          output =
-          if time == 0
-            "run constantly"
-          elsif time < 60
-            pluralize(time, "minute")
-          elsif time % 60 == 0
-            pluralize(time / 60, "hour")
-          else
-            pluralize(time / 60, "hour") + ', ' + pluralize(time % 60, "minute")
-          end
-        end
-
-        output
-      end
-
-      def prerequisites
-        if schedule = @app.application_schedule and schedule.application_schedule_prerequisites.present?
-          schedule.prerequisites.map do |schedule_prerequisite|
-            schedule_prerequisite.application.short_name_if_it_exist
-          end.join(", \n")
-        end
-      end
-
-      def application_run_group_name
-        if schedule = @app.application_schedule
-          if schedule.application_run_group_name.blank?
-            "not set"
-          else
-            schedule.application_run_group_name
-          end
-        end
-      end
-
       def method_missing(method_name, *arguments, &block)
-        case method_name
-        when :application_run_group_restriction_name,
-             :application_run_group_name,
-             :run_start_minute,
-             :priority,
-             :application_run_group_limit,
-             :visible,
-             :enabled
-          if schedule = @app.application_schedule
-            schedule.send(method_name, *arguments, &block)
-          else
-            nil
-          end
+        if @app.respond_to?(method_name)
+          @app.send(method_name, *arguments, &block)
         else
-          if @app.respond_to?(method_name)
-            @app.send(method_name, *arguments, &block)
-          else
-            super
-          end
-        end
-      end
-
-      def enqueue_backlogs
-        application_schedule.try(:enqueue_backlogs)
-      end
-
-      def affinities
-        if @app.application_schedule.try(:application_schedule_affinity_tabs).present?
-          @app.application_schedule.application_schedule_affinity_tabs.map do |tab|
-            if tab.affinity_short_name.present?
-              if tab.affinity_parameter.present? && tab.affinity_parameter > 0
-                tab.affinity_short_name + "(#{tab.affinity_parameter})"
-              else
-                tab.affinity_short_name
-              end
-            else
-              tab.affinity_classification_name + '_' + tab.affinity_name
-            end
-          end.join(", \n")
+          super
         end
       end
 

data/app/models/logical/naf/application_schedule.rb

@@ -0,0 +1,186 @@
+module Logical
+  module Naf
+    class ApplicationSchedule
+
+      attr_reader :schedule
+
+      include ActionView::Helpers::TextHelper
+
+      COLUMNS = [:id,
+                 :application,
+                 :application_run_group_name,
+                 :application_run_group_restriction_name,
+                 :run_interval_style,
+                 :run_interval,
+                 :application_run_group_quantum,
+                 :application_run_group_limit,
+                 :enqueue_backlogs,
+                 :affinities,
+                 :prerequisites,
+                 :enabled,
+                 :visible]
+
+      # Mapping of datatable column positions and job attributes
+      ORDER = { '0' => "id",
+                '1' => "application_id",
+                '2' => "application_run_group_name",
+                '3' => "application_run_group_restriction_id",
+                '4' => "run_interval_style_id",
+                '5' => "run_interval",
+                '6' => "application_run_group_quantum",
+                '7' => "application_run_group_limit",
+                '8' => "enqueue_backlogs" }
+
+      def initialize(naf_schedule)
+        @schedule = naf_schedule
+      end
+
+      def self.search(search)
+        direction = search['sSortDir_0']
+        order = ORDER[search['iSortCol_0']]
+        ::Naf::ApplicationSchedule.
+          order("#{order} #{direction}").
+          all.map{ |physical_app_schedule| new(physical_app_schedule) }
+      end
+
+      def to_hash
+        Hash[ COLUMNS.map{ |m| [m, send(m)] } ]
+      end
+
+      def run_interval_style
+        schedule.run_interval_style.name
+      end
+
+      def affinities
+        output = ''
+        if schedule.try(:application_schedule_affinity_tabs).present?
+          output = schedule.application_schedule_affinity_tabs.map do |tab|
+            if tab.affinity_short_name.present?
+              if tab.affinity_parameter.present? && tab.affinity_parameter > 0
+                tab.affinity_short_name + "(#{tab.affinity_parameter})"
+              else
+                tab.affinity_short_name
+              end
+            else
+              tab.affinity_classification_name + '_' + tab.affinity_name
+            end
+          end.join(", \n")
+        end
+
+        return output
+      end
+
+      def prerequisites
+        if schedule.try(:application_schedule_prerequisites).present?
+          schedule.prerequisites.map do |schedule_prerequisite|
+            schedule_prerequisite.application.short_name_if_it_exist
+          end.join(", \n")
+        end
+      end
+
+      def display
+        output = ''
+
+        name = schedule.run_interval_style.name
+        if name == 'at beginning of day'
+          output << "daily(#{run_interval})"
+        elsif name == 'at beginning of hour'
+          output << "hourly(#{run_interval})"
+        elsif name == 'after previous run'
+          output << "run(#{run_interval})"
+        elsif name == 'keep running'
+          output << 'always'
+        end
+
+        if schedule.application_run_group_quantum.present?
+          output << "-#{schedule.application_run_group_quantum}"
+        else
+          output << "-1"
+        end
+        if schedule.application_run_group_limit.present?
+          output << "/#{schedule.application_run_group_limit}"
+        end
+
+        output
+      end
+
+      def help_title
+        output = 'Run this application '
+
+        name = schedule.run_interval_style.name
+        if name == 'at beginning of day'
+          output << "every day at #{run_interval}. "
+        elsif name == 'at beginning of hour'
+          output << "after #{schedule.run_interval} minute(s) of every hour. "
+        elsif name == 'after previous run'
+          output << "every #{schedule.run_interval} minute(s). "
+        elsif name == 'keep running'
+          output << 'constantly. '
+        end
+
+        output << "This schedule will queue #{schedule.application_run_group_quantum} job(s), and "
+        output << "will not queue more than the group's limit of #{schedule.application_run_group_limit} job(s)."
+
+        output
+      end
+
+      def run_interval
+        output = ''
+        time = schedule.run_interval
+        if schedule.run_interval_style.name == 'at beginning of day'
+          output = exact_time_of_day(time)
+        else
+          output = interval_time2(time)
+        end
+
+        output
+      end
+
+      def exact_time_of_day(time)
+        output = ''
+        minutes = schedule.run_interval % 60
+        hours =   schedule.run_interval / 60
+        output << hours.to_s + ':'
+        output << '%02d' % minutes
+        output = Time.parse(output).strftime('%I:%M %p')
+
+        return output
+      end
+
+      def interval_time2(time)
+        if time < 9
+          ":0#{time}"
+        else
+          ":#{time}"
+        end
+      end
+
+      def interval_time(time)
+        if time < 60
+          pluralize(time, 'minute')
+        elsif time % 60 == 0
+          pluralize(time / 60, 'hour')
+        else
+          pluralize(time / 60, 'hour') + ', ' + pluralize(time % 60, 'minute')
+        end
+      end
+
+      def application_run_group_name
+        if schedule.application_run_group_name.present?
+          schedule.application_run_group_name
+        else
+          'not set'
+        end
+      end
+
+      def method_missing(method_name, *arguments, &block)
+        if @schedule.respond_to?(method_name)
+          @schedule.send(method_name, *arguments, &block)
+        else
+          super
+        end
+      end
+
+    end
+  end
+end