- <%= link_to map_url(month_timespan(stat)), class: "underline hover:no-underline text-#{header_colors.sample}" do %>
+ <%= link_to map_url(timespan(stat.month, stat.year)), class: "underline hover:no-underline text-#{header_colors.sample}" do %>
<%= "#{Date::MONTHNAMES[stat.month]} of #{stat.year}" %>
<% end %>
diff --git a/app/views/visits/index.html.erb b/app/views/visits/index.html.erb
index a4ac4b1a..aac9526e 100644
--- a/app/views/visits/index.html.erb
+++ b/app/views/visits/index.html.erb
@@ -1,11 +1,15 @@
<% content_for :title, "Visits" %>
-
+
Visits
- <%= paginate @visits %>
+
+
+ <%= paginate @visits %>
+
+
<% @visits.each.with_index do |date, index| %>
diff --git a/spec/factories/visits.rb b/spec/factories/visits.rb
index 19ee6eee..56db9d60 100644
--- a/spec/factories/visits.rb
+++ b/spec/factories/visits.rb
@@ -4,5 +4,10 @@ FactoryBot.define do
factory :visit do
area
user
+ started_at { Time.zone.now }
+ ended_at { Time.zone.now + 1.hour }
+ duration { 1.hour }
+ name { 'Visit' }
+ status { 'pending' }
end
end
diff --git a/spec/requests/api/v1/areas_spec.rb b/spec/requests/api/v1/areas_spec.rb
index 03c96dd9..91a9e458 100644
--- a/spec/requests/api/v1/areas_spec.rb
+++ b/spec/requests/api/v1/areas_spec.rb
@@ -5,11 +5,9 @@ require 'rails_helper'
RSpec.describe '/api/v1/areas', type: :request do
let(:user) { create(:user) }
- before { sign_in user }
-
describe 'GET /index' do
it 'renders a successful response' do
- get api_v1_areas_url
+ get api_v1_areas_url(api_key: user.api_key)
expect(response).to be_successful
end
end
@@ -22,12 +20,12 @@ RSpec.describe '/api/v1/areas', type: :request do
it 'creates a new Area' do
expect do
- post api_v1_areas_url, params: { area: valid_attributes }
+ post api_v1_areas_url(api_key: user.api_key), params: { area: valid_attributes }
end.to change(Area, :count).by(1)
end
it 'redirects to the created api_v1_area' do
- post api_v1_areas_url, params: { area: valid_attributes }
+ post api_v1_areas_url(api_key: user.api_key), params: { area: valid_attributes }
expect(response).to have_http_status(:created)
end
@@ -40,12 +38,12 @@ RSpec.describe '/api/v1/areas', type: :request do
it 'does not create a new Area' do
expect do
- post api_v1_areas_url, params: { area: invalid_attributes }
+ post api_v1_areas_url(api_key: user.api_key), params: { area: invalid_attributes }
end.to change(Area, :count).by(0)
end
it 'renders a response with 422 status' do
- post api_v1_areas_url, params: { area: invalid_attributes }
+ post api_v1_areas_url(api_key: user.api_key), params: { area: invalid_attributes }
expect(response).to have_http_status(:unprocessable_entity)
end
end
@@ -58,14 +56,14 @@ RSpec.describe '/api/v1/areas', type: :request do
let(:new_attributes) { attributes_for(:area).merge(name: 'New Name') }
it 'updates the requested api_v1_area' do
- patch api_v1_area_url(area), params: { area: new_attributes }
+ patch api_v1_area_url(area, api_key: user.api_key), params: { area: new_attributes }
area.reload
expect(area.reload.name).to eq('New Name')
end
it 'redirects to the api_v1_area' do
- patch api_v1_area_url(area), params: { area: new_attributes }
+ patch api_v1_area_url(area, api_key: user.api_key), params: { area: new_attributes }
area.reload
expect(response).to have_http_status(:ok)
@@ -77,7 +75,7 @@ RSpec.describe '/api/v1/areas', type: :request do
let(:invalid_attributes) { attributes_for(:area, name: nil) }
it 'renders a response with 422 status' do
- patch api_v1_area_url(area), params: { area: invalid_attributes }
+ patch api_v1_area_url(area, api_key: user.api_key), params: { area: invalid_attributes }
expect(response).to have_http_status(:unprocessable_entity)
end
@@ -89,12 +87,12 @@ RSpec.describe '/api/v1/areas', type: :request do
it 'destroys the requested api_v1_area' do
expect do
- delete api_v1_area_url(area)
+ delete api_v1_area_url(area, api_key: user.api_key)
end.to change(Area, :count).by(-1)
end
it 'redirects to the api_v1_areas list' do
- delete api_v1_area_url(area)
+ delete api_v1_area_url(area, api_key: user.api_key)
expect(response).to have_http_status(:ok)
end
diff --git a/spec/requests/visits_spec.rb b/spec/requests/visits_spec.rb
index fd549df3..1d50e5c5 100644
--- a/spec/requests/visits_spec.rb
+++ b/spec/requests/visits_spec.rb
@@ -12,94 +12,84 @@ require 'rails_helper'
# of tools you can use to make these specs even more expressive, but we're
# sticking to rails and rspec-rails APIs to keep things simple and stable.
-RSpec.describe "/visits", type: :request do
-
+RSpec.describe '/visits', type: :request do
# This should return the minimal set of attributes required to create a valid
# Visit. As you add validations to Visit, be sure to
# adjust the attributes here as well.
- let(:valid_attributes) {
- skip("Add a hash of attributes valid for your model")
- }
+ let(:valid_attributes) do
+ skip('Add a hash of attributes valid for your model')
+ end
- let(:invalid_attributes) {
- skip("Add a hash of attributes invalid for your model")
- }
+ let(:invalid_attributes) do
+ skip('Add a hash of attributes invalid for your model')
+ end
- describe "GET /index" do
- it "renders a successful response" do
+ describe 'GET /index' do
+ it 'renders a successful response' do
Visit.create! valid_attributes
get visits_url
expect(response).to be_successful
end
end
- describe "GET /show" do
- it "renders a successful response" do
+ describe 'GET /show' do
+ it 'renders a successful response' do
visit = Visit.create! valid_attributes
get visit_url(visit)
expect(response).to be_successful
end
end
- describe "GET /new" do
- it "renders a successful response" do
- get new_visit_url
- expect(response).to be_successful
- end
- end
-
- describe "GET /edit" do
- it "renders a successful response" do
+ describe 'GET /edit' do
+ it 'renders a successful response' do
visit = Visit.create! valid_attributes
get edit_visit_url(visit)
expect(response).to be_successful
end
end
- describe "POST /create" do
- context "with valid parameters" do
- it "creates a new Visit" do
- expect {
+ describe 'POST /create' do
+ context 'with valid parameters' do
+ it 'creates a new Visit' do
+ expect do
post visits_url, params: { visit: valid_attributes }
- }.to change(Visit, :count).by(1)
+ end.to change(Visit, :count).by(1)
end
- it "redirects to the created visit" do
+ it 'redirects to the created visit' do
post visits_url, params: { visit: valid_attributes }
expect(response).to redirect_to(visit_url(Visit.last))
end
end
- context "with invalid parameters" do
- it "does not create a new Visit" do
- expect {
+ context 'with invalid parameters' do
+ it 'does not create a new Visit' do
+ expect do
post visits_url, params: { visit: invalid_attributes }
- }.to change(Visit, :count).by(0)
+ end.to change(Visit, :count).by(0)
end
-
it "renders a response with 422 status (i.e. to display the 'new' template)" do
post visits_url, params: { visit: invalid_attributes }
expect(response).to have_http_status(:unprocessable_entity)
end
-
end
end
- describe "PATCH /update" do
- context "with valid parameters" do
- let(:new_attributes) {
- skip("Add a hash of attributes valid for your model")
- }
+ describe 'PATCH /update' do
+ context 'with valid parameters' do
+ let(:new_attributes) do
+ skip('Add a hash of attributes valid for your model')
+ end
- it "updates the requested visit" do
+ it 'updates the requested visit' do
visit = Visit.create! valid_attributes
patch visit_url(visit), params: { visit: new_attributes }
visit.reload
- skip("Add assertions for updated state")
+ skip('Add assertions for updated state')
end
- it "redirects to the visit" do
+ it 'redirects to the visit' do
visit = Visit.create! valid_attributes
patch visit_url(visit), params: { visit: new_attributes }
visit.reload
@@ -107,26 +97,24 @@ RSpec.describe "/visits", type: :request do
end
end
- context "with invalid parameters" do
-
+ context 'with invalid parameters' do
it "renders a response with 422 status (i.e. to display the 'edit' template)" do
visit = Visit.create! valid_attributes
patch visit_url(visit), params: { visit: invalid_attributes }
expect(response).to have_http_status(:unprocessable_entity)
end
-
end
end
- describe "DELETE /destroy" do
- it "destroys the requested visit" do
+ describe 'DELETE /destroy' do
+ it 'destroys the requested visit' do
visit = Visit.create! valid_attributes
- expect {
+ expect do
delete visit_url(visit)
- }.to change(Visit, :count).by(-1)
+ end.to change(Visit, :count).by(-1)
end
- it "redirects to the visits list" do
+ it 'redirects to the visits list' do
visit = Visit.create! valid_attributes
delete visit_url(visit)
expect(response).to redirect_to(visits_url)
diff --git a/spec/swagger/api/v1/areas_controller_spec.rb b/spec/swagger/api/v1/areas_controller_spec.rb
new file mode 100644
index 00000000..609e6d58
--- /dev/null
+++ b/spec/swagger/api/v1/areas_controller_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'swagger_helper'
+
+describe 'Areas API', type: :request do
+ path '/api/v1/areas' do
+ post 'Creates an area' do
+ request_body_example value: {
+ 'name': 'Home',
+ 'latitude': 40.7128,
+ 'longitude': -74.0060,
+ 'radius': 100
+ }
+ tags 'Areas'
+ consumes 'application/json'
+ parameter name: :area, in: :body, schema: {
+ type: :object,
+ properties: {
+ name: { type: :string },
+ latitude: { type: :number },
+ longitude: { type: :number },
+ radius: { type: :number }
+ },
+ required: %w[name latitude longitude radius]
+ }
+ parameter name: :api_key, in: :query, type: :string, required: true, description: 'API Key'
+ response '201', 'area created' do
+ let(:area) { { name: 'Home', latitude: 40.7128, longitude: -74.0060, radius: 100 } }
+ let(:api_key) { create(:user).api_key }
+
+ run_test!
+ end
+ response '422', 'invalid request' do
+ let(:area) { { name: 'Home', latitude: 40.7128, longitude: -74.0060 } }
+ let(:api_key) { create(:user).api_key }
+
+ run_test!
+ end
+ end
+
+ get 'Retrieves all areas' do
+ tags 'Areas'
+ produces 'application/json'
+ parameter name: :api_key, in: :query, type: :string, required: true, description: 'API Key'
+ response '200', 'areas found' do
+ schema type: :array,
+ items: {
+ type: :object,
+ properties: {
+ id: { type: :integer },
+ name: { type: :string },
+ latitude: { type: :number },
+ longitude: { type: :number },
+ radius: { type: :number }
+ },
+ required: %w[id name latitude longitude radius]
+ }
+
+ let(:user) { create(:user) }
+ let(:areas) { create_list(:area, 3, user:) }
+ let(:api_key) { user.api_key }
+
+ run_test!
+ end
+ end
+ end
+end
diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
index ecfa11e2..080d0828 100644
--- a/swagger/v1/swagger.yaml
+++ b/swagger/v1/swagger.yaml
@@ -4,6 +4,87 @@ info:
title: API V1
version: v1
paths:
+ "/api/v1/areas":
+ post:
+ summary: Creates an area
+ tags:
+ - Areas
+ parameters:
+ - name: api_key
+ in: query
+ required: true
+ description: API Key
+ schema:
+ type: string
+ responses:
+ '201':
+ description: area created
+ '422':
+ description: invalid request
+ requestBody:
+ content:
+ application/json:
+ schema:
+ type: object
+ properties:
+ name:
+ type: string
+ latitude:
+ type: number
+ longitude:
+ type: number
+ radius:
+ type: number
+ required:
+ - name
+ - latitude
+ - longitude
+ - radius
+ examples:
+ '0':
+ summary: Creates an area
+ value:
+ name: Home
+ latitude: 40.7128
+ longitude: -74.006
+ radius: 100
+ get:
+ summary: Retrieves all areas
+ tags:
+ - Areas
+ parameters:
+ - name: api_key
+ in: query
+ required: true
+ description: API Key
+ schema:
+ type: string
+ responses:
+ '200':
+ description: areas found
+ content:
+ application/json:
+ schema:
+ type: array
+ items:
+ type: object
+ properties:
+ id:
+ type: integer
+ name:
+ type: string
+ latitude:
+ type: number
+ longitude:
+ type: number
+ radius:
+ type: number
+ required:
+ - id
+ - name
+ - latitude
+ - longitude
+ - radius
"/api/v1/overland/batches":
post:
summary: Creates a batch of points