Merge pull request #14 from Fatima-hub333/feature/vehicle-model-update

Feature/vehicle model update
Fatima-hub333 · Oct 4, 2022 · eb0a61a · eb0a61a
2 parents d795d21 + c6b7ab3
commit eb0a61a
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 38 deletions.
diff --git a/app/controllers/api/v1/vehicles_controller.rb b/app/controllers/api/v1/vehicles_controller.rb
@@ -44,6 +44,6 @@ def set_vehicle
   end
 
   def vehicle_params
-    params.permit(:brand, :model, :price, :image, :description)
+    params.permit(:brand, :model, :price, :image, :visible, :description)
   end
 end
diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
@@ -22,7 +22,7 @@ def create
   def destroy
     @user = current_user
     if @user
-      render json: { status: 'Success', message: 'signed out', data: @user }, status: :ok
+      render json: { status: 'Success', message: 'signed out', data: @user }, status: 200
       sign_out(@user)
     else
       render json: { status: 'Failed', message: 'There is no user to sign out' }, status: :unauthorized

diff --git a/app/models/vehicle.rb b/app/models/vehicle.rb
@@ -1,5 +1,5 @@
 class Vehicle < ApplicationRecord
-  validates :brand, :model, :description, :image, presence: true
+  validates :brand, :model, :description, :image, :visible, presence: true
   validates :price, numericality: { greater_than_or_equal_to: 0 }
 
   has_many :reservations, dependent: :destroy

diff --git a/db/migrate/20221004054904_add_visble_to_vehicle.rb b/db/migrate/20221004054904_add_visble_to_vehicle.rb
@@ -0,0 +1,5 @@
+class AddVisbleToVehicle < ActiveRecord::Migration[7.0]
+  def change
+    add_column :vehicles, :visible, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -9,11 +9,9 @@
 
 user1 = User.create!(name: 'John Doe', email: '[email protected]', password: 'test123', roles: ['admin'])
 user2 = User.create!(name: 'Jane Doe', email: '[email protected]', password: 'test123', roles: ['admin'])
-user1.confirm
-user2.confirm
-veh1 = Vehicle.create!(brand: 'BWM', model: 'BMW-30', image: 'image-bmw', price: 80, description: 'good and lightspeed with low consumptiom')
-veh2 = Vehicle.create!(brand: 'Macendiz', model: 'Benz-30', image: 'image-Benz', price: 90, description: 'good and lightspeed with low consumptiom')
-veh3 = Vehicle.create!(brand: 'G-Wagon', model: 'G-wagon-15', image: 'image-wagon', price: 95, description: 'good and lightspeed with low consumptiom')
+veh1 = Vehicle.create!(brand: 'BWM', model: 'BMW-30', image: 'image-bmw', price: 80, visible: true, description: 'good and lightspeed with low consumptiom')
+veh2 = Vehicle.create!(brand: 'Macendiz', model: 'Benz-30', image: 'image-Benz', price: 90,  visible: true,description: 'good and lightspeed with low consumptiom')
+veh3 = Vehicle.create!(brand: 'G-Wagon', model: 'G-wagon-15', image: 'image-wagon', price: 95, visible: true, description: 'good and lightspeed with low consumptiom')
 res1 = Reservation.create!(user: user1, vehicle: veh1, date: '24-09-2022', city: 'bravos')
 res1 = Reservation.create!(user: user2, vehicle: veh1,date: '24-09-2022', city: 'capetown')
 res1 = Reservation.create!(user: user2, vehicle: veh3,date: '24-09-2022', city: 'lusaka')

diff --git a/spec/requests/api/v1/vehicles_spec.rb b/spec/requests/api/v1/vehicles_spec.rb
@@ -26,6 +26,7 @@
               model: 'Benz-30',
               price: '90.0',
               image: 'image-Benz',
+              visible: 'true',
               description: 'good and lightspeed with low consumptiom',
               created_at: '2022-10-01T04:51:07.296Z',
               updated_at: '2022-10-01T04:51:07.296Z'
@@ -35,6 +36,7 @@
               brand: 'G-Wagon',
               model: 'G-wagon-15',
               price: '95.0',
