TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1532 from opf/revert-1528-feature/api_work_package_embedded_activities

Browse Source 
Revert "Feature/api work package embedded activities"
pull/1533/merge
Alex Coles 10 years ago
parent 70124f9a31 348420a03f
commit d4366dac54
14 changed files with 8 additions and 170 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      config/environments/development.rb
  2. 1
      config/environments/test.rb
  3. 46
      lib/api/v3/activities/activity_model.rb
  4. 91
      lib/api/v3/activities/activity_representer.rb
  5. 4
      lib/api/v3/queries/queries_api.rb
  6. 0
      lib/api/v3/users/user_model.rb
  7. 4
      lib/api/v3/work_packages/work_package_model.rb
  8. 17
      lib/api/v3/work_packages/work_package_representer.rb
  9. 4
      lib/api/v3/work_packages/work_packages_api.rb
  10. 2
      spec/api/work_package_resource_spec.rb
  11. 2
      test/fixtures/files/140702104449_testfile.txt
  12. 2
      test/fixtures/files/140702105601_testfile.txt
  13. 2
      test/fixtures/files/140702110219_testfile.txt
  14. 2
      test/unit/helpers/application_helper_test.rb

1
config/environments/development.rb
Unescape View File

@ -69,5 +69,4 @@ OpenProject::Application.configure do
# Send mails to browser window
config.action_mailer.delivery_method = :letter_opener
config.action_controller.default_url_options = { host: 'localhost', port: 3000 }
end

1
config/environments/test.rb
Unescape View File

@ -69,5 +69,4 @@ OpenProject::Application.configure do
# we use per process memory for caching in the test environment
config.cache_store = :memory_store
config.action_controller.default_url_options = { host: 'localhost', port: 3000 }
end

46
lib/api/v3/activities/activity_model.rb
Unescape View File

@ -1,46 +0,0 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
require 'reform'
require 'reform/form/coercion'
module API
module V3
module Activities
class ActivityModel < Reform::Form
include Composition
include Coercion
model :journal
property :user_id, on: :journal, type: Integer
end
end
end
end

91
lib/api/v3/activities/activity_representer.rb
Unescape View File

@ -1,91 +0,0 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2014 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
require 'roar/decorator'
require 'roar/representer/json/hal'
module API
module V3
module Activities
class ActivityRepresenter < Roar::Decorator
include Roar::Representer::JSON::HAL
include Roar::Representer::Feature::Hypermedia
include Rails.application.routes.url_helpers
self.as_strategy = API::Utilities::CamelCasingStrategy.new
property :_type, exec_context: :decorator
link :self do
{ href: "#{root_url}/api/v3/activities/#{represented.journal.id}", title: "#{represented.journal.id}" }
end
link :work_package do
{ href: "#{root_url}/api/v3/work_packages/#{represented.journal.journable.id}", title: "#{represented.journal.journable.subject}" }
end
link :user do
{ href: "#{root_url}/api/v3/users/#{represented.journal.user.id}", title: "#{represented.journal.user.name} - #{represented.journal.user.login}" }
end
property :id, getter: -> (*) { journal.id }, render_nil: true
property :user_id, render_nil: true
property :user_name, getter: -> (*) { journal.user.try(:name) }, render_nil: true
property :user_login, getter: -> (*) { journal.user.try(:login) }, render_nil: true
property :user_mail, getter: -> (*) { journal.user.try(:mail) }, render_nil: true
property :messages, exec_context: :decorator, render_nil: true
property :version, getter: -> (*) { journal.version }, render_nil: true
property :created_at, getter: -> (*) { journal.created_at.utc.iso8601 }, render_nil: true
def _type
if represented.journal.notes.blank?
'Activity'
else
'Activity::Comment'
end
end
def messages
journal = represented.journal
if journal.notes.blank?
journal.details.map{ |d| journal.render_detail(d, no_html: true) }
else
[journal.notes]
end
end
private
def default_url_options
ActionController::Base.default_url_options
end
end
end
end
end

4
lib/api/v3/queries/queries_api.rb
Unescape View File

