truenorth 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77aa3d893615956dc5dad5e8adc512bbdeb436aa99f6b04be100d246ca3d59f7
-  data.tar.gz: '0009efe2c7af6f8425018ebcbcf44b6d7c0295c83f08e90b00368358edd39205'
+  metadata.gz: ebf93538d8d794249ddcb8f4ddb2832eba001e6758d275c4ea59af595777d50e
+  data.tar.gz: e857b71120bf6c327fb83284ad901472656e12f0df542abd75223a953c6ea202
 SHA512:
-  metadata.gz: 53c557e2417576cfaf637ada5e8057e15ff6fda7db6cc898efb9b99d8620c0b09e15fd2dcf3a8dadb8c31fec3e038b0aa0c7db434bd7382532aea7970fba3f90
-  data.tar.gz: acc45f0794fb39ec448ba78abb8834568b0b8a050a91fd371fd55f1967a161bd1b2884f371329db24f1220454ddc00d9ecc7074ba48e42e5eae728741d97fed0
+  metadata.gz: c4b4e536e26ee506d3ee57b1cc9f186f9696c2f10ae61ab834e4dd40999d36381f1aa01b03096c1eb118ab92c720bef71d1b74f07c18c37fd6050545d13b67ad
+  data.tar.gz: '0619e6eb3fcb0220aebdcc6bb13f60c452d157c6e772dbd63596981c0dc4b6fed5cdbd8acf16a3c00916b853791875020651a0a3c5fe326fa8115a93fae5ab76'

data/lib/truenorth/cli.rb

@@ -97,6 +97,12 @@ module Truenorth
       end
     rescue Error => e
       say "Error: #{e.message}", :red
+
+      # If no slot available, show nearby available times
+      if e.message.include?('No slot available')
+        show_nearby_availability(client, date, time, activity)
+      end
+
       exit 1
     end
 
@@ -226,6 +232,56 @@ module Truenorth
 
     private
 
+    def show_nearby_availability(client, date, requested_time, activity)
+      say "\nChecking available times for #{date}...", :cyan
+
+      begin
+        result = client.availability(date, activity: activity)
+
+        if result[:slots].empty?
+          say "No #{activity} slots available on #{date}", :yellow
+        else
+          say "\nAvailable #{activity} times:", :green
+
+          # Parse requested time to find nearby slots
+          requested_hour = parse_time_to_minutes(requested_time)
+
+          # Sort slots by proximity to requested time
+          sorted_slots = result[:slots].sort_by do |time_str, _courts|
+            slot_minutes = parse_time_to_minutes(time_str)
+            (slot_minutes - requested_hour).abs
+          end
+
+          # Show up to 10 nearest slots
+          sorted_slots.first(10).each do |time_str, courts|
+            say "  #{time_str}: #{courts.join(', ')}"
+          end
+
+          if result[:slots].length > 10
+            say "\n  ... and #{result[:slots].length - 10} more times", :cyan
+          end
+        end
+      rescue Error => e
+        say "Could not fetch availability: #{e.message}", :yellow
+      end
+    end
+
+    def parse_time_to_minutes(time_str)
+      # Convert "10:00 AM" or "10am" to minutes since midnight
+      if time_str =~ /(\d{1,2}):?(\d{2})?\s*(am|pm)/i
+        hour = ::Regexp.last_match(1).to_i
+        minute = ::Regexp.last_match(2)&.to_i || 0
+        period = ::Regexp.last_match(3).upcase
+
+        hour = 0 if hour == 12 && period == 'AM'
+        hour += 12 if period == 'PM' && hour != 12
+
+        hour * 60 + minute
+      else
+        0
+      end
+    end
+
     def display_reservations_table(results)
       # Get terminal width
       term_width = begin

data/lib/truenorth/client.rb

@@ -5,6 +5,7 @@ require 'uri'
 require 'nokogiri'
 require 'json'
 require 'base64'
+require 'date'
 
 module Truenorth
   # HTTP client for NorthStar facility booking systems
@@ -283,7 +284,8 @@ module Truenorth
 
       raise BookingError, 'Could not extract view state' unless view_state
 
-      # Build the cancel AJAX request
+      # Step 1: Click the cancel button to open the confirmation dialog
+      # The dialog button will be enabled in the AJAX response
       ajax_url = "#{@base_url}#{RESERVATIONS_PATH}?p_p_id=memberReservations_WAR_northstarportlet" \
                  '&p_p_lifecycle=2&p_p_state=normal&p_p_mode=view' \
                  '&p_p_cacheability=cacheLevelPage' \
@@ -301,50 +303,98 @@ module Truenorth
 
       response = post_ajax(ajax_url, form_data)
 