+              visible: 'true',
               image: 'image-wagon',
               description: 'good and lightspeed with low consumptiom',
               created_at: '2022-10-01T04:51:07.302Z',
@@ -45,6 +47,7 @@
               brand: 'Farari',
               model: 'BMW',
               price: '450.0',
+              visible: 'true',
               image: 'farari.png',
               description: 'Some text here',
               created_at: '2022-10-01T12:39:00.705Z',
@@ -75,6 +78,7 @@
           model: { type: :string },
           image: { type: :string },
           price: { type: :decimal },
+          visible: { type: :boolean },
           description: { type: :text }
         },
         required: %w[authenticate_token brand model image price description]
@@ -83,7 +87,7 @@
         let(:params) do
           { authentication_token: User.last.authentication_token,
             brand: 'Mecedz', model: 'benz-30', image: 'image-bmw',
-            price: 80, description: 'good and lightspeed with low consumptiom' }
+            price: 80, visible: true, description: 'good and lightspeed with low consumptiom' }
         end
         example 'application/json', 'success', {
           status: 'Success',
@@ -93,6 +97,7 @@
             brand: 'G-Wagon',
             model: 'G-wagon-15',
             price: '95.0',
+            visible: 'true',
             image: 'image-wagon',
             description: 'good and lightspeed with low consumptiom',
             created_at: '2022-10-01T22:01:18.479Z',
@@ -121,7 +126,7 @@
         let(:params) { { authentication_token: User.first.authentication_token } }
         example 'application/json', 'success', {
           status: 'Success', message: 'Loaded vehicle',
-          data: { id: 4, brand: 'BWM', model: 'BMW-30', price: '80.0',
+          data: { id: 4, brand: 'BWM', model: 'BMW-30', price: '80.0', visible: 'true',
                   image: 'image-bmw', description: 'good and lightspeed with low consumptiom',
                   created_at: '2022-10-01T04:51:07.286Z', updated_at: '2022-10-01T04:51:07.286Z' }
         }
@@ -144,11 +149,11 @@
         let(:params) do
           { authentication_token: User.first.authentication_token,
             brand: 'Lambo', model: 'lambo-30', image: 'image-bmw',
-            price: 80, description: 'good and lightspeed with low consumptiom' }
+            price: 80, visible: true, description: 'good and lightspeed with low consumptiom' }
         end
         example 'application/json', 'success', {
           status: 'Success', message: 'Loaded vehicle',
-          data: { id: 4, brand: 'BWM', model: 'BMW-30', price: '80.0',
+          data: { id: 4, brand: 'BWM', model: 'BMW-30', price: '80.0', visible: 'true',
                   image: 'image-bmw', description: 'good and lightspeed with low consumptiom',
                   created_at: '2022-10-01T04:51:07.286Z', updated_at: '2022-10-01T04:51:07.286Z' }
         }
@@ -171,11 +176,11 @@
         let(:params) do
           { authentication_token: User.first.authentication_token,
             brand: 'Lambo', model: 'lambo-30', image: 'image-bmw',
-            price: 80, description: 'good and lightspeed with low consumptiom' }
+            price: 80, visible: true, description: 'good and lightspeed with low consumptiom' }
         end
         example 'application/json', 'success', {
           status: 'Success', message: 'Loaded vehicle',
-          data: { id: 4, brand: 'BWM', model: 'BMW-30', price: '80.0',
+          data: { id: 4, brand: 'BWM', model: 'BMW-30', price: '80.0', visible: 'true',
                   image: 'image-bmw', description: 'good and lightspeed with low consumptiom',
                   created_at: '2022-10-01T04:51:07.286Z', updated_at: '2022-10-01T04:51:07.286Z' }
         }
@@ -199,7 +204,7 @@
         example 'application/json', 'success', {
           status: 'Success', message: 'Loaded vehicle',
           data: { id: 4,
-                  brand: 'BWM', model: 'BMW-30', price: '80.0',
+                  brand: 'BWM', model: 'BMW-30', price: '80.0', visible: 'true',
                   image: 'image-bmw', description: 'good and lightspeed with low consumptiom',
                   created_at: '2022-10-01T04:51:07.286Z', updated_at: '2022-10-01T04:51:07.286Z' }
         }

diff --git a/spec/requests/login_spec.rb b/spec/requests/login_spec.rb
@@ -3,9 +3,7 @@
 RSpec.describe 'users/sign_in', type: :request do
   context 'sign_in' do
     before(:each) do
-      Rails.application.load_seed
-      User.find_by(email: '[email protected]').confirm
-      post user_session_path, params: { email: '[email protected]', password: 'test123' }
+      post user_session_path, params: { email: '[email protected]', password: 'test123' }
     end
     it 'Responds with ok status' do
       puts response
@@ -18,7 +16,7 @@
     end
     it 'Responds data has the email of the user signed in' do
       data = JSON.parse(response.body)['data']
-      expect(data['email']).to eq('john@gmail.com')
+      expect(data['email']).to eq('john123@gmail.com')
     end
   end
 end
diff --git a/spec/requests/reservation_spec.rb b/spec/requests/reservation_spec.rb
@@ -3,8 +3,6 @@
 RSpec.describe '/api/v1/reservation', type: :request do
   context 'Create Reservation ' do
     before(:each) do
-      Rails.application.load_seed
-      User.first.confirm
       get api_v1_reservations_path, params: { authentication_token: User.first.authentication_token }
     end
 
@@ -29,8 +27,6 @@
   end
   context 'Unauthorized access' do
     before(:each) do
-      Rails.application.load_seed
-      User.first.confirm
       get api_v1_reservations_path
     end
     it 'Respnse unauthrozed' do

diff --git a/spec/requests/sign_out_spec.rb b/spec/requests/sign_out_spec.rb
@@ -3,9 +3,7 @@
 RSpec.describe 'users/sign_out', type: :request do
   context 'sign-out existing session' do
     before do
-      Rails.application.load_seed
-      User.find_by(email: '[email protected]').confirm
-      post user_session_path, params: { email: '[email protected]', password: 'test123' }
+      post user_session_path, params: { email: '[email protected]', password: 'test123' }
       delete destroy_user_session_path
     end
     it 'Responds with ok status' do
@@ -17,7 +15,7 @@
     end
     it 'Responds data has email of the user signed out' do
       data = JSON.parse(response.body)['data']
-      expect(data['email']).to eq('john@gmail.com')
+      expect(data['email']).to eq('john123@gmail.com')
     end
   end
 

diff --git a/spec/requests/users/sessions_spec.rb b/spec/requests/users/sessions_spec.rb
@@ -16,8 +16,6 @@
       }
 
       response(200, 'successful') do
-        @user = User.last
-        @user.confirm
         let(:params) { { email: '[email protected]', password: 'test123' } }
         example 'application/json', :successfull_login, {
           status: 'Success',
@@ -47,5 +45,21 @@
       end
     end
   end
+
+  path '/users/sign_out' do
+    delete('delete session') do
+      tags 'Sign-out'
+      description ' Signs out user in session'
+      produces 'application/json'
+
+      response(401, 'unauthorized') do
+        example 'application/json', :unauthorized, {
+          status: 'Failed',
+          message: 'There is no user to sign out'
+        }
+        run_test!
+      end
+    end
+  end
 end
 # rubocop:enable Metrics/BlockLength
diff --git a/spec/requests/vehicles_spec.rb b/spec/requests/vehicles_spec.rb
@@ -4,8 +4,6 @@
 RSpec.describe '/api/v1/vehicles', type: :request do
   context 'Get vehicles ' do
     before(:each) do
-      Rails.application.load_seed
-      User.first.confirm
       get api_v1_vehicles_path, params: { authentication_token: User.first.authentication_token }
     end
 
@@ -19,7 +17,6 @@
       data = JSON.parse(response.body)
       expect(data['message']).to eq('Loaded vehicle')
     end
-
     it 'List brand Vehicle' do
       get api_v1_vehicle_path(Vehicle.first.id), params: { authentication_token: User.first.authentication_token }
       data = JSON.parse(response.body)['data']['brand']
@@ -29,19 +26,18 @@
       post api_v1_vehicles_path,
            params: { authentication_token: User.first.authentication_token,
                      brand: 'Mecedz', model: 'benz-30', image: 'image-bmw',
-                     price: 80, description: 'good and lightspeed with low consumptiom' }
+                     price: 80, visible: true, description: 'good and lightspeed with low consumptiom' }
       data = JSON.parse(response.body)
       expect(data['message']).to eq('Created Vehicle')
     end
     it 'Update a vehicle' do
       patch api_v1_vehicle_path(Vehicle.last.id),
             params: { authentication_token: User.first.authentication_token,
                       brand: 'Lambo', model: 'lambo-30', image: 'image-bmw',
-                      price: 80, description: 'good and lightspeed with low consumptiom' }
+                      price: 80, visible: true, description: 'good and lightspeed with low consumptiom' }
       data = JSON.parse(response.body)
       expect(data['message']).to eq('Updeted Vehicle Succesfully')
     end