@ -12,8 +12,8 @@ module API
before do
@query = Query.find(params[:id])
model = ::API::V3::Queries::QueryModel.new(query: @query)
@representer = ::API::V3::Queries::QueryRepresenter.new(model)
model = QueryModel.new(query: @query)
@representer = QueryRepresenter.new(model)
end
helpers do

0
lib/api/v3/users/user_model.rb
Unescape View File

4
lib/api/v3/work_packages/work_package_model.rb
Unescape View File

@ -99,10 +99,6 @@ module API
work_package.done_ratio = value
end
def activities
work_package.journals.map{ |journal| Activities::ActivityModel.new(journal: journal) }
end
validates_presence_of :subject, :project_id, :type, :author, :status
validates_length_of :subject, maximum: 255
end

17
lib/api/v3/work_packages/work_package_representer.rb
Unescape View File

@ -40,15 +40,10 @@ module API
self.as_strategy = API::Utilities::CamelCasingStrategy.new
def initialize(options = {}, *expand)
@expand = expand
super(options)
end
property :_type, exec_context: :decorator
link :self do
{ href: "#{root_url}/api/v3/work_packages/#{represented.work_package.id}", title: "#{represented.subject}" }
{ href: "http://localhost:3000/api/v3/work_packages/#{represented.work_package.id}", title: "#{represented.subject}" }
end
property :id, getter: -> (*) { work_package.id }, render_nil: true
@ -79,16 +74,8 @@ module API
property :created_at, getter: -> (*) { work_package.created_at.utc.iso8601}, render_nil: true
property :updated_at, getter: -> (*) { work_package.updated_at.utc.iso8601}, render_nil: true
collection :activities, embedded: true, class: Activities::ActivityModel, decorator: Activities::ActivityRepresenter
def _type
'WorkPackage'
end
private
def default_url_options
ActionController::Base.default_url_options
"WorkPackage"
end
end
end

4
lib/api/v3/work_packages/work_packages_api.rb
Unescape View File

@ -12,8 +12,8 @@ module API
before do
@work_package = WorkPackage.find(params[:id])
model = ::API::V3::WorkPackages::WorkPackageModel.new(work_package: @work_package)
@representer = ::API::V3::WorkPackages::WorkPackageRepresenter.new(model, :activities, :users)
model = WorkPackageModel.new(work_package: @work_package)
@representer = WorkPackageRepresenter.new(model)
end
get do

2
spec/api/work_package_resource_spec.rb
Unescape View File

@ -68,7 +68,7 @@ describe 'API v3 Work package resource' do
it 'should respond with work package in HAL+JSON format' do
parsed_response = JSON.parse(last_response.body)
parsed_response['id'].should eq(work_package.id)
parsed_response.should eq(expected_response)
end
context 'requesting nonexistent work package' do

2
test/fixtures/files/140702104449_testfile.txt vendored
Unescape View File

@ -1,2 +0,0 @@
this is a text file for upload tests
with multiple lines

2
test/fixtures/files/140702105601_testfile.txt vendored
Unescape View File

@ -1,2 +0,0 @@
this is a text file for upload tests
with multiple lines

2
test/fixtures/files/140702110219_testfile.txt vendored
Unescape View File

@ -1,2 +0,0 @@
this is a text file for upload tests
with multiple lines

2
test/unit/helpers/application_helper_test.rb
Unescape View File

@ -522,7 +522,7 @@ RAW
link_to_project(@project, :action => 'settings')
assert_equal %(<a href="/projects/#{p_id}/settings/members">#{p_name}</a>),
link_to_project(@project, :action => 'settings', :tab => 'members')
assert_equal %(<a href="#{root_url}projects/#{p_id}?jump=blah">#{p_name}</a>),
assert_equal %(<a href="http://test.host/projects/#{p_id}?jump=blah">#{p_name}</a>),
link_to_project(@project, {:only_path => false, :jump => 'blah'})
assert_equal %(<a href="/projects/#{p_id}/settings" class="project">#{p_name}</a>),
link_to_project(@project, {:action => 'settings'}, :class => "project")

Write Preview
Loading…
Cancel
Save