-      if response.is_a?(Net::HTTPSuccess)
-        body = response.body
-
-        # Log response for debugging
-        log "Response length: #{body.length}"
-        log "Response preview: #{body[0..500]}"
-
-        # Check for specific PrimeFaces success indicators
-        # Look for actual cancellation confirmation messages
-        success_indicators = [
-          /cancelled.*successfully/i,
-          /reservation.*cancelled/i,
-          /successfully.*cancelled/i,
-          /<update.*id=".*growl"/i  # PrimeFaces growl messages usually indicate success/error
-        ]
-
-        # Check for error indicators
-        error_indicators = [
-          /error/i,
-          /failed/i,
-          /unable/i,
-          /cannot.*cancel/i
-        ]
-
-        has_error = error_indicators.any? { |pattern| body =~ pattern }
-        has_success = success_indicators.any? { |pattern| body =~ pattern }
-
-        if has_error
-          # Extract error message if present
-          error_msg = body[/error[^<]*|failed[^<]*/i] || 'Cancellation may have failed'
-          log "Error detected: #{error_msg}"
-          { success: false, error: error_msg }
-        elsif has_success || body.length < 500
-          # Very short response likely means success (no error message)
-          log 'Cancellation appears successful'
+      unless response.is_a?(Net::HTTPSuccess)
+        return { success: false, error: "HTTP #{response.code}" }
+      end
+
+      body = response.body
+      log "Step 1 response length: #{body.length}"
+
+      # Check if a confirmation dialog was opened
+      if body.include?("PF('cancelReservationDialog').show()") || body.include?('.show()')
+        log "Confirmation dialog opened"
+
+        # Extract the updated ViewState from the AJAX response
+        new_view_state = extract_view_state_from_ajax(body) || view_state
+
+        # Parse the AJAX response to find the enabled YES button
+        response_html = Nokogiri::HTML(body)
+
+        # Look for the YES button in the dialog (not in the reservation list!)
+        # The YES button has specific characteristics:
+        # 1. Contains text "YES"
+        # 2. Has class "ui-area-btn-danger"
+        # 3. Is inside the cancel dialog (j_idt274)
+        confirm_button = response_html.css('div[id*="j_idt274"] a.ui-area-btn-danger').find do |link|
+          link.text.strip.upcase.include?('YES')
+        end
+
+        # Fallback: look for any YES button with the right classes
+        unless confirm_button
+          confirm_button = response_html.css('a.ui-commandlink').find do |link|
+            link_text = link.text.strip.upcase
+            link_class = link['class'].to_s
+            link_text == 'YES' && link_class.include?('ui-area-btn-danger') &&
+              !link_class.include?('disabled')
+          end
+        end
+
+        unless confirm_button
+          log "Could not find enabled YES button in response"
+          log "Response preview: #{body[0..2000]}"
+          return { success: false, error: 'Could not find confirmation button' }
+        end
+
+        confirm_button_id = confirm_button['id']
+        log "Found confirmation button in response: #{confirm_button_id}"
+
+        # Step 2: Click the "Yes" button to actually cancel
+        confirm_data = {
+          'javax.faces.partial.ajax' => 'true',
+          'javax.faces.source' => confirm_button_id,
+          'javax.faces.partial.execute' => '@all',
+          'javax.faces.partial.render' => form_id,
+          form_id => form_id,
+          'javax.faces.ViewState' => new_view_state,
+          confirm_button_id => confirm_button_id
+        }
+
+        log "Clicking confirmation button: #{confirm_button_id}"
+        confirm_response = post_ajax(ajax_url, confirm_data)
+
+        if confirm_response.is_a?(Net::HTTPSuccess)
+          confirm_body = confirm_response.body
+          log "Step 2 response length: #{confirm_body.length}"
+          log "Step 2 response preview: #{confirm_body[0..500]}"
+
+          # Check for success indicators
+          if confirm_body =~ /cancelled.*successfully/i ||
+             confirm_body =~ /reservation.*cancelled/i ||
+             confirm_body =~ /successfully.*cancelled/i ||
+             confirm_body.include?('growl') ||
+             confirm_body.length < 1000
+            log 'Cancellation confirmed successfully'
+            { success: true, message: 'Reservation cancelled' }
+          else
+            log "Warning: Uncertain confirmation response"
+            { success: true, message: 'Cancellation likely succeeded (please verify)' }
+          end
+        else
+          { success: false, error: "Confirmation failed: HTTP #{confirm_response.code}" }
+        end
+      else
+        # No dialog - check if it was directly cancelled
+        log "No confirmation dialog detected"
+
+        if body =~ /cancelled.*successfully/i ||
+           body =~ /reservation.*cancelled/i ||
+           body.length < 500
+          log 'Direct cancellation successful'
           { success: true, message: 'Reservation cancelled' }
         else
-          # Ambiguous - log full response for analysis
-          log "Ambiguous response (#{body.length} bytes)"
-          log "Full response: #{body}"
+          log "Uncertain result (#{body.length} bytes)"
           { success: false, error: 'Uncertain if cancellation succeeded - please verify' }
         end
-      else
-        { success: false, error: "HTTP #{response.code}" }
       end
     end
 

data/lib/truenorth/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Truenorth
-  VERSION = '0.2.6'
+  VERSION = '0.2.8'
 end

data/truenorth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'truenorth'
-  spec.version       = '0.2.6'
+  spec.version       = '0.2.8'
   spec.authors       = ['usiegj00']
   spec.email         = ['112138+usiegj00@users.noreply.github.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: truenorth
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - usiegj00