Merge pull request #229 from gtt-project/ftr/update-api-views

Updates API endpoints

Author: dkastl

.github/workflows/test-postgis.yml

@@ -7,11 +7,11 @@ on:
   push:
     branches:
       - main
-      - master
+      - next
   pull_request:
     branches:
       - main
-      - master
+      - next
 
 jobs:
   test:

app/views/issues/index.api.rsb

@@ -4,7 +4,7 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l
       api.id issue.id
       api.project(:id => issue.project_id, :name => issue.project.name) unless issue.project.nil?
       api.tracker(:id => issue.tracker_id, :name => issue.tracker.name) unless issue.tracker.nil?
-      api.status(:id => issue.status_id, :name => issue.status.name) unless issue.status.nil?
+      api.status(:id => issue.status_id, :name => issue.status.name, :is_closed => issue.status.is_closed) unless issue.status.nil?
       api.priority(:id => issue.priority_id, :name => issue.priority.name) unless issue.priority.nil?
       api.author(:id => issue.author_id, :name => issue.author.name) unless issue.author.nil?
       api.assigned_to(:id => issue.assigned_to_id, :name => issue.assigned_to.name) unless issue.assigned_to.nil?
@@ -19,6 +19,11 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l
       api.done_ratio  issue.done_ratio
       api.is_private  issue.is_private
       api.estimated_hours issue.estimated_hours
+      api.total_estimated_hours issue.total_estimated_hours
+      if User.current.allowed_to?(:view_time_entries, issue.project)
+        api.spent_hours(issue.spent_hours)
+        api.total_spent_hours(issue.total_spent_hours)
+      end
 
       if issue.geom
         api.geojson (params[:format] == "json") ? issue.geojson : issue.geojson.to_json

app/views/issues/show.api.rsb

@@ -2,7 +2,7 @@ api.issue do
   api.id @issue.id
   api.project(:id => @issue.project_id, :name => @issue.project.name) unless @issue.project.nil?
   api.tracker(:id => @issue.tracker_id, :name => @issue.tracker.name) unless @issue.tracker.nil?
-  api.status(:id => @issue.status_id, :name => @issue.status.name) unless @issue.status.nil?
+  api.status(:id => @issue.status_id, :name => @issue.status.name, :is_closed => @issue.status.is_closed) unless @issue.status.nil?
   api.priority(:id => @issue.priority_id, :name => @issue.priority.name) unless @issue.priority.nil?
   api.author(:id => @issue.author_id, :name => @issue.author.name) unless @issue.author.nil?
   api.assigned_to(:id => @issue.assigned_to_id, :name => @issue.assigned_to.name) unless @issue.assigned_to.nil?
@@ -36,6 +36,7 @@ api.issue do
   api.closed_on @issue.closed_on
 
   render_api_issue_children(@issue, api) if include_in_api_response?('children')
+
   api.array :attachments do
     @issue.attachments.each do |attachment|
       render_api_attachment(attachment, api)
@@ -82,4 +83,10 @@ api.issue do
       api.user :id => user.id, :name => user.name
     end
   end if include_in_api_response?('watchers') && User.current.allowed_to?(:view_issue_watchers, @issue.project)
+
+  api.array :allowed_statuses do
+    @allowed_statuses.each do |status|
+      api.status :id => status.id, :name => status.name, :is_closed => status.is_closed
+    end
+  end if include_in_api_response?('allowed_statuses')
 end

app/views/projects/index.api.rsb

@@ -8,6 +8,7 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
       api.parent(:id => project.parent.id, :name => project.parent.name) if project.parent && project.parent.visible?
       api.status      project.status
       api.is_public   project.is_public?
+      api.inherit_members project.inherit_members?
       api.rotation    project.map_rotation
 
       if @include_geometry

app/views/projects/show.api.rsb

@@ -7,13 +7,16 @@ api.project do
   api.parent(:id => @project.parent.id, :name => @project.parent.name) if @project.parent && @project.parent.visible?
   api.status      @project.status
   api.is_public   @project.is_public?
-  api.rotation    @project.map_rotation
+  api.inherit_members @project.inherit_members?
+  api.default_version(:id => @project.default_version.id, :name => @project.default_version.name) if @project.default_version
+  api.default_assignee(:id => @project.project.default_assigned_to.id, :name => @project.project.default_assigned_to.name) if @project.default_assigned_to
 
   if @project.geom
     api.geojson (params[:format] == "json") ? @project.geojson : @project.geojson.to_json
   else
     api.geojson nil
   end
+  api.rotation    @project.map_rotation
 
   render_api_custom_values @project.visible_custom_field_values, api
   render_api_includes(@project, api)

app/views/users/index.api.rsb

@@ -3,11 +3,16 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim
     api.user do
       api.id         user.id
       api.login      user.login
+      api.admin      user.admin?
       api.firstname  user.firstname
       api.lastname   user.lastname
       api.mail       user.mail
       api.created_on user.created_on
-      api.last_login_on user.last_login_on
+      api.updated_on user.updated_on
+      api.last_login_on     user.last_login_on
+      api.passwd_changed_on user.passwd_changed_on
+      api.avatar_url gravatar_url(user.mail, {rating: nil, size: nil, default: Setting.gravatar_default}) if Setting.gravatar_enabled?
+      api.twofa_scheme user.twofa_scheme
 
       if user.geom
         api.geojson (params[:format] == "json") ? user.geojson : user.geojson.to_json

app/views/users/show.api.rsb

@@ -1,11 +1,16 @@
 api.user do
   api.id         @user.id
-  api.login      @user.login if User.current.admin? || (User.current == @user)
+  api.login      @user.login
+  api.admin      @user.admin? if User.current.admin? || (User.current == @user)
   api.firstname  @user.firstname
   api.lastname   @user.lastname
   api.mail       @user.mail if User.current.admin? || [email protected]_mail
   api.created_on @user.created_on
-  api.last_login_on @user.last_login_on
+  api.updated_on @user.updated_on
+  api.last_login_on     @user.last_login_on
+  api.passwd_changed_on @user.passwd_changed_on
+  api.avatar_url gravatar_url(@user.mail, {rating: nil, size: nil, default: Setting.gravatar_default}) if @user.mail && Setting.gravatar_enabled?
+  api.twofa_scheme      @user.twofa_scheme if User.current.admin? || (User.current == @user)
   api.api_key    @user.api_key if User.current.admin? || (User.current == @user)
   api.status     @user.status if User.current.admin?