moco-ruby 1.0.0.alpha → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda64cf9e66f0409e61b5fc1b0ad5b0bc440acfe3e1202d9baab08c87c21d6b1
-  data.tar.gz: cc6e0952ee9c89a4ac73f08c0093f1723563346f8bd2cfec27901faeed943ae8
+  metadata.gz: 5e60f0a59b12881fc99571967ff77dd1ae8c55ff8f3d45cd467bed9e6bf85c5d
+  data.tar.gz: a2070fba649482eb59f4ab96367cc5d8f12b5bfb0f6923bc7e7f6d2c69135566
 SHA512:
-  metadata.gz: f3bc2329dca452e3efbecc83b015532f5f32102d4e26a8bd787e036df3ac2384ac6f3ae95b0a67999cb9858197357cc0ee5beb744ad07168268e3067d6f774e7
-  data.tar.gz: 8189ab5b3015b78d1c93c0231497283e1d1d89ef1673c02d0762f161fcb6d277e4350f052fe799b80993b14cd645db0290ee0379c9455c840abe3646afa54415
+  metadata.gz: 867202c4431ae5a1d86fe9a8b18451c4cff6465d2119f5e9738d8a1b3018c6b81c726c00860762cf97ad233632df61bc38588ee0cf2d468f9516e36d65d3ed9f
+  data.tar.gz: 5a7cebee47463f888880ae2f9c0fa672e294adb2a0a1abcf3f098cfe241ac35eb84091607c035d36658cf5eb386880f3fc7f2db2abd0c5de8668c9ae72622333

data/CHANGELOG.md

@@ -1,7 +1,43 @@
-# Changelog
+# # Changelog
 
 ## [Unreleased]
 
+## [1.0.0] - 2025-10-08
+
+### Fixed
+- Fixed Project `leader` and `co_leader` associations to return User objects instead of Hashes
+- Fixed Expense associations to use proper `association()` method for embedded objects
+- Fixed nested resource proxy caching issue - tasks and expenses now always return fresh data
+- Fixed `NestedCollectionProxy` path construction for expenses (was double-prefixing with "projects/")
+- Fixed `entity_path` warnings by converting instance methods to class methods in Holiday and WebHook classes
+- Fixed embedded entity conversion for leader, co_leader, and user associations in BaseEntity
+
+### Added
+- Added comprehensive test suite using test-unit framework:
+  - `test/test_comprehensive.rb` - 27 integration tests covering all CRUD operations
+  - `test/test_holidays_expenses.rb` - 9 tests for holidays and expenses (nested resources)
+  - `test/test_v2_api.rb` - 4 unit tests with mocked API responses
+  - `test/test_helper.rb` - Shared test configuration
+- Added `Project#expenses` method for nested expense access
+- Added proper entity type mappings for `:leader`, `:co_leader`, and `:user` in BaseEntity
+- Added dotenv gem as development dependency for test environment configuration
+
+### Changed
+- Moved all `require_relative` statements out of methods and into file-level requires
+- Improved load order in `lib/moco.rb` - core classes now load before entities
+- Updated `Expense` entity to use `association()` method for project and user relationships
+- Refactored nested resource access in Project class to return fresh proxies instead of cached ones
+- Enhanced `NestedCollectionProxy` to properly handle nested resource paths without double-prefixing
+
+### Removed
+- Removed manual test scripts (converted to proper test-unit tests)
+
+## [1.0.0.beta] - 2025-04-10
+
+### Fixed
+- Fixed activity synchronization to properly identify existing activities in target system
+- Added remote_id accessor to Activity class to prevent duplicate activity creation
+
 ## [1.0.0.alpha] - 2025-04-10
 
 ### Added
@@ -10,7 +46,7 @@
   - Supports proper path construction for nested API endpoints
   - Implements `destroy_all` method for bulk deletion of nested resources
 
-## [1.0.0] - 2025-04-10
+## [1.0.0.alpha-initial] - 2025-04-10
 
 ### Added
 - Implemented ActiveRecord-style query interface (`where`, `find`, `find_by`, `first`, `all`, `each`) via `CollectionProxy`.
