Develop to homolog

src/protected/application/conf/conf-base.d/routes.php

@@ -69,7 +69,8 @@
             'agente'        => 'agent',
             'evento'        => 'event',
             'inscricao'     => 'registration',
-            'prestacoes-de-contas' => 'accountability'
+            'prestacoes-de-contas' => 'accountability',
+            'contrarrazoes' => 'counterArguments',
         ],
 
         'readableNames' => [
@@ -98,4 +99,4 @@
             'search'        => i::__('Busca')
         ]
     ]
-];
+];

src/protected/application/lib/MapasCulturais/Controllers/Panel.php

@@ -429,4 +429,14 @@ function GET_accountability()
             'isFiscal' => $oppAsFiscal ? true : false,
         ]);
     }
+
+    public function GET_counterArguments()
+    {
+        $this->requireAuthentication();
+
+        $userId = App::i()->getUser()->id;
+        $counterArguments = App::i()->repo('CounterArgument')->getAllByUserId($userId);
+
+        $this->render('counter-arguments', ['counterArguments' => $counterArguments]);
+    }
 }

src/protected/application/lib/MapasCulturais/Entities/CounterArgument.php

@@ -3,18 +3,28 @@
 namespace MapasCulturais\Entities;
 
 use Doctrine\ORM\Mapping as ORM;
-use MapasCulturais\App;
+use MapasCulturais\Traits;
 
 /**
  * CounterArgument
  * 
  * @ORM\Table(name="counter_argument")
  * @ORM\Entity
- * @ORM\entity(repositoryClass="MapasCulturais\Repository")
+ * @ORM\entity(repositoryClass="MapasCulturais\Repositories\CounterArgument")
  */
 class CounterArgument extends \MapasCulturais\Entity
 {
-    const STATUS_SEND = self::STATUS_ENABLED;
+    use Traits\EntityFiles;
+
+    const STATUS_WAITING = self::STATUS_ENABLED;
+    const STATUS_DEFERRED = 10;
+    const STATUS_REJECTED = 3;
+
+    const STATUSES = [
+        self::STATUS_WAITING => 'Aguardando resposta',
+        self::STATUS_DEFERRED => 'Deferida',
+        self::STATUS_REJECTED => 'Indeferida',
+    ];
 
     /**
      * @var integer
@@ -38,18 +48,33 @@ class CounterArgument extends \MapasCulturais\Entity
      *
      * @ORM\Column(name="status", type="smallint", nullable=false)
      */
-    protected $status = self::STATUS_SEND;
+    protected $status = self::STATUS_WAITING;
 
     /**
      * @var \MapasCulturais\Entities\Registration
      *
-     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\Registration", inversedBy="CounterArgument\Entities\CounterArgument", cascade={"persist"})
+     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\Registration", cascade={"persist"})
      * @ORM\JoinColumns({
      *   @ORM\JoinColumn(name="registration_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
      * })
      */
     protected $registration;
 
+    /**
+     * @var \MapasCulturais\Entities\CounterArgumentFile[] Files
+     *
+     * @ORM\OneToMany(targetEntity="MapasCulturais\Entities\CounterArgumentFile", fetch="EXTRA_LAZY", mappedBy="owner", cascade="remove", orphanRemoval=true)
+     * @ORM\JoinColumn(name="id", referencedColumnName="object_id", onDelete="CASCADE")
+     */
+    protected $__files;
+
+    /**
+     * @var \MapasCulturais\Entities\CounterArgumentResponse|null
+     *
+     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\CounterArgumentResponse", mappedBy="counterArgument", fetch="LAZY")
+     */
+    protected $response;
+
     /**
      * @var \DateTime
      *
@@ -63,11 +88,4 @@ class CounterArgument extends \MapasCulturais\Entity
      * @ORM\Column(name="update_timestamp", type="datetime", nullable=true)
      */
     protected $updateTimestamp;
-
-    public function send(array $data)
-    {
-        $this->text = $data['text'];
-        $this->registration = App::i()->repo('Registration')->find($data['registration']);
-        $this->save();
-    }
 }

