Merge branch 'master' of ssh://git.yannweb.net:2222/cli/Registra-API into serialize

Gemfile

@@ -34,6 +34,8 @@ group :development do
   gem 'listen', '~> 3.3'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
+  # Generate erd (UML) schema from rails models
+  gem 'rails-erd'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -66,6 +66,7 @@ GEM
       msgpack (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
+    choice (0.2.0)
     concurrent-ruby (1.1.8)
     crass (1.0.6)
     erubi (1.10.0)
@@ -119,6 +120,11 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
+    rails-erd (1.6.1)
+      activerecord (>= 4.2)
+      activesupport (>= 4.2)
+      choice (~> 0.2.0)
+      ruby-graphviz (~> 1.2)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
     railties (6.1.3.1)
@@ -131,6 +137,9 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rexml (3.2.5)
+    ruby-graphviz (1.2.5)
+      rexml
     spring (2.1.1)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
@@ -163,6 +172,7 @@ DEPENDENCIES
   listen (~> 3.3)
   puma (~> 5.0)
   rails (~> 6.1.3, >= 6.1.3.1)
+  rails-erd
   spring
   sqlite3 (~> 1.4)
   table_print (~> 1.5)

app/controllers/api/v1/activities_controller.rb

@@ -1,7 +1,6 @@
 class Api::V1::ActivitiesController < ApplicationController
   before_action :set_activity, only: %i[show update destroy]
   before_action :check_login
-  before_action :check_owner, only: %i[update destroy]
 
   def index
     render json: Activity.all
@@ -14,6 +13,10 @@ class Api::V1::ActivitiesController < ApplicationController
   def create
     activity = current_user.created_activities.build(activity_params)
     if activity.save
+      JoinedUserActivity.create!(
+        user_id: current_user.id,
+        activity_id: activity.id
+      )
       render json: activity, status: :created
     else
       render json: { errors: activity.errors }, status: :unprocessable_entity
@@ -43,8 +46,4 @@ class Api::V1::ActivitiesController < ApplicationController
   def set_activity
     @activity = Activity.find(params[:id])
   end
-
-  def check_owner
-    head :forbidden unless @activity.author_id == current_user&.id
-  end
 end

app/models/activity.rb

@@ -1,6 +1,9 @@
 class Activity < ApplicationRecord
   belongs_to :author, class_name: "User"
   
+  has_one :joined_user_activity
+  has_one :user, :through => :joined_user_activity
+
   validates :name, presence: true
   validates :author, presence: true
 end

app/models/joined_user_activity.rb

@@ -0,0 +1,4 @@
+class JoinedUserActivity < ApplicationRecord
+  belongs_to :user
+  belongs_to :activity
+end

app/models/user.rb

@@ -5,5 +5,9 @@ class User < ApplicationRecord
   validates :password_digest, presence: true
 
   has_many :created_activities, foreign_key: 'author_id', class_name: 'Activity', dependent: :destroy
+
+  has_many :joined_user_activities
+  has_many :activities, :through => :joined_user_activities
+
   has_secure_password
 end

db/migrate/20210429184439_create_joined_user_activities.rb

@@ -0,0 +1,10 @@
+class CreateJoinedUserActivities < ActiveRecord::Migration[6.1]
+  def change
+    create_table :joined_user_activities do |t|
+      t.references :user
+      t.references :activity
+
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_04_13_142821) do
+ActiveRecord::Schema.define(version: 2021_04_29_184439) do
 
   create_table "activities", force: :cascade do |t|
     t.string "name", null: false
@@ -23,6 +23,15 @@ ActiveRecord::Schema.define(version: 2021_04_13_142821) do
     t.index ["name"], name: "index_activities_on_name"
   end
 
+  create_table "joined_user_activities", force: :cascade do |t|
+    t.integer "user_id"
+    t.integer "activity_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["activity_id"], name: "index_joined_user_activities_on_activity_id"
+    t.index ["user_id"], name: "index_joined_user_activities_on_user_id"
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", null: false
     t.string "username", null: false

db/seeds.rb

@@ -2,11 +2,13 @@ User.delete_all
 User.reset_pk_sequence
 Activity.delete_all
 Activity.reset_pk_sequence
+JoinedUserActivity.delete_all
+JoinedUserActivity.reset_pk_sequence
 
 10.times do |i|
   name = Faker::Name.first_name.downcase
   user = User.create! username: "#{name}", email: "#{name}@email.com", password: "azerty"
-  puts "Created user ##{i} - #{user.username}"
+  puts "Created USER ##{i} - #{user.username}"
   
   2.times do
     activity = Activity.create!(
@@ -15,6 +17,12 @@ Activity.reset_pk_sequence
       description: Faker::Company.catch_phrase,
       author_id: user.id
     )
-    puts "Created activity \"#{activity.name}\" for #{activity.client}"
+    puts "Created ACTIVITY \"#{activity.name}\" for #{activity.client}"
+
+    joined_user_activity = JoinedUserActivity.create!(
+      user_id: user.id,
+      activity_id: activity.id
+    )
+    puts "Created ASSOCIATION ##{joined_user_activity.id}"
   end
 end

test/controllers/api/v1/activities_controller_test.rb

@@ -68,15 +68,7 @@ class Api::V1::ActivitiesControllerTest < ActionDispatch::IntegrationTest
     as: :json
     assert_response :forbidden
   end
-
-  test "should forbid update activity - not owner or admin" do
-    patch api_v1_activity_url(@activity),
-    params: { activity: { name: "Updated name" } },
-    headers: { Authorization: JsonWebToken.encode(user_id: users(:two).id) },
-    as: :json
-    assert_response :forbidden
-  end
-
+  
   #DESTROY
   test "should destroy activity" do
     assert_difference "Activity.count", -1 do
@@ -93,13 +85,4 @@ class Api::V1::ActivitiesControllerTest < ActionDispatch::IntegrationTest
     end
     assert_response :forbidden
   end
-
-  test "should forbid destroy activity - not owner or admin" do
-    assert_no_difference('Activity.count') do
-    delete api_v1_activity_url(@activity),
-    headers: { Authorization: JsonWebToken.encode(user_id: users(:two).id) },
-    as: :json
-    end
-    assert_response :forbidden
-  end
 end

test/fixtures/joined_user_activities.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value

test/fixtures/users.yml

@@ -3,9 +3,4 @@
 one:
   email: one@one.com
   username: OneUsername
-  password_digest: <%= BCrypt::Password.create('g00d_pa$$') %>
-
-two:
-  email: two@two.com
-  username: TwoUsername
   password_digest: <%= BCrypt::Password.create('g00d_pa$$') %>

test/models/joined_user_activity_test.rb

@@ -0,0 +1,7 @@
+require "test_helper"
+
+class JoinedUserActivityTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end