goals.rb in bloomy-0.4.2

- old
+ new

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
+require "bloomy/utils/get_user_id"
+
 # Class to handle all the operations related to goals
 class Goal
+  include Bloomy::Utilities::UserIdUtility
   # Initializes a new Goal instance
   #
   # @param conn [Object] the connection object to interact with the API
-  # @param user_id [Integer] the ID of the user
-  def initialize(conn, user_id)
+  def initialize(conn)
     @conn = conn
-    @user_id = user_id
   end
 
   # Lists all goals for a specific user
   #
   # @param user_id [Integer] the ID of the user (default is the initialized user ID)
   # @param archived [Boolean] whether to include archived goals (default: false)
   # @return [Array<Hash>] an array of hashes containing goal details or a hash with active and archived goals
   # @example
   #  client.goal.list
   #   #=> [{ id: 1, title: "Complete project", created_at: "2024-06-10", ... }, ...]
-  def list(user_id: @user_id, archived: false)
+  def list(user_id = self.user_id, archived: false)
     active_goals = @conn.get("rocks/user/#{user_id}?include_origin=true").body.map do |goal|
       {
         id: goal["Id"],
         title: goal["Name"],
         created_at: goal["CreateTime"],
@@ -30,11 +31,11 @@
         meeting_id: goal["Origins"].empty? ? nil : goal["Origins"][0]["Id"],
         meeting_name: goal["Origins"].empty? ? nil : goal["Origins"][0]["Name"]
       }
     end
 
-    archived ? {active: active_goals, archived: get_archived_goals(user_id: @user_id)} : active_goals
+    archived ? {active: active_goals, archived: get_archived_goals(self.user_id)} : active_goals
   end
 
   # Creates a new goal
   #
   # @param title [String] the title of the new goal
@@ -42,11 +43,11 @@
   # @param user_id [Integer] the ID of the user responsible for the goal (default: initialized user ID)
   # @return [Hash] a hash containing the new goal's details
   # @example
   #   client.goal.create(title: "New Goal", meeting_id: 1)
   #   #=> { goal_id: 1, title: "New Goal", meeting_id: 1, ... }
-  def create(title:, meeting_id:, user_id: @user_id)
+  def create(title:, meeting_id:, user_id: self.user_id)
     payload = {title: title, accountableUserId: user_id}.to_json
     response = @conn.post("/api/v1/L10/#{meeting_id}/rocks", payload).body
     {
       goal_id: response["Id"],
       title: title,
@@ -77,11 +78,11 @@
   # @param accountable_user [Integer] the ID of the user responsible for the goal (default: initialized user ID)
   # @return [Hash] a hash containing the status of the update operation
   # @example
   #   client.goal.update(goal_id: 1, title: "Updated Goal")
   #   #=> { status: 200 }
-  def update(goal_id:, title:, accountable_user: @user_id)
+  def update(goal_id:, title:, accountable_user: user_id)
     payload = {title: title, accountableUserId: accountable_user}.to_json
     response = @conn.put("/api/v1/rocks/#{goal_id}", payload)
     {status: response.status}
   end
 
@@ -92,10 +93,10 @@
   # @param user_id [Integer] the ID of the user (default is the initialized user ID)
   # @return [Array<Hash>] an array of hashes containing archived goal details
   # @example
   #   goal.send(:get_archived_goals)
   #   #=> [{ id: 1, title: "Archived Goal", created_at: "2024-06-10", ... }, ...]
-  def get_archived_goals(user_id: @user_id)
+  def get_archived_goals(user_id = self.user_id)
     response = @conn.get("archivedrocks/user/#{user_id}").body
     response.map do |goal|
       {
         id: goal["Id"],
         title: goal["Name"],