Create new achievement via PUT /tasks/:task_id/achievement

This is useful for clients since there is no need to change their
request depending on creating new achievement or updating existing one.

diff --git a/CutenServer/app/controllers/achievements_controller.rb b/CutenServer/app/controllers/achievements_controller.rb
index 86fcb63..1468e2d 100644 (file)
--- a/CutenServer/app/controllers/achievements_controller.rb
+++ b/CutenServer/app/controllers/achievements_controller.rb
@@ -69,12 +69,18 @@ class AchievementsController < ApplicationController
   # PUT /achievements/1.json
   def update
     @achievement = find_achievement params
+    if @achievement.nil? and params.has_key?(:task_id)
+      # create new achievement
+      @achievement = Achievement.new
+      @achievement.user_id = current_user.id
+      @achievement.task_id = params[:task_id]
+    end
     check_user!
 
     respond_to do |format|
       if @achievement.update_attributes(params[:achievement])
         format.html { redirect_to @achievement, notice: 'Achievement was successfully updated.' }
-        format.json { head :no_content }
+        format.json { render :json => @achievement }
       else
         format.html { render action: "edit" }
         format.json { render json: @achievement.errors, status: :unprocessable_entity }

diff --git a/CutenServer/test/integration/access_achievement_json_test.rb b/CutenServer/test/integration/access_achievement_json_test.rb
index cc7d89f..1ebd7f8 100644 (file)
--- a/CutenServer/test/integration/access_achievement_json_test.rb
+++ b/CutenServer/test/integration/access_achievement_json_test.rb
@@ -63,4 +63,16 @@ class AccessAchievementJsonTest < ActionDispatch::IntegrationTest
     alt = JSON.parse @response.body
     assert_equal achievement['result'], alt['result']
   end
+
+  test 'create new achievement via /tasks/:task_id/achievement' do
+    auth_token = obtaion_auth_token @user.email, @password
+
+    task = tasks :two
+    assert_difference('Achievement.count') do
+      put "/tasks/#{task.id}/achievement.json", :auth_token => auth_token, :achievement => { :result => '1, 4, 7' }
+    end
+    assert_response :success
+    achievement = JSON.parse @response.body
+    assert_equal achievement['task_id'], task.id
+  end
 end