truenorth 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 131d576fcb2ae365a296327ed2d3a56f40bea4bc6d56cd71457885b92a973f72
-  data.tar.gz: 84955a3b673d18bbed8b7d2cb07a5d7e334cfc53350236c3018e8247bfe34018
+  metadata.gz: 8d89d28373a48164f8f6cf1f93672dd70d4f8aaf8035ae40bdc144fe76a8d6be
+  data.tar.gz: 266756fa35b43d17ad657bb11ab46d0411c63da6620bf630594a08ac7f4d5226
 SHA512:
-  metadata.gz: d855f7fd99a257b1634f26b3b1d2c318d64ad727189a87b0f3d958673f3422ec8db13837ec0ecd197353a8c8e235c209d152f4802272aeb8fc0751c78eaa1288
-  data.tar.gz: 3bcab5c590187397b26e9c0bbe95ee9d3023e8dbfddd761b0a01d87f37592dc9a64319f19fe94cef59094adc6cb74d206bbcb483aa63cc4271b7895ebbb7fa09
+  metadata.gz: e1c0d586aa1b9146bedb498c81036d1446f23a9f6ee92cae1d14887007227196986e4ed245511cd39a58375729fa55831174f1536721f5d57a39ca8db03983bb
+  data.tar.gz: a764f05fe8325d6457f03467ba1c3a169b9422b8bbaa8d2030264a0f8bf5bcacda0e346fd913c0d415880f26d1f6dde03c6ef3fd58525c80e8e5ef2153b862c3

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
@@ -109,17 +110,24 @@ module Truenorth
       response = get(BOOKING_PATH)
       html = Nokogiri::HTML(response.body)
 
-      # Check if we need to change activity type first
+      # Navigate to the requested date first if needed
+      current_date = html.at_css('input[name*="sheetDate"]')&.[]('value')
+      requested_date = date.strftime('%m/%d/%Y')
       activity_id = ACTIVITIES[activity.to_s.downcase] || '5'
+
+      if current_date != requested_date
+        log "Navigating from #{current_date} to #{requested_date}"
+        html = change_date(html, requested_date, activity_id)
+      end
+
+      # Then change activity type - this should now return slots for the correct date
       current_activity = html.at_css('input[name*="activityId"]')&.[]('value')
 
       if current_activity && current_activity != activity_id
-        # Need to change activity via AJAX
+        log "Changing activity from #{current_activity} to #{activity_id}"
         html = change_activity(html, activity_id)
       end
 
-      # TODO: Handle date navigation if needed
-
       slots = parse_slots(html)
       log "Found #{slots.count} available time slots"
 
@@ -131,6 +139,7 @@ module Truenorth
       }
     end
 
+
     # Book a slot
     def book(time, date: Date.today, court: nil, activity: 'squash', dry_run: false)
       ensure_logged_in!
@@ -283,7 +292,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 +311,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
 
@@ -359,17 +417,58 @@ module Truenorth
     def parse_slots(html)
       slots = {}
 
-      html.css('td.slot.open').each do |td|
-        div = td.at_css('div[data-start-time]')
-        next unless div
-        next if td['class']&.include?('reserved')
+      # Find ALL slots with data-start-time
+      html.css('td.slot div[data-start-time]').each do |div|
+        td = div.parent
+        while td && td.name != 'td'
+          td = td.parent
+        end
+        next unless td
 
-        start_time = div['data-start-time']
-        area_id = div['data-area-id']
-        court_name = COURTS[area_id] || "Court #{area_id}"
+        classes = td['class'].to_s
 
-        slots[start_time] ||= []
-        slots[start_time] << court_name
+        # Skip definitively unavailable slots
+        next if classes.include?('reserved')
+        next if classes.include?('restrict')
+        next if classes.include?('blocked')
+
+        # Include ANY slot that's marked as "open", even if it has past-time
+        # The website shows past-time slots for future dates as bookable
+        if classes.include?('open')
+          start_time = div['data-start-time']
+          area_id = div['data-area-id']
+          court_name = COURTS[area_id] || "Court #{area_id}"
+
+          slots[start_time] ||= []
+          slots[start_time] << court_name unless slots[start_time].include?(court_name)
+        end
+      end
+
+      # If we found very few slots, be more aggressive
+      if slots.length < 10
+        log "Found only #{slots.length} slots with strict parsing, trying relaxed parsing..."
+
+        # Try including ALL non-reserved slots
+        html.css('td.slot div[data-start-time]').each do |div|
+          td = div.parent
+          while td && td.name != 'td'
+            td = td.parent
+          end
+          next unless td
+
+          classes = td['class'].to_s
+          # Only skip if explicitly reserved/restricted/blocked
+          next if classes.include?('reserved') && !classes.include?('open')
+          next if classes.include?('restrict')
+          next if classes.include?('blocked')
+
+          start_time = div['data-start-time']
+          area_id = div['data-area-id']
+          court_name = COURTS[area_id] || "Court #{area_id}"
+
+          slots[start_time] ||= []
+          slots[start_time] << court_name unless slots[start_time].include?(court_name)
+        end
       end
 
       slots