@@ -89,9 +125,11 @@
 ## [0.1.0] - 2024-02-27
 - Initial release
 
-[Unreleased]: https://github.com/starsong-consulting/moco-ruby/compare/v1.0.0.alpha...HEAD
-[1.0.0.alpha]: https://github.com/starsong-consulting/moco-ruby/compare/v1.0.0...v1.0.0.alpha
-[1.0.0]: https://github.com/starsong-consulting/moco-ruby/compare/v0.1.2...v1.0.0
+[Unreleased]: https://github.com/starsong-consulting/moco-ruby/compare/v1.0.0...HEAD
+[1.0.0]: https://github.com/starsong-consulting/moco-ruby/compare/v1.0.0.beta...v1.0.0
+[1.0.0.beta]: https://github.com/starsong-consulting/moco-ruby/compare/v1.0.0.alpha...v1.0.0.beta
+[1.0.0.alpha]: https://github.com/starsong-consulting/moco-ruby/compare/v1.0.0.alpha-initial...v1.0.0.alpha
+[1.0.0.alpha-initial]: https://github.com/starsong-consulting/moco-ruby/compare/v0.1.2...v1.0.0.alpha-initial
 [0.1.2]: https://github.com/starsong-consulting/moco-ruby/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/starsong-consulting/moco-ruby/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/starsong-consulting/moco-ruby/releases/tag/v0.1.0

data/Gemfile

@@ -8,3 +8,4 @@ gem "rake", "~> 13.0"
 gem "rubocop", "~> 1.21"
 gem "test-unit", "~> 3.5"
 gem "webmock", "~> 3.18"
+gem "dotenv", "~> 2.8"

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    moco-ruby (1.0.0.alpha)
-      activesupport (~> 7.0)
-      faraday (~> 2.9.0)
+    moco-ruby (1.0.0)
+      activesupport (>= 7.0)
+      faraday (>= 2.0)
       fuzzy_match (~> 2.1.0)
 
 GEM
@@ -32,6 +32,7 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
+    dotenv (2.8.1)
     drb (2.2.1)
     faraday (2.9.2)
       faraday-net_http (>= 2.0, < 3.2)
