Merge pull request #2787 from irontec/PROVIDER-2053-adds-schema-relat…

…ions-between-entities Adds schema relations between AplicationServerSet-Brand and MediaRelaySet-Brand
irontec · Oct 23, 2024 · af12efc · af12efc
2 parents 09309dc + 5ec744e
commit af12efc
Show file tree

Hide file tree

Showing 89 changed files with 2,747 additions and 239 deletions.
diff --git a/library/DataFixtures/ORM/ProviderCarrier.php b/library/DataFixtures/ORM/ProviderCarrier.php
@@ -29,6 +29,7 @@ public function load(ObjectManager $manager)
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setProxyTrunk($fixture->getReference('_reference_ProviderProxyTrunk1'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
 
             $this->sanitizeValues();
             $this->setCalculateCost(true);
@@ -45,6 +46,7 @@ public function load(ObjectManager $manager)
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setProxyTrunk($fixture->getReference('_reference_ProviderProxyTrunk2'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item2);
 
         $this->addReference('_reference_ProviderCarrier2', $item2);

diff --git a/library/DataFixtures/ORM/ProviderCompany.php b/library/DataFixtures/ORM/ProviderCompany.php
@@ -55,7 +55,7 @@ public function load(ObjectManager $manager)
             );
             $this->invoicing = $invoicing;
             $this->setLanguage($fixture->getReference('_reference_ProviderLanguage1'));
-            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet'));
+            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet0'));
             $this->setDefaultTimezone($fixture->getReference('_reference_ProviderTimezone145'));
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setDomain($fixture->getReference('_reference_ProviderDomain3'));
@@ -64,6 +64,8 @@ public function load(ObjectManager $manager)
             $this->setVoicemailNotificationTemplate($fixture->getReference('_reference_ProviderNotificationTemplate1'));
             $this->setAccessCredentialNotificationTemplate($fixture->getReference('_reference_ProviderNotificationTemplate5'));
             $this->setCorporation($fixture->getReference('_reference_Corporation1'));
+            $this->setApplicationServerSet($fixture->getReference('_reference_ProviderApplicationServerSet1'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item1);
 
         $this->addReference('_reference_ProviderCompany1', $item1);
@@ -92,14 +94,16 @@ public function load(ObjectManager $manager)
             $this->setOnDemandRecordCode("");
             $this->invoicing = $invoicing;
             $this->setLanguage($fixture->getReference('_reference_ProviderLanguage1'));
-            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet'));
+            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet0'));
             $this->setDefaultTimezone($fixture->getReference('_reference_ProviderTimezone145'));
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setDomain($fixture->getReference('_reference_ProviderDomain5'));
             $this->setCountry($fixture->getReference('_reference_ProviderCountry70'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setVoicemailNotificationTemplate($fixture->getReference('_reference_ProviderNotificationTemplate1'));
             $this->setCorporation($fixture->getReference('_reference_Corporation1'));
+            $this->setApplicationServerSet($fixture->getReference('_reference_ProviderApplicationServerSet1'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item2);
 
         $this->addReference('_reference_ProviderCompany2', $item2);
@@ -123,12 +127,14 @@ public function load(ObjectManager $manager)
             $this->setShowInvoices(true);
             $this->invoicing = $invoicing;
             $this->setLanguage($fixture->getReference('_reference_ProviderLanguage1'));
-            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet'));
+            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet0'));
             $this->setDefaultTimezone($fixture->getReference('_reference_ProviderTimezone145'));
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setCountry($fixture->getReference('_reference_ProviderCountry70'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setVoicemailNotificationTemplate($fixture->getReference('_reference_ProviderNotificationTemplate1'));
+            $this->setApplicationServerSet($fixture->getReference('_reference_ProviderApplicationServerSet1'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item3);
 
         $this->addReference('_reference_ProviderCompany3', $item3);
@@ -153,12 +159,14 @@ public function load(ObjectManager $manager)
             $this->invoicing = $invoicing;
             $this->setApplicationServer($fixture->getReference('_reference_ProviderApplicationServer1'));
             $this->setLanguage($fixture->getReference('_reference_ProviderLanguage1'));
-            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet'));
+            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet0'));
             $this->setDefaultTimezone($fixture->getReference('_reference_ProviderTimezone145'));
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setCountry($fixture->getReference('_reference_ProviderCountry70'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setVoicemailNotificationTemplate($fixture->getReference('_reference_ProviderNotificationTemplate1'));
+            $this->setApplicationServerSet($fixture->getReference('_reference_ProviderApplicationServerSet1'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item4);
 
         $this->addReference('_reference_ProviderCompany4', $item4);
@@ -181,12 +189,14 @@ public function load(ObjectManager $manager)
             $this->setOnDemandRecordCode("");
             $this->invoicing = $invoicing;
             $this->setLanguage($fixture->getReference('_reference_ProviderLanguage1'));
-            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet'));
+            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet0'));
             $this->setDefaultTimezone($fixture->getReference('_reference_ProviderTimezone145'));
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setCountry($fixture->getReference('_reference_ProviderCountry70'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setVoicemailNotificationTemplate($fixture->getReference('_reference_ProviderNotificationTemplate1'));
+            $this->setApplicationServerSet($fixture->getReference('_reference_ProviderApplicationServerSet1'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item5);
 
         $this->addReference('_reference_ProviderCompany5', $item5);
@@ -211,12 +221,14 @@ public function load(ObjectManager $manager)
             $this->setOnDemandRecordCode("");
             $this->invoicing = $invoicing;
             $this->setLanguage($fixture->getReference('_reference_ProviderLanguage1'));
-            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet'));
+            $this->setMediaRelaySets($fixture->getReference('_reference_ProviderMediaRelaySet0'));
             $this->setDefaultTimezone($fixture->getReference('_reference_ProviderTimezone18'));
             $this->setBrand($fixture->getReference('_reference_ProviderBrand2'));
             $this->setCountry($fixture->getReference('_reference_ProviderCountry10'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setVoicemailNotificationTemplate($fixture->getReference('_reference_ProviderNotificationTemplate4'));
+            $this->setApplicationServerSet($fixture->getReference('_reference_ProviderApplicationServerSet0'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item6);
 
         $this->addReference('_reference_ProviderCompany6', $item6);
@@ -237,7 +249,9 @@ public function getDependencies()
             ProviderCountry::class,
             ProviderTransformationRuleSet::class,
             ProviderNotificationTemplate::class,
-            ProviderCorporation::class
+            ProviderCorporation::class,
+            ProviderApplicationServerSet::class,
+            ProviderMediaRelaySet::class
         );
     }
 }
diff --git a/library/DataFixtures/ORM/ProviderDdiProvider.php b/library/DataFixtures/ORM/ProviderDdiProvider.php
@@ -28,6 +28,7 @@ public function load(ObjectManager $manager)
             $this->setBrand($fixture->getReference('_reference_ProviderBrand1'));
             $this->setTransformationRuleSet($fixture->getReference('_reference_ProviderTransformationRuleSet70'));
             $this->setProxyTrunk($fixture->getReference('_reference_ProviderProxyTrunk1'));
+            $this->setMediaRelaySet($fixture->getReference('_reference_ProviderMediaRelaySet0'));
         })->call($item1);
 
         $this->addReference('_reference_ProviderDdiProvider1', $item1);
@@ -43,6 +44,7 @@ public function getDependencies()
             ProviderBrand::class,
             ProviderTransformationRuleSet::class,
             ProviderProxyTrunk::class,
+            ProviderMediaRelaySet::class,
         );
     }
 }
diff --git a/library/DataFixtures/ORM/ProviderMediaRelaySet.php b/library/DataFixtures/ORM/ProviderMediaRelaySet.php
@@ -25,7 +25,7 @@ public function load(ObjectManager $manager)
         );
 
         $item0 = $manager->find(MediaRelaySet::class, 0);
-        $this->addReference('_reference_ProviderMediaRelaySet', $item0);
+        $this->addReference('_reference_ProviderMediaRelaySet0', $item0);
 
         $item1 = $this->createEntityInstance(MediaRelaySet::class);
         (function () use ($fixture) {
@@ -37,6 +37,15 @@ public function load(ObjectManager $manager)
         $this->sanitizeEntityValues($item1);
         $manager->persist($item1);
 
+        $item2 = $this->createEntityInstance(MediaRelaySet::class);
+        (function () use ($fixture) {
+            $this->setName("Test 2");
+            $this->setDescription("Not related with Brand 1");
+        })->call($item2);
+
+        $this->addReference('_reference_ProviderMediaRelaySet2', $item2);
+        $this->sanitizeEntityValues($item2);
+        $manager->persist($item2);
 
         $manager->flush();
     }

diff --git a/library/Ivoz/Provider/Domain/Model/ApplicationServerSet/ApplicationServerSet.php b/library/Ivoz/Provider/Domain/Model/ApplicationServerSet/ApplicationServerSet.php
@@ -3,8 +3,6 @@
 namespace Ivoz\Provider\Domain\Model\ApplicationServerSet;
 
 use Ivoz\Core\Domain\Assert\Assertion;
-use Ivoz\Provider\Domain\Model\ApplicationServer\ApplicationServerInterface;
-use Ivoz\Provider\Domain\Model\ApplicationServerSetRelApplicationServer\ApplicationServerSetRelApplicationServerInterface;
 
 /**
  * ApplicationServerSet
@@ -13,6 +11,8 @@ class ApplicationServerSet extends ApplicationServerSetAbstract implements Appli
 {
     use ApplicationServerSetTrait;
 
+    public const DEFAULT_APPLICATION_SERVER_SET = 0;
+
     /**
      * @codeCoverageIgnore
      * @return array<string, mixed>

diff --git a/...er/Domain/Model/ApplicationServerSetsRelBrand/ApplicationServerSetsRelBrandRepository.php b/...er/Domain/Model/ApplicationServerSetsRelBrand/ApplicationServerSetsRelBrandRepository.php
@@ -3,6 +3,7 @@
 namespace Ivoz\Provider\Domain\Model\ApplicationServerSetsRelBrand;
 
 use Ivoz\Core\Domain\Service\Repository\RepositoryInterface;
+use Ivoz\Provider\Domain\Model\Administrator\AdministratorInterface;
 
 /**
  * @extends RepositoryInterface<ApplicationServerSetsRelBrandInterface, ApplicationServerSetsRelBrandDto>
@@ -13,4 +14,9 @@ interface ApplicationServerSetsRelBrandRepository extends RepositoryInterface
      * @return ApplicationServerSetsRelBrandInterface[]
      */
     public function findByBrandId(int $brandId): array;
+
+    /**
+     * @return int[]
+     */
+    public function getApplicationServerSetIdsByBrandAdmin(AdministratorInterface $admin): array;
 }
diff --git a/library/Ivoz/Provider/Domain/Model/Carrier/CarrierAbstract.php b/library/Ivoz/Provider/Domain/Model/Carrier/CarrierAbstract.php
@@ -73,6 +73,11 @@ abstract class CarrierAbstract
      */
     protected $mediaRelaySets = null;
 
+    /**
+     * @var MediaRelaySetInterface
+     */
+    protected $mediaRelaySet;
+
     /**
      * Constructor
      */
@@ -151,6 +156,8 @@ public static function fromDto(
         Assertion::notNull($name, 'getName value is null, but non null value was expected.');
         $brand = $dto->getBrand();
         Assertion::notNull($brand, 'getBrand value is null, but non null value was expected.');
+        $mediaRelaySet = $dto->getMediaRelaySet();
+        Assertion::notNull($mediaRelaySet, 'getMediaRelaySet value is null, but non null value was expected.');
 
         $self = new static(
             $description,
@@ -164,7 +171,8 @@ public static function fromDto(
             ->setTransformationRuleSet($fkTransformer->transform($dto->getTransformationRuleSet()))
             ->setCurrency($fkTransformer->transform($dto->getCurrency()))
             ->setProxyTrunk($fkTransformer->transform($dto->getProxyTrunk()))
-            ->setMediaRelaySets($fkTransformer->transform($dto->getMediaRelaySets()));
+            ->setMediaRelaySets($fkTransformer->transform($dto->getMediaRelaySets()))
+            ->setMediaRelaySet($fkTransformer->transform($mediaRelaySet));
 
         $self->initChangelog();
 
@@ -187,6 +195,8 @@ public function updateFromDto(
         Assertion::notNull($name, 'getName value is null, but non null value was expected.');
         $brand = $dto->getBrand();
         Assertion::notNull($brand, 'getBrand value is null, but non null value was expected.');
+        $mediaRelaySet = $dto->getMediaRelaySet();
+        Assertion::notNull($mediaRelaySet, 'getMediaRelaySet value is null, but non null value was expected.');
 
         $this
             ->setDescription($description)
@@ -197,7 +207,8 @@ public function updateFromDto(
             ->setTransformationRuleSet($fkTransformer->transform($dto->getTransformationRuleSet()))
             ->setCurrency($fkTransformer->transform($dto->getCurrency()))
             ->setProxyTrunk($fkTransformer->transform($dto->getProxyTrunk()))
-            ->setMediaRelaySets($fkTransformer->transform($dto->getMediaRelaySets()));
+            ->setMediaRelaySets($fkTransformer->transform($dto->getMediaRelaySets()))
+            ->setMediaRelaySet($fkTransformer->transform($mediaRelaySet));
 
         return $this;
     }
@@ -216,7 +227,8 @@ public function toDto(int $depth = 0): CarrierDto
             ->setTransformationRuleSet(TransformationRuleSet::entityToDto(self::getTransformationRuleSet(), $depth))
             ->setCurrency(Currency::entityToDto(self::getCurrency(), $depth))
             ->setProxyTrunk(ProxyTrunk::entityToDto(self::getProxyTrunk(), $depth))
-            ->setMediaRelaySets(MediaRelaySet::entityToDto(self::getMediaRelaySets(), $depth));
+            ->setMediaRelaySets(MediaRelaySet::entityToDto(self::getMediaRelaySets(), $depth))
+            ->setMediaRelaySet(MediaRelaySet::entityToDto(self::getMediaRelaySet(), $depth));
     }
 
     /**
@@ -233,7 +245,8 @@ protected function __toArray(): array
             'transformationRuleSetId' => self::getTransformationRuleSet()?->getId(),
             'currencyId' => self::getCurrency()?->getId(),
             'proxyTrunkId' => self::getProxyTrunk()?->getId(),
-            'mediaRelaySetsId' => self::getMediaRelaySets()?->getId()
+            'mediaRelaySetsId' => self::getMediaRelaySets()?->getId(),
+            'mediaRelaySetId' => self::getMediaRelaySet()->getId()
         ];
     }
 
@@ -352,4 +365,16 @@ public function getMediaRelaySets(): ?MediaRelaySetInterface
     {
         return $this->mediaRelaySets;
     }
+
+    protected function setMediaRelaySet(MediaRelaySetInterface $mediaRelaySet): static
+    {
+        $this->mediaRelaySet = $mediaRelaySet;
+
+        return $this;
+    }
+
+    public function getMediaRelaySet(): MediaRelaySetInterface
+    {
+        return $this->mediaRelaySet;
+    }
 }
diff --git a/library/Ivoz/Provider/Domain/Model/Carrier/CarrierDto.php b/library/Ivoz/Provider/Domain/Model/Carrier/CarrierDto.php
@@ -3,6 +3,7 @@
 namespace Ivoz\Provider\Domain\Model\Carrier;
 
 use Ivoz\Api\Core\Annotation\AttributeDefinition;
+use Ivoz\Provider\Domain\Model\MediaRelaySet\MediaRelaySet;
 
 class CarrierDto extends CarrierDtoAbstract
 {

diff --git a/library/Ivoz/Provider/Domain/Model/Carrier/CarrierDtoAbstract.php b/library/Ivoz/Provider/Domain/Model/Carrier/CarrierDtoAbstract.php
@@ -73,6 +73,11 @@ abstract class CarrierDtoAbstract implements DataTransferObjectInterface
      */
     private $mediaRelaySets = null;
 
+    /**
+     * @var MediaRelaySetDto | null
+     */
+    private $mediaRelaySet = null;
+
     /**
      * @var OutgoingRoutingDto[] | null
      */
@@ -122,7 +127,8 @@ public static function getPropertyMap(string $context = '', string $role = null)
             'transformationRuleSetId' => 'transformationRuleSet',
             'currencyId' => 'currency',
             'proxyTrunkId' => 'proxyTrunk',
-            'mediaRelaySetsId' => 'mediaRelaySets'
+            'mediaRelaySetsId' => 'mediaRelaySets',
+            'mediaRelaySetId' => 'mediaRelaySet'
         ];
     }
 
@@ -142,6 +148,7 @@ public function toArray(bool $hideSensitiveData = false): array
             'currency' => $this->getCurrency(),
             'proxyTrunk' => $this->getProxyTrunk(),
             'mediaRelaySets' => $this->getMediaRelaySets(),
+            'mediaRelaySet' => $this->getMediaRelaySet(),
             'outgoingRoutings' => $this->getOutgoingRoutings(),
             'outgoingRoutingsRelCarriers' => $this->getOutgoingRoutingsRelCarriers(),
             'servers' => $this->getServers(),
@@ -376,6 +383,36 @@ public function getMediaRelaySetsId(): ?int
         return null;
     }
 
+    public function setMediaRelaySet(?MediaRelaySetDto $mediaRelaySet): static
+    {
+        $this->mediaRelaySet = $mediaRelaySet;
+
+        return $this;
+    }
+
+    public function getMediaRelaySet(): ?MediaRelaySetDto
+    {
+        return $this->mediaRelaySet;
+    }
+
+    public function setMediaRelaySetId(?int $id): static
+    {
+        $value = !is_null($id)
+            ? new MediaRelaySetDto($id)
+            : null;
+
+        return $this->setMediaRelaySet($value);
+    }
+
+    public function getMediaRelaySetId(): ?int
+    {
+        if ($dto = $this->getMediaRelaySet()) {
+            return $dto->getId();
+        }
+
+        return null;
+    }
+
     /**
      * @param OutgoingRoutingDto[] | null $outgoingRoutings
      */

diff --git a/library/Ivoz/Provider/Domain/Model/Carrier/CarrierInterface.php b/library/Ivoz/Provider/Domain/Model/Carrier/CarrierInterface.php
@@ -93,6 +93,8 @@ public function getProxyTrunk(): ?ProxyTrunkInterface;
 
     public function getMediaRelaySets(): ?MediaRelaySetInterface;
 
+    public function getMediaRelaySet(): MediaRelaySetInterface;
+
     public function addOutgoingRouting(OutgoingRoutingInterface $outgoingRouting): CarrierInterface;
 
     public function removeOutgoingRouting(OutgoingRoutingInterface $outgoingRouting): CarrierInterface;