@@ -494,6 +593,58 @@ module Truenorth
       Nokogiri::HTML(result[:body])
     end
 
+    def change_date(html, date_str, activity_id = nil)
+      # Extract what we can from the HTML
+      form_id = extract_form_id(html)
+      view_state = extract_view_state(html)
+
+      # Build minimal form data manually to avoid extraction issues
+      form_data = build_minimal_form_data(html, form_id, activity_id)
+
+      result = change_date_ajax(form_id, view_state, date_str, form_data)
+      return html unless result[:success]
+
+      # Parse the AJAX response
+      ajax_body = result[:body]
+      cdata_content = ajax_body.scan(/<!\[CDATA\[(.*?)\]\]>/m).flatten.join("\n")
+
+      if !cdata_content.empty? && cdata_content.include?('slot')
+        Nokogiri::HTML(cdata_content)
+      else
+        html
+      end
+    end
+
+    def build_minimal_form_data(html, form_id, activity_id)
+      # Build the minimum required form data from scratch
+      # Only extract the fields we absolutely need
+      data = {}
+
+      # Try to find the form
+      form = html.at_css("form[id='#{form_id}']")
+      return data unless form
+
+      # Extract only the essential hidden fields
+      form.css('input[type="hidden"]').each do |input|
+        name = input['name']
+        value = input['value']
+        next unless name
+
+        # Only keep fields that belong to our form
+        if name.to_s.start_with?(form_id)
+          data[name] = value || ''
+        end
+      end
+
+      # Override activity ID if provided
+      if activity_id
+        data["#{form_id}:activityId"] = activity_id.to_s
+        data["#{form_id}:j_idt51_input"] = activity_id.to_s
+      end
+
+      data
+    end
+
     def extract_view_state(html)
       html.at_css('input[name="javax.faces.ViewState"]')&.[]('value')
     end
@@ -579,6 +730,39 @@ module Truenorth
       end
     end
 
+    def change_date_ajax(form_id, view_state, date_str, form_data)
+      return { success: false, error: 'No form_id' } unless form_id
+
+      date_picker = "#{form_id}:j_idt57"
+      ajax_url = build_ajax_url
+      encoded_url = URI.encode_www_form_component(ajax_url)
+
+      # Use form_data as-is (already built correctly by build_minimal_form_data)
+      # Just add our date values and AJAX control parameters
+      form_data = form_data.dup
+      form_data["#{form_id}:sheetDate"] = date_str
+      form_data["#{form_id}:j_idt57_input"] = date_str
+
+      form_data.merge!(
+        'javax.faces.partial.ajax' => 'true',
+        'javax.faces.source' => date_picker,
+        'javax.faces.partial.execute' => date_picker,
+        'javax.faces.partial.render' => form_id,
+        'javax.faces.behavior.event' => 'dateSelect',
+        'javax.faces.partial.event' => 'dateSelect',
+        form_id => form_id,
+        'javax.faces.encodedURL' => encoded_url,
+        'javax.faces.ViewState' => view_state
+      )
+
+      response = post_ajax(ajax_url, form_data)
+      if response.is_a?(Net::HTTPSuccess)
+        { success: true, view_state: extract_view_state_from_ajax(response.body), body: response.body }
+      else
+        { success: false, error: "HTTP #{response.code}" }
+      end
+    end
+
     def select_slot_ajax(form_id, view_state, slot, components, form_fields)
       source_id = components['showReservationScreen'] || "#{form_id}:j_idt146"
       ajax_url = build_ajax_url

data/lib/truenorth/version.rb

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

data/truenorth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'truenorth'
-  spec.version       = '0.2.7'
+  spec.version       = '0.3.0'
   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.7
+  version: 0.3.0
 platform: ruby
 authors:
 - usiegj00