Grupo 1 - Sprint 2 - Calendario de atividades

Gemfile

@@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.3'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
@@ -52,6 +52,7 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'factory_bot_rails'
 end
 
 group :test do
@@ -64,6 +65,9 @@ group :test do
   # database_cleaner is not required, but highly recommended
   gem 'database_cleaner'
   gem 'shoulda-matchers'
+  # Factory
+  gem 'factory_bot_rails'
+  gem 'rails-controller-testing'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -133,13 +133,13 @@ GEM
     multi_json (1.14.1)
     multi_test (0.1.2)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     pg (1.1.4)
     public_suffix (4.0.1)
-    puma (3.12.1)
-    rack (2.0.7)
+    puma (3.12.6)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.3)
@@ -243,7 +243,7 @@ GEM
       selenium-webdriver (>= 3.0, < 4.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -261,7 +261,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   listen (>= 3.0.5, < 3.2)
   pg (>= 0.18, < 2.0)
-  puma (~> 3.11)
+  puma (~> 3.12)
   rails (~> 5.2.3)
   rspec-rails
   sass-rails (~> 5.0)

README.md

@@ -1,24 +1,30 @@
-# README
+# GRUPO 1 - Sprint 2
 
-This README would normally document whatever steps are necessary to get the
-application up and running.
+* Carlos Eduardo de Sousa - 160057701
+* Edilton Costa Alves - 170002365
+* Eduardo Vaz Fagundes Rech - 180075161
+* Estevam Galvão Albuquerque - 160005663
+* Kalley Wilkerson Rodrigues Alexandre - 170038050
 
-Things you may want to cover:
 
-* Ruby version
+## NOME DO PROJETO
+#### Calendário de atividades - secretaria-ppgi
 
-* System dependencies
+## ESCOPO DO PROJETO
+* Teste para cadastro de atividade e seu prazo de execução;
+* Teste para inclusão de pessoas interessadas em cada atividade;
+* Teste para notificação de pessoas interessadas;
+* Teste para visualização de atividades cadastradas;
+* Teste para visualização de atividades de interesse.
 
-* Configuration
 
-* Database creation
+## ATRIBUIÇÕES
 
-* Database initialization
+### Scrum Master
+#### Carlos Eduardo de Sousa - 160057701
 
-* How to run the test suite
+### Product Owner
+#### Kalley Wilkerson Rodrigues Alexandre - 170038050
 
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
+## Problemas
+Não foi possível fazer uma boa verificação se o usuário logado é administrador ou não à tempo, a execução do cucumber não permite o acesso a dados da sessão. Portanto, o método que a gente criou que fazia essa verificação, por mais que funcionasse como esperado na execução normal da aplicação, não funcionava nos testes.

app/assets/javascripts/user_activities.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/user_activities.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the UserActivities controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/activities_controller.rb

@@ -0,0 +1,41 @@
+class ActivitiesController < ApplicationController
+    def index
+        @activities = Activity.all
+    end
+
+    def new
+    end
+
+    def create
+        @activity = Activity.new(activity_params)
+        if @activity.save
+            flash[:notice] = "Atividade cadastrada com sucesso."
+            redirect_to activities_path
+        elsif @activity.errors.any?
+            flash[:notice] = ["Atividade não cadastrada."]
+            @activity.errors.each do |attribute, message|
+                flash[:notice] << message
+            end
+          redirect_back(fallback_location: new_activity_path)
+       end
+    end
+
+    def destroy
+        @activity = Activity.find(params[:id])
+        if @activity.destroy
+            flash[:notice] = "Atividade deleteda com sucesso."
+            redirect_to activities_path
+        elsif @activity.errors.any?
+            flash[:notice] = ["Não foi possível deletar a Atividade."]
+            @activity.errors.each do |attribute, message|
+                flash[:notice] << message
+            end
+          redirect_back(fallback_location: root_path)
+        end
+    end
+
+    private
+        def activity_params
+            params.fetch(:activity, {}).permit(:title, :due_date)
+        end
+end

app/controllers/notifications_controller.rb

@@ -0,0 +1,6 @@
+class NotificationsController < ApplicationController
+    def create
+        flash[:notice] = "Notificação enviada aos interessados com sucesso."
+        redirect_to activities_path
+    end
+end

app/controllers/user_activities_controller.rb

@@ -0,0 +1,78 @@
+class UserActivitiesController < ApplicationController
+	def index
+		@user_activities = UserActivity.all
+	end
+
+	def new
+	end
+
+	def create
+		@user_activity = UserActivity.new(user_activity_params)
+		if @user_activity.save
+			notify(@user_activity.user_id, @user_activity.activity_id, "cadastrado")
+			redirect_to user_activities_path
+		elsif @user_activity.errors.any?
+			error(@user_activity.user_id, @user_activity.activity_id, "cadastrar")
+		end
+	end
+
+	def self.create(user_id, activity_id)
+		if UserActivity.find_by(user_id: user_id, activity_id: activity_id) == nil
+			@user_activity = UserActivity.new
+			@user_activity.user_id = user_id
+			@user_activity.activity_id = activity_id
+			@user_activity.interested = true
+			@user_activity.active = false
+			@user_activity.save!
+		end
+	end
+
+	def show
+		@user_activity = find
+	end
+
+	def edit
+		@user_activity = find
+	end
+
+	def update
+		@user_activity = find
+		if @user_activity.update(update_user_activity_params)
+			notify(UserActivity.getUser(@user_activity.user_id), UserActivity.getActivity(@user_activity.activity_id), "atualizado")
+			redirect_to user_activities_path
+		elsif @user_activity.errors.any?
+			error(UserActivity.getUser(@user_activity.user_id), UserActivity.getActivity(@user_activity.activity_id), "atualizar")
+		end
+	end
+
+	def destroy
+		@user_activity = find
+		if @user_activity.destroy
+			notify(UserActivity.getUser(@user_activity.user_id), UserActivity.getActivity(@user_activity.activity_id), "deletado")
+			redirect_to user_activities_path
+		elsif @user_activity.errors.any?
+			error(UserActivity.getUser(@user_activity.user_id), UserActivity.getActivity(@user_activity.activity_id), "deletar")
+		end
+	end
+
+	private
+		def user_activity_params
+			params.require(:user_activity).permit(:user_id, :activity_id)
+		end
+
+		def update_user_activity_params
+			params.require(:user_activity).permit(:user_id, :activity_id, :interested, :active)
+		end
+
+		def find
+			UserActivity.find(params[:id])
+		end
+
+		def notify(name, title, msg)
+			flash[:notice] = "#{title} #{msg} de #{name} com sucesso"
+		end
+
+		def error(name, title, msg) 
+			flash[:notice] = "Não foi possível #{msg} #{name} de #{title}"
+		end
+end

app/helpers/user_activities_helper.rb

@@ -0,0 +1,2 @@
+module UserActivitiesHelper
+end

app/models/activity.rb

@@ -0,0 +1,4 @@
+class Activity < ApplicationRecord
+    validates :title, presence: { message: "O Nome da atividade deve ser informado." }
+    validates :due_date, presence: { message: "O Prazo de execução da atividade deve ser informado." }
+end

app/models/user_activity.rb

@@ -0,0 +1,12 @@
+class UserActivity < ApplicationRecord
+	validates :user_id, presence: { message: "Usuário deve ser informado." }
+    validates :activity_id, presence: { message: "Atividade deve ser informada." }
+
+    def self.getUser(user_id)
+    	User.find_by(id: user_id).full_name
+    end
+
+    def self.getActivity(activity_id)
+    	Activity.find_by(id: activity_id).title
+    end
+end

app/views/activities/index.html.erb

@@ -0,0 +1,27 @@
+<h1>Atividades</h1>
+
+<%= link_to 'Adicionar atividade', new_activity_path %>
+<br>
+<%= link_to 'Notificar integrantes', new_notification_path %>
+
+<table>
+  <tr>
+    <th>Título</th>
+    <th>Prazo de execução</th>
+    <th>Descrição</th>
+    <th></th>
+  </tr>
+
+  <% @activities.each do |activity| %>
+    <tr>
+      <td><%= activity.title %></td>
+      <td><%= activity.due_date.to_formatted_s(:rfc822) %></td>
+      <td><%= activity.description %></td>
+      <td><%= check_box_tag(:interest, false, false, :onclick => "UserActivitiesController.create(current_user.id, activity.id);") %></td>
+      <td>Demonstrar Interesse</td>
+      <td><%= link_to 'Remover Atividade', activity_path(activity),  :method => :delete, :confirm => 'Tem certeza ?' %></td>
+    </tr>
+  <% end %>
+</table>
+<br>
+<%= link_to 'Minhas Atividades de interesse', user_activities_path %>

app/views/activities/new.html.erb

@@ -0,0 +1,17 @@
+<h1>Cadastrar nova atividade</h1>
+
+<%= form_with scope: :activity, url: activities_path,local: true do |form| %>
+  <p>
+    <%= form.label :title, "Nome da atividade" %><br>
+    <%= form.text_field :title %>
+  </p>
+
+  <p>
+    <%= form.label :due_date, "Prazo de execução" %><br>
+    <%= form.date_field :due_date %>
+  </p>
+
+  <p>
+    <%= form.submit "Salvar" %>
+  </p>
+<% end %>

app/views/notifications/index.html.erb

@@ -0,0 +1 @@
+<h1>Notifications</h1>

app/views/notifications/new.html.erb

@@ -0,0 +1,22 @@
+<h1>Criar nova notificação</h1>
+
+<%= form_with scope: :notification, url: notifications_path,local: true do |form| %>
+
+  <p>
+    <%= form.label :title, "Nome da notificação" %><br>
+    <%= form.text_field :title %>
+  </p>
+
+  <p>
+    <%= form.label :content, "Conteúdo da notificação" %><br>
+    <%= form.text_area :content %>
+  </p>
+
+  <p>
+    <%= form.label :interested, "Integrantes interessados" %><br>
+    <%= form.collection_select(:interested, User.roles, :second, :first) %>
+  </p>
+  <p>
+    <%= form.submit "Enviar notificação" %>
+  </p>
+<% end %>

app/views/user_activities/edit.html.erb

@@ -0,0 +1,35 @@
+<h1> Cadastrar Usúario na Atividade </h1>
+
+<%= form_with(model: @user_activity, local: true) do |form| %>
+<p>
+	<%= form.label :user_id, "Id do usupario" %><br>
+  	<%= form.text_field :user_id, value: @user_activity.user_id %>
+</p>
+
+<p>
+	<%= form.label :activity_id, " Id da Atividade" %><br>
+  	<%= form.text_field :activity_id, value: @user_activity.activity_id %>
+</p>
+
+<p>
+	<%= form.label :interested, "Interessado" %><br>
+    <%= form.radio_button :interested, "True", :checked => true %>
+    <%= form.label :active, "True" %>
+    <%= form.radio_button :interested, "False" %>
+    <%= form.label :active, "False" %>
+</p>
+
+<p>
+    <%= form.label :active, "Cadastrado" %><br>
+    <%= form.radio_button :active, "True" %>
+    <%= form.label :active, "True" %>
+    <%= form.radio_button :active, "False" %>
+    <%= form.label :active, value: "False" %>
+</p>
+
+<p>
+    <%= form.submit "Salvar" %>
+</p>
+<% end %>
+
+<%= link_to 'Back', user_activities_path %>