src/protected/application/lib/MapasCulturais/Entities/CounterArgumentResponse.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace MapasCulturais\Entities;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * CounterArgumentResponse
+ * 
+ * @ORM\Table(name="counter_argument_response")
+ * @ORM\Entity
+ * @ORM\entity(repositoryClass="MapasCulturais\Repositories\CounterArgument")
+ */
+class CounterArgumentResponse extends \MapasCulturais\Entity
+{
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer", nullable=false)
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="SEQUENCE")
+     * @ORM\SequenceGenerator(sequenceName="counter_argument_response_id_seq", allocationSize=1, initialValue=1)
+     */
+    protected $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="text", type="text", nullable=false)
+     */
+    protected $text;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="published", type="boolean", nullable=false)
+     */
+    protected $published = false;
+
+    /**
+     * @var \MapasCulturais\Entities\Agent
+     *
+     * @ORM\ManyToOne(targetEntity="MapasCulturais\Entities\Agent", fetch="LAZY")
+     * @ORM\JoinColumns({
+     *   @ORM\JoinColumn(name="agent_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
+     * })
+     */
+    protected $owner;
+
+    /**
+     * @var \MapasCulturais\Entities\CounterArgument
+     *
+     * @ORM\OneToOne(targetEntity="MapasCulturais\Entities\CounterArgument", cascade={"persist"})
+     * @ORM\JoinColumns({
+     *   @ORM\JoinColumn(name="counter_argument_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
+     * })
+     */
+    protected $counterArgument;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="create_timestamp", type="datetime", nullable=false)
+     */
+    protected $createTimestamp;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="update_timestamp", type="datetime", nullable=true)
+     */
+    protected $updateTimestamp;
+}

