Multimédia: Les ids origine des groupes et postes sont composés avec l'id de site

library/Class/Multimedia/Device.php

@@ -26,8 +26,9 @@ class Multimedia_DeviceLoader extends Storm_Model_Loader {
 	 * @return Class_Multimedia_DeviceGroup
 	 */
 	public function fromJsonModelWithGroup($json_model, $device_group) {
-		if (!$model = $this->findFirstBy(array('id_origine' => (int)$json_model->id)))
-			$model = $this->newInstance()->setIdOrigine((int)$json_model->id);
+		$id_origine = $device_group->getLocation()->getId() . '-' . $json_model->id;
+		if (!$model = $this->findFirstBy(array('id_origine' => $id_origine)))
+			$model = $this->newInstance()->setIdOrigine($id_origine);
 		$model
 				->setLibelle($json_model->libelle)
 				->setOs($json_model->os)

library/Class/Multimedia/DeviceGroup.php

@@ -26,8 +26,9 @@ class Multimedia_DeviceGroupLoader extends Storm_Model_Loader {
 	 * @return Class_Multimedia_DeviceGroup
 	 */
 	public function fromJsonModelWithLocation($json_model, $location) {
-		if (!$model = $this->findFirstBy(array('id_origine' => (int)$json_model->id)))
-			$model = $this->newInstance()->setIdOrigine((int)$json_model->id);
+		$id_origine = $location->getId() . '-' . $json_model->id;
+		if (!$model = $this->findFirstBy(array('id_origine' => $id_origine)))
+			$model = $this->newInstance()->setIdOrigine($id_origine);
 		$model
 				->setLibelle($json_model->libelle)
 				->setLocation($location)

tests/application/modules/push/controllers/MultimediaControllerTest.php

@@ -63,7 +63,7 @@ class Push_MultimediaControllerValidConfigTest extends AbstractControllerTestCas
 
 	/** @test */
 	public function deviceGroupIdOrigineShouldBeOne() {
-		$this->assertEquals(1, $this->_group->getIdOrigine());
+		$this->assertEquals('1-1', $this->_group->getIdOrigine());
 	}
 
 
@@ -94,7 +94,7 @@ class Push_MultimediaControllerValidConfigTest extends AbstractControllerTestCas
 
 	/** @test */
 	public function firstDeviceIdOrigineShouldBeOne() {
-		$this->assertEquals(1, $this->_devices[0]->getIdOrigine());
+		$this->assertEquals('1-1', $this->_devices[0]->getIdOrigine());
 	}
 
 
@@ -124,7 +124,7 @@ class Push_MultimediaControllerValidConfigTest extends AbstractControllerTestCas
 
 	/** @test */
 	public function secondDeviceIdOrigineShouldBeTwo() {
-		$this->assertEquals(2, $this->_devices[1]->getIdOrigine());
+		$this->assertEquals('1-2', $this->_devices[1]->getIdOrigine());
 	}