-
     it 'Deletes a vehicle' do
       delete api_v1_vehicle_path(Vehicle.last.id), params: { authentication_token: User.first.authentication_token }
       data = JSON.parse(response.body)
@@ -50,8 +46,6 @@
   end
   context 'Unauthorized access' do
     before(:each) do
-      Rails.application.load_seed
-      User.first.confirm
       get api_v1_vehicles_path
     end
     it 'Respnse unauthrozed' do

diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
@@ -187,13 +187,15 @@ paths:
                       model: Benz-30
                       price: '90.0'
                       image: image-Benz
+                      visible: 'true'
                       description: good and lightspeed with low consumptiom
                       created_at: '2022-10-01T04:51:07.296Z'
                       updated_at: '2022-10-01T04:51:07.296Z'
                     - id: 6
                       brand: G-Wagon
                       model: G-wagon-15
                       price: '95.0'
+                      visible: 'true'
                       image: image-wagon
                       description: good and lightspeed with low consumptiom
                       created_at: '2022-10-01T04:51:07.302Z'
@@ -202,6 +204,7 @@ paths:
                       brand: Farari
                       model: BMW
                       price: '450.0'
+                      visible: 'true'
                       image: farari.png
                       description: Some text here
                       created_at: '2022-10-01T12:39:00.705Z'