src/protected/application/lib/MapasCulturais/Repositories/CounterArgument.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace MapasCulturais\Repositories;
+
+use MapasCulturais\App;
+use MapasCulturais\Entities\CounterArgument as CounterArgumentEntity;
+
+class CounterArgument extends \MapasCulturais\Repository
+{
+    public function getAllByUserId(int $userId): array
+    {
+        $qb = App::i()->em->createQueryBuilder();
+        $qb->select('ca')
+            ->from(CounterArgumentEntity::class, 'ca')
+            ->innerJoin('ca.registration', 'r')
+            ->innerJoin('r.owner', 'a')
+            ->where('a.user = :userId')
+            ->setParameter('userId', $userId);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function getAllByOpportunityId($opportunityId): array
+    {
+        $qb = App::i()->em->createQueryBuilder();
+        $qb->select('ca')
+            ->from(CounterArgumentEntity::class, 'ca')
+            ->innerJoin('ca.registration', 'r')
+            ->where('r.opportunity = :opportunityId')
+            ->setParameter('opportunityId', $opportunityId);
+
+        return $qb->getQuery()->getResult();
+    }
+}

src/protected/application/lib/MapasCulturais/Services/CounterArgumentService.php

@@ -6,14 +6,18 @@
 use MapasCulturais\App;
 use MapasCulturais\Entities\CounterArgument;
 use MapasCulturais\Entities\CounterArgumentFile;
+use MapasCulturais\Entities\CounterArgumentResponse;
+use MapasCulturais\Entities\Registration;
 
 class CounterArgumentService
 {
     private $counterArgumentEntity;
+    private $counterArgumentResponseEntity;
 
     public function __construct()
     {
         $this->counterArgumentEntity = new CounterArgument();
+        $this->counterArgumentResponseEntity = new CounterArgumentResponse();
     }
 
     public function isCounterArgumentPeriod($opportunity)
@@ -31,22 +35,100 @@ public function isCounterArgumentPeriod($opportunity)
         return false;
     }
 
-    public function send(array $data)
+    public function isResponsePeriod($opportunity)
     {
-        $this->counterArgumentEntity->send($data);
+        $finalStr = $opportunity->finalDateCounterArgument . ' ' . $opportunity->finalTimeCounterArgument;
+        $final = new DateTime($finalStr);
+        $now = new DateTime();
+
+        $appealEnabled = $opportunity->appealEnabled === 'Sim' ? true : false;
+
+        if ($appealEnabled && $now > $final) return true;
+
+        return false;
+    }
+
+    public function getCounterArgumentsWithoutResponse($counterArguments)
+    {
+        $counterArgumentsWithoutResponse = array_filter($counterArguments, function ($counterArgument) {
+            return !$counterArgument->response;
+        });
+
+        return $counterArgumentsWithoutResponse;
+    }
+
+    public function send(string $text, Registration $registration)
+    {
+        $this->counterArgumentEntity->text = $text;
+        $this->counterArgumentEntity->registration = $registration;
+        $this->counterArgumentEntity->save();
 
-        foreach ($_FILES as $file) {
+        $this->saveFiles($_FILES, $this->counterArgumentEntity);
+
+        App::i()->em->flush();
+    }
+
+    public function update(string $text, CounterArgument $counterArgument)
+    {
+        $counterArgument->text = $text;
+        $counterArgument->updateTimestamp = new DateTime();
+
+        $this->saveFiles($_FILES, $counterArgument);
+
+        $counterArgument->save(true);
+        App::i()->em->flush();
+    }
+
+    private function saveFiles($files, $counterArgument)
+    {
+        foreach ($files as $file) {
             App::i()->disableAccessControl();
 
             $counterArgumentFile = new CounterArgumentFile($file);
             $counterArgumentFile->setGroup('counter-argument-attachment');
-            $counterArgumentFile->owner = $this->counterArgumentEntity;
+            $counterArgumentFile->owner = $counterArgument;
             $counterArgumentFile->private = true;
             $counterArgumentFile->save();
 
             App::i()->enableAccessControl();
         }
+    }
 
-        App::i()->em->flush();
+    public function removeFile(CounterArgumentFile $counterArgumentFile)
+    {
+        $counterArgumentFile->delete(true);
+    }
+
+    public function saveResponse(array $data)
+    {
+        $counterArgument = App::i()->repo('CounterArgument')->find($data['counterArgumentId']);
+        $counterArgumentResponse = App::i()->repo('CounterArgumentResponse')->findOneBy(['counterArgument' => $counterArgument->id]);
+
+        if ($counterArgumentResponse) {
+            $counterArgumentResponse->text = $data['text'];
+            $counterArgumentResponse->updateTimestamp = new DateTime();
+            $counterArgumentResponse->save(true);
+        } else {
+            $this->counterArgumentResponseEntity->text = $data['text'];
+            $this->counterArgumentResponseEntity->owner = App::i()->getUser()->profile;
+            $this->counterArgumentResponseEntity->counterArgument = $counterArgument;
+            $this->counterArgumentResponseEntity->save(true);
+        }
+
+        $counterArgument->status = (int)$data['status'];
+        $counterArgument->save(true);
+    }
+
+    public function publishResponses($counterArguments)
+    {
+        foreach ($counterArguments as $counterArgument) {
+            $response = $counterArgument->response;
+            if ($response && !$response->published) {
+                App::i()->disableAccessControl();
+                $response->published = true;
+                $response->save(true);
+                App::i()->enableAccessControl();
+            }
+        }
     }
 }

src/protected/application/lib/MapasCulturais/Validator.php

@@ -25,7 +25,7 @@ static function url($domain = null){
         return self::call(
                 'parse_url',
                 self::arrayType()
-                    ->key('scheme', self::startsWith('http'))
+                    ->key('scheme', self::startsWith('https'))
                     ->key('host', $domain ? self::domain()->endsWith($domain) : self::domain())
                 );