@@ -59,7 +60,7 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.10.0)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rubocop (1.75.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -94,6 +95,7 @@ PLATFORMS
   arm64-darwin-23
 
 DEPENDENCIES
+  dotenv (~> 2.8)
   moco-ruby!
   rake (~> 13.0)
   rubocop (~> 1.21)

data/README.md

@@ -226,15 +226,51 @@ Usage: sync_activity.rb [options] source_subdomain target_subdomain
         --match-project-threshold VALUE
                                      Fuzzy match threshold for projects (0.0 - 1.0), default 0.8
         --match-task-threshold VALUE Fuzzy match threshold for tasks (0.0 - 1.0), default 0.45
+        --default-task TASK_NAME     Map unmatched tasks to this default task instead of creating new tasks
+    -d, --debug                      Enable debug output
     -h, --help                       Show this message
 ```
 **Example:** `sync_activity.rb --from 2024-04-01 --to 2024-04-10 --dry-run source-instance target-instance`
 
+**Using Default Task Mapping:** If your target account has limited permissions and cannot create tasks, or if you want to consolidate multiple source tasks into a single target task, use the `--default-task` flag:
+
+```bash
+sync_activity.rb --from 2024-04-01 --to 2024-04-10 --default-task "Other" source-instance target-instance
+```
+
+This will map any unmatched source tasks to a task named "Other" in the corresponding target project, avoiding the need to create new tasks.
+
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
+
+### Running Tests
+
+The gem includes a comprehensive test suite with both unit tests (mocked) and integration tests (live API):
+
+```bash
+# Run all tests
+ruby test/test_v2_api.rb              # Unit tests (mocked, fast)
+ruby test/test_comprehensive.rb       # Integration tests (requires .env)
+ruby test/test_holidays_expenses.rb   # Holidays & Expenses tests (requires .env)
+
+# Or run individually
+ruby test/test_v2_api.rb
+```
+
+For integration tests, create a `.env` file with your test instance credentials:
+```
+MOCO_API_TEST_SUBDOMAIN=your-test-subdomain
+MOCO_API_TEST_API_KEY=your-test-api-key
+```
+
+**Note:** The MOCO API has rate limits (120 requests per 2 minutes on standard plans). Integration tests make real API calls.
+
+### Installation
+
+To install this gem onto your local machine, run `bundle exec rake install`.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To release a new version, update the version number in `version.rb`, update the `CHANGELOG.md`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/copy_project.rb

@@ -0,0 +1,337 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "optparse"
+require "yaml"
+require "fuzzy_match"
+require_relative "lib/moco"
+
+options = {
+  dry_run: false,
+  verbose: false,
+  copy_activities: true
+}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$PROGRAM_NAME} [options] source_instance target_instance project_identifier"
+
+  opts.on("-n", "--dry-run", "Show what would be copied without making changes") do
+    options[:dry_run] = true
+  end
+
+  opts.on("-v", "--verbose", "Enable verbose output") do
+    options[:verbose] = true
+  end
+
+  opts.on("--no-activities", "Skip copying activities (only copy project and tasks)") do
+    options[:copy_activities] = false
+  end
+
+  opts.on("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end.parse!
+
+source_instance = ARGV.shift
+target_instance = ARGV.shift
+project_identifier = ARGV.shift
+
+if source_instance.nil? || target_instance.nil? || project_identifier.nil?
+  warn "Error: source_instance, target_instance, and project_identifier are required"
+  warn "Usage: #{$PROGRAM_NAME} [options] source_instance target_instance project_identifier"
+  exit 1
+end
+
+# Load configuration
+config = YAML.load_file("config.yml")
+source_config = config["instances"].fetch(source_instance, nil)
+target_config = config["instances"].fetch(target_instance, nil)
+
+if source_config.nil?
+  warn "Error: Source instance '#{source_instance}' not found in config.yml"
+  exit 1
+end
+
+if target_config.nil?
+  warn "Error: Target instance '#{target_instance}' not found in config.yml"
+  exit 1
+end
+
+# Initialize clients
+puts "Connecting to instances..."
+source_client = MOCO::Client.new(subdomain: source_instance, api_key: source_config["api_key"])
+target_client = MOCO::Client.new(subdomain: target_instance, api_key: target_config["api_key"])
+
+def log(message, verbose: false, options:)
+  return if verbose && !options[:verbose]
+  puts message
+end
+
+def get_id(obj)
+  return nil if obj.nil?
+  return obj[:id] if obj.is_a?(Hash)
+  return obj.id if obj.respond_to?(:id)
+  nil
+end
+
+def find_or_create_customer(source_customer, target_client, options)
+  log("Looking for customer '#{source_customer.name}' in target...", options: options)
+
+  # Try to find the customer by name
+  target_customers = target_client.companies.all
+  target_customer = target_customers.find { |c| c.name == source_customer.name }
+
+  if target_customer
+    log("✅ Found existing customer: #{target_customer.name} (ID: #{target_customer.id})", options: options)
+    return target_customer
+  end
+
+  log("Customer not found, creating new customer...", options: options)
+
+  if options[:dry_run]
+    log("🔍 [DRY RUN] Would create customer: #{source_customer.name}", options: options)
+    return nil
+  end
+
+  # Create the customer
+  customer_attrs = {
+    name: source_customer.name,
+    type: "customer"
+  }
+
+  # Add optional attributes if they exist
+  customer_attrs[:type] = source_customer.type if source_customer.respond_to?(:type) && source_customer.type
+  customer_attrs[:currency] = source_customer.currency if source_customer.respond_to?(:currency) && source_customer.currency
+  customer_attrs[:website] = source_customer.website if source_customer.respond_to?(:website) && source_customer.website
+  customer_attrs[:address] = source_customer.address if source_customer.respond_to?(:address) && source_customer.address
+  customer_attrs[:info] = source_customer.info if source_customer.respond_to?(:info) && source_customer.info
+  customer_attrs[:custom_properties] = source_customer.custom_properties if source_customer.respond_to?(:custom_properties) && source_customer.custom_properties
+  customer_attrs[:labels] = source_customer.labels if source_customer.respond_to?(:labels) && source_customer.labels
+
+  log("Creating customer: #{customer_attrs[:name]}", verbose: true, options: options)
+  new_customer = target_client.companies.create(customer_attrs)
+  log("✅ Created customer: #{new_customer.name} (ID: #{new_customer.id})", options: options)
+
+  new_customer
+end
+
+def copy_tasks(source_project, target_project, target_client, options)
+  log("\nCopying tasks...", options: options)
+  task_mapping = {}
+
+  source_tasks = source_project.tasks
+  log("Found #{source_tasks.count} tasks in source project", options: options)
+
+  source_tasks.each do |source_task|
+    log("  Task: #{source_task.name}", verbose: true, options: options)
+
+    if options[:dry_run]
+      log("  🔍 [DRY RUN] Would create task: #{source_task.name}", options: options)
+      next
+    end
+
+    # Create the task in the target project
+    task_attrs = {
+      name: source_task.name,
+      billable: source_task.billable,
+      active: source_task.active
+    }
+
+    # Add optional attributes if they exist
+    source_task_attrs = source_task.instance_variable_get(:@attributes)
+    task_attrs[:budget] = source_task_attrs[:budget] if source_task_attrs[:budget]
+    task_attrs[:hourly_rate] = source_task_attrs[:hourly_rate] if source_task_attrs[:hourly_rate]
+
+    log("  Creating task: #{task_attrs[:name]}", verbose: true, options: options)
+    # Use the NestedCollectionProxy to create the task
+    task_proxy = MOCO::NestedCollectionProxy.new(target_client, target_project, :tasks, "Task")
+    new_task = task_proxy.create(task_attrs)
+    task_mapping[source_task.id] = new_task
+    log("  ✅ Created task: #{new_task.name} (ID: #{new_task.id})", options: options)
+  end
+
+  task_mapping
+end
+
+def copy_activities(source_project, target_project, task_mapping, source_client, target_client, options)
+  log("\nCopying activities...", options: options)
+
+  # Get all activities for the source project
+  source_activities = source_client.activities.where(project_id: source_project.id).all
+  log("Found #{source_activities.count} activities in source project", options: options)
+
+  created_count = 0
+  skipped_count = 0
+
+  source_activities.each do |source_activity|
+    log("  Activity: #{source_activity.date} - #{source_activity.hours}h - #{source_activity.description}", verbose: true, options: options)
+
+    if options[:dry_run]
+      log("  🔍 [DRY RUN] Would create activity: #{source_activity.date} - #{source_activity.hours}h", options: options)
+      next
+    end
+
+    # Map the task
+    target_task = task_mapping[source_activity.task&.id]
+
+    if source_activity.task && !target_task
+      log("  ⚠️  Skipping activity - task not mapped: #{source_activity.task.name}", options: options)
+      skipped_count += 1
+      next
+    end
+
+    # Create the activity in the target project
+    activity_attrs = {
+      date: source_activity.date,
+      hours: source_activity.hours,
+      description: source_activity.description,
+      project_id: target_project.id,
+      billable: source_activity.billable,
+      tag: source_activity.tag,
+      remote_service: source_activity.remote_service,
+      remote_id: source_activity.id.to_s # Store original ID for reference
+    }
+
+    activity_attrs[:task_id] = target_task.id if target_task
+
+    log("  Creating activity: #{activity_attrs[:date]} - #{activity_attrs[:hours]}h", verbose: true, options: options)
+
+    begin
+      new_activity = target_client.activities.create(activity_attrs)
+      created_count += 1
+      log("  ✅ Created activity: #{new_activity.date} - #{new_activity.hours}h (ID: #{new_activity.id})", verbose: true, options: options)
+    rescue => e
+      log("  ❌ Error creating activity: #{e.message}", options: options)
+      skipped_count += 1
+    end
+  end
+
+  log("\n✅ Created #{created_count} activities", options: options)
+  log("⚠️  Skipped #{skipped_count} activities", options: options) if skipped_count > 0
+end
+
+# Main execution
+begin
+  log("=" * 80, options: options)
+  log("MOCO Project Copy Tool", options: options)
+  log("=" * 80, options: options)
+  log("Source: #{source_instance}", options: options)
+  log("Target: #{target_instance}", options: options)
+  log("Project: #{project_identifier}", options: options)
+  log("Mode: #{options[:dry_run] ? 'DRY RUN' : 'LIVE'}", options: options)
+  log("=" * 80, options: options)
+
+  # Find the source project
+  log("\nFinding source project...", options: options)
+  source_project = source_client.projects.where(identifier: project_identifier).all.first
+
+  if source_project.nil?
+    warn "Error: Project '#{project_identifier}' not found in source instance"
+    exit 1
+  end
+
+  log("✅ Found project: #{source_project.name} (ID: #{source_project.id})", options: options)
+  log("   Identifier: #{source_project.identifier}", verbose: true, options: options)
+  log("   Status: #{source_project.active ? 'Active' : 'Inactive'}", verbose: true, options: options)
+
+  # Get the customer
+  source_customer = source_project.customer
+  if source_customer.nil?
+    warn "Error: Project has no associated customer"
+    exit 1
+  end
+
+  log("   Customer: #{source_customer.name} (ID: #{source_customer.id})", options: options)
+
+  # Find or create the customer in the target
+  target_customer = find_or_create_customer(source_customer, target_client, options)
+
+  if options[:dry_run]
+    log("\n🔍 [DRY RUN] Would create project: #{source_project.name}", options: options)
+    log("   Identifier: #{source_project.identifier}", options: options)
+    log("   Customer: #{source_customer.name}", options: options)
+
+    # Still show what tasks would be copied
+    copy_tasks(source_project, source_project, target_client, options)
+
+    if options[:copy_activities]
+      log("\n🔍 [DRY RUN] Would copy activities...", options: options)
+      source_activities = source_client.activities.where(project_id: source_project.id).all
+      log("   Found #{source_activities.count} activities to copy", options: options)
+    end
+
+    log("\n" + "=" * 80, options: options)
+    log("DRY RUN COMPLETE - No changes made", options: options)
+    log("=" * 80, options: options)
+    exit 0
+  end
+
+  # Create the project in the target
+  log("\nCreating project in target...", options: options)
+
+  # Access attributes directly from the source project
+  source_attrs = source_project.instance_variable_get(:@attributes)
+
+  project_attrs = {
+    name: source_project.name,
+    identifier: source_project.identifier,
+    customer_id: target_customer.id,
+    currency: source_project.currency,
+    billable: source_project.billable,
+    fixed_price: source_attrs[:fixed_price] || false,
+    retainer: source_attrs[:retainer] || false,
+    finish_date: source_attrs[:finish_date],
+    start_date: source_attrs[:start_date]
+  }
+
+  # Get a default user from the target instance as leader
+  # TODO: implement proper user mapping between instances (match by name/email)
+  target_users = target_client.users.all
+  if target_users.empty?
+    raise "No users found in target instance - cannot set project leader"
+  end
+  project_attrs[:leader_id] = target_users.first.id
+  log("Using default leader: #{target_users.first.firstname} #{target_users.first.lastname} (ID: #{target_users.first.id})", verbose: true, options: options)
+
+  # Add optional attributes if they exist
+  project_attrs[:co_leader_id] = get_id(source_attrs[:co_leader]) if source_attrs[:co_leader]
+  project_attrs[:budget] = source_attrs[:budget] if source_attrs[:budget]
+  project_attrs[:budget_monthly] = source_attrs[:budget_monthly] if source_attrs[:budget_monthly]
+  project_attrs[:budget_expenses] = source_attrs[:budget_expenses] if source_attrs[:budget_expenses]
+  project_attrs[:hourly_rate] = source_attrs[:hourly_rate] if source_attrs[:hourly_rate]
+  project_attrs[:custom_properties] = source_attrs[:custom_properties] if source_attrs[:custom_properties]
+  project_attrs[:labels] = source_attrs[:labels] if source_attrs[:labels]
+  project_attrs[:tags] = source_attrs[:tags] if source_attrs[:tags]
+  project_attrs[:info] = source_attrs[:info] if source_attrs[:info]
+  project_attrs[:billing_address] = source_attrs[:billing_address] if source_attrs[:billing_address]
+  project_attrs[:billing_variant] = source_attrs[:billing_variant] if source_attrs[:billing_variant]
+
+  log("Creating project: #{project_attrs[:name]}", verbose: true, options: options)
+  target_project = target_client.projects.create(project_attrs)
+  log("✅ Created project: #{target_project.name} (ID: #{target_project.id})", options: options)
+
+  # Copy tasks
+  task_mapping = copy_tasks(source_project, target_project, target_client, options)
+
+  # Copy activities if requested
+  if options[:copy_activities]
+    copy_activities(source_project, target_project, task_mapping, source_client, target_client, options)
+  else
+    log("\nSkipping activities (--no-activities specified)", options: options)
+  end
+
+  log("\n" + "=" * 80, options: options)
+  log("✅ PROJECT COPY COMPLETE", options: options)
+  log("=" * 80, options: options)
+  log("Source project: #{source_project.name} (#{source_instance})", options: options)
+  log("Target project: #{target_project.name} (#{target_instance})", options: options)
+  log("Target project ID: #{target_project.id}", options: options)
+  log("Target project URL: https://#{target_instance}.mocoapp.com/projects/#{target_project.id}", options: options)
+  log("=" * 80, options: options)
+
+rescue => e
+  warn "\n❌ Error: #{e.message}"
+  warn e.backtrace.join("\n") if options[:verbose]
+  exit 1
+end

data/lib/moco/client.rb

@@ -6,8 +6,8 @@ module MOCO
   class Client
     attr_reader :connection
 
-    def initialize(subdomain:, api_key:)
-      @connection = Connection.new(self, subdomain, api_key)
+    def initialize(subdomain:, api_key:, debug: false)
+      @connection = Connection.new(self, subdomain, api_key, debug: debug)
       @collections = {}
     end
 

data/lib/moco/collection_proxy.rb

@@ -54,6 +54,13 @@ module MOCO
       self
     end
 
+    # Modifies the base path to fetch assigned resources. Returns self.
+    def assigned
+      # Ensure this is only called once or handle idempotency if needed
+      @base_path += "/assigned"
+      self
+    end
+
     # --- Methods Triggering API Call ---
 
     # Fetches all records matching the current filters.
@@ -130,6 +137,9 @@ module MOCO
       # MOCO API might use 'per_page' instead of 'limit' for pagination control
       # Adjust if necessary based on API docs. Assuming 'limit' works for now.
 
+      # Filter out nil values before sending to avoid empty params like ?from&to=
+      query_params.compact!
+
       response = client.get(@base_path, query_params)
       @records = wrap_response(response) # wrap_response should return an Array here
       @loaded = true

data/lib/moco/connection.rb

@@ -7,12 +7,13 @@ module MOCO
   # Handles HTTP communication with the MOCO API
   # Responsible for building API requests and converting responses to entity objects
   class Connection
-    attr_reader :client, :subdomain, :api_key
+    attr_reader :client, :subdomain, :api_key, :debug
 
-    def initialize(client, subdomain, api_key)
+    def initialize(client, subdomain, api_key, debug: false)
       @client = client
       @subdomain = subdomain
       @api_key = api_key
+      @debug = debug
       @conn = Faraday.new do |f|
         f.request :json
         f.response :json
@@ -25,6 +26,11 @@ module MOCO
     # These methods send the request and return the raw parsed JSON response body.
     %w[get post put patch delete].each do |http_method|
       define_method(http_method) do |path, params = {}|
+        # Log URL if debug is enabled
+        if @debug
+          full_url = @conn.build_url(path, params).to_s
+          warn "[DEBUG] Fetching URL: #{http_method.upcase} #{full_url}"
+        end
         response = @conn.send(http_method, path, params)
 
         # Raise an error for non-successful responses

data/lib/moco/entities/activity.rb

@@ -89,8 +89,13 @@ module MOCO
                   end
     end
 
+    # Access the remote_id attribute
+    def remote_id
+      attributes[:remote_id]
+    end
+
     def to_s
-      "#{date} - #{hours}h - #{project&.name} - #{task&.name} - #{description}"
+      "#{attributes[:date]} - #{attributes[:hours]}h - #{project&.name} - #{task&.name} - #{attributes[:description]}"
     end
   end
 end

data/lib/moco/entities/base_entity.rb

@@ -29,6 +29,11 @@ module MOCO
       define_attribute_methods
     end
 
+    # Provides a basic string representation (can be overridden by subclasses).
+    def to_s
+      "#{self.class.name.split("::").last} ##{id}"
+    end
+
     # Returns the entity's ID.
     def id
       attributes[:id] || attributes["id"]
@@ -185,9 +190,11 @@ module MOCO
       # Return cached collection if available
       return @_association_cache[association_name] if @_association_cache.key?(association_name)
 
-      # If the association data is already in attributes and is an array of entities, use it directly
+      # If the association data is already in attributes and is an array of entities
+      # AND this is NOT a nested resource, use it directly
+      # For nested resources, we always create a proxy to ensure CRUD operations work
       association_data = attributes[association_name]
-      if association_data.is_a?(Array) && association_data.all? { |item| item.is_a?(MOCO::BaseEntity) }
+      if !nested && association_data.is_a?(Array) && association_data.all? { |item| item.is_a?(MOCO::BaseEntity) }
         return @_association_cache[association_name] = association_data
       end
 
@@ -201,7 +208,6 @@ module MOCO
       # Check if this is a nested resource
       if nested
         # For nested resources, create a NestedCollectionProxy
-        require_relative "../nested_collection_proxy"
         @_association_cache[association_name] = MOCO::NestedCollectionProxy.new(
           client,
           self,
@@ -273,9 +279,12 @@ module MOCO
 
       # Infer type from the key_hint if :type attribute is missing
       if type_name.nil? && key_hint
-        # Special case: map :customer key to Company class
-        type_name = if key_hint == :customer
+        # Special cases: map certain keys to specific entity classes
+        type_name = case key_hint
+                    when :customer
                       "Company"
+                    when :leader, :co_leader, :user
+                      "User"
                     else
                       # General case: singularize the key hint (e.g., :tasks -> "task")
                       ActiveSupport::Inflector.singularize(key_hint.to_s)

data/lib/moco/entities/expense.rb

@@ -4,6 +4,12 @@ module MOCO
   # Represents a MOCO expense
   # Provides methods for expense-specific operations and associations
   class Expense < BaseEntity
+    # Override entity_path to use the global expenses endpoint
+    # Note: Expenses can also be accessed via projects/{id}/expenses
+    def self.entity_path
+      "projects/expenses"
+    end
+
     # Class methods for bulk operations
     def self.disregard(client, expense_ids:)
       client.post("projects/expenses/disregard", { expense_ids: })
@@ -15,11 +21,13 @@ module MOCO
 
     # Associations
     def project
-      @project ||= client.projects.find(project_id) if project_id
+      # Use the association method which handles embedded objects
+      association(:project, "Project")
     end
 
     def user
-      @user ||= client.users.find(user_id) if user_id
+      # Use the association method which handles embedded objects
+      association(:user, "User")
     end
 
     def to_s