@@ -236,6 +239,7 @@ paths:
                       brand: G-Wagon
                       model: G-wagon-15
                       price: '95.0'
+                      visible: 'true'
                       image: image-wagon
                       description: good and lightspeed with low consumptiom
                       created_at: '2022-10-01T22:01:18.479Z'
@@ -256,6 +260,8 @@ paths:
                   type: string
                 price:
                   type: decimal
+                visible:
+                  type: boolean
                 description:
                   type: text
               required:
@@ -304,6 +310,7 @@ paths:
                       brand: BWM
                       model: BMW-30
                       price: '80.0'
+                      visible: 'true'
                       image: image-bmw
                       description: good and lightspeed with low consumptiom
                       created_at: '2022-10-01T04:51:07.286Z'
@@ -339,6 +346,7 @@ paths:
                       brand: BWM
                       model: BMW-30
                       price: '80.0'
+                      visible: 'true'
                       image: image-bmw
                       description: good and lightspeed with low consumptiom
                       created_at: '2022-10-01T04:51:07.286Z'
@@ -374,6 +382,7 @@ paths:
                       brand: BWM
                       model: BMW-30
                       price: '80.0'
+                      visible: 'true'
                       image: image-bmw
                       description: good and lightspeed with low consumptiom
                       created_at: '2022-10-01T04:51:07.286Z'
@@ -409,6 +418,7 @@ paths:
                       brand: BWM
                       model: BMW-30
                       price: '80.0'
+                      visible: 'true'
                       image: image-bmw
                       description: good and lightspeed with low consumptiom
                       created_at: '2022-10-01T04:51:07.286Z'
@@ -518,6 +528,22 @@ paths:
               required:
               - email
               - password
+  "/users/sign_out":
+    delete:
+      summary: delete session
+      tags:
+      - Sign-out
+      description: " Signs out user in session"
+      responses:
+        '401':
+          description: unauthorized
+          content:
+            application/json:
+              examples:
+                unauthorized:
+                  value:
+                    status: Failed
+                    message: There is no user to sign out
 servers:
 - url: https://{herokuapp}
   variables: