Browse Source

Merge branch 'develop'

master
Guillaume Bourgeois 1 year ago
parent
commit
be0d52aeed
2 changed files with 6 additions and 6 deletions
  1. +1
    -4
      common/logic/Ticket/Ticket/Repository/TicketRepository.php
  2. +5
    -2
      common/logic/Ticket/Ticket/Service/TicketSolver.php

+ 1
- 4
common/logic/Ticket/Ticket/Repository/TicketRepository.php View File

$this->loadQuery(TicketRepositoryQuery::class); $this->loadQuery(TicketRepositoryQuery::class);
$this->ticketSolver = $this->loadService(TicketSolver::class); $this->ticketSolver = $this->loadService(TicketSolver::class);
} }

/**
* Retourne les options de base nécessaires à la fonction de recherche.
*/
public function getDefaultOptionsSearch(): array public function getDefaultOptionsSearch(): array
{ {
return [ return [

+ 5
- 2
common/logic/Ticket/Ticket/Service/TicketSolver.php View File

public function isTicketUnread(Ticket $ticket, User $user): int public function isTicketUnread(Ticket $ticket, User $user): int
{ {
$ticketUser = $this->getTicketUser($ticket, $user); $ticketUser = $this->getTicketUser($ticket, $user);

if($ticketUser) { if($ticketUser) {
foreach($ticket->ticketMessages as $ticketMessage) { foreach($ticket->ticketMessages as $ticketMessage) {
if($this->isTicketMessageUnread($ticketMessage, $ticketUser)) { if($this->isTicketMessageUnread($ticketMessage, $ticketUser)) {
return true; return true;
} }
} }
return false;
} }


return false;
return true;
} }


public function getFirstTicketMessageUnread(Ticket $ticket, User $user): ?TicketMessage public function getFirstTicketMessageUnread(Ticket $ticket, User $user): ?TicketMessage
{ {
$ticketUser = $this->getTicketUser($ticket, $user); $ticketUser = $this->getTicketUser($ticket, $user);

if($ticketUser) { if($ticketUser) {
foreach($ticket->ticketMessages as $ticketMessage) { foreach($ticket->ticketMessages as $ticketMessage) {
if($this->isTicketMessageUnread($ticketMessage, $ticketUser)) { if($this->isTicketMessageUnread($ticketMessage, $ticketUser)) {
} }
} }


return null;
return $ticket->ticketMessages[0];
} }


public function countTicketsUnreadByUserFromArray(array $ticketsArray, User $user): int public function countTicketsUnreadByUserFromArray(array $ticketsArray, User $user): int

Loading…
Cancel
Save