Merge pull request #38 from UNICEF01/testing

Sprint #2 - 29/10 09/11

app/Child.php

@@ -451,6 +451,7 @@ public function buildSearchDocument() : array {
 
 		if($this->currentCase) {
 			$data['case_status'] = $this->currentCase->case_status;
+            $data['cancel_reason'] = $this->currentCase->cancel_reason;
 
 			if($this->currentCase->case_cause_ids) { // TODO: refactor this
 				$data['cause_name'] = join(", ", array_map(function ($cause_id) {

app/Http/Controllers/Resources/GroupsController.php

@@ -57,10 +57,19 @@ public function store() {
 
 	public function update_settings(Group $group) {
 		$settings = $group->getSettings();
+
+		if( strtolower($group->name) == "secretaria municipal de educação" || strtolower($group->name) == "secretaria de educação" ){
+            $request = request('settings', []);
+            foreach ($request['alerts'] as $key => $alert){
+                if($key !== 500 AND $alert !== true){
+                    return response()->json(['status' => 'error', 'message' => 'O grupo Secretaria Municipal de Educação, obrigatoriamente, deve estar selecionado para todos os motivos de evasão escolar.' ], 405);
+                }
+            }
+		}
+
 		$settings->update( request('settings', []) );
 		$group->setSettings($settings);
-
-		return response()->json(['status' => 'ok']);
+        return response()->json(['status' => 'ok']);
 	}
 
 	public function update(Group $group) {

app/Transformers/ChildSearchResultsTransformer.php

@@ -65,6 +65,8 @@ public function transform($document) {
 			'deadline_status' => $document['_source']['deadline_status'] ?? null,
 			'alert_status' => $document['_source']['alert_status'] ?? null,
 
+            'cancel_reason' => $document['_source']['cancel_reason'] ?? null,
+
 			'created_at' => isset($document['_source']['created_at']) ? Carbon::createFromTimestamp(strtotime($document['_source']['created_at']))->toIso8601String() : null,
 			'updated_at' => isset($document['_source']['updated_at']) ? Carbon::createFromTimestamp(strtotime($document['_source']['updated_at']))->toIso8601String() : null,
 

deploy.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
-git pull origin master
 composer install --no-interaction --prefer-dist --optimize-autoloader
 echo "" | sudo -S service php7.1-fpm reload
 
 if [ -f artisan ]
 then
     php artisan migrate --force
     php artisan cache:clear
-    php artisan queue:work --timeout=0
+    #php artisan queue:work --timeout=0
     php artisan optimize
 fi