Changeset 2591 for cpc/trunk/project

Timestamp:

Jan 9, 2012, 5:58:18 PM (9 years ago)

Author:

teymour

Message:

Si une seance existe déjà sans commentaire, on la supprime pour pouvoir la recharger correcrtement

Location:

cpc/trunk/project/lib

Files:

• model/doctrine/Intervention.class.php (modified) (1 diff)
• model/doctrine/Seance.class.php (modified) (1 diff)
• model/doctrine/SeanceTable.class.php (modified) (1 diff)
• task/loadCommissionTask.class.php (modified) (3 diffs)

cpc/trunk/project/lib/model/doctrine/Intervention.class.php

@@ -59 +59 @@
   public function setSeance($type, $date, $heure, $session, $commission = null) {
     $this->setType($type);
-    if ($type == 'commission') {
-      $commission = Doctrine::getTable('Organisme')->findOneByNomOrCreateIt($commission, 'parlementaire');
-      $seance = $commission->getSeanceByDateAndMomentOrCreateIt($date, $heure, $session);
-      $commission->free();
-    } else{
-      $seance = Doctrine::getTable('Seance')->findOneOrCreateIt('hemicycle', $date, $heure, $session);
-    }
+    $seance = Doctrine::getTable('Seance')->getOrCreateItFromSeanceArgs($type, $date, $heure, $session, $commission);
     $id = $this->_set('seance_id', $seance->id);
     $seance->free();

cpc/trunk/project/lib/model/doctrine/Seance.class.php

@@ -120 +120 @@
   }
 
+  public function deleteInterventions() {
+    if ($this->countComments()) {
+      throw new Exception('Il existe des commentaires');
+    }
+    foreach (Doctrine::getTable('Intervention')->createQuery('i')->where('i.seance_id = ?', $this->id)->execute() as $i) {
+      $i->delete();
+    }
+  }
+
+  public function countComments() {
+    $interventions = Doctrine::getTable('Intervention')->createQuery('i')->where('i.seance_id = ?', $this->id)->select('i.id')->fetchArray();
+    return Doctrine::getTable('Commentaire')->createQuery('c')->whereIN('object_id', $interventions)->andWhere('object_type = ?', 'Intervention')->count();
+  }
+
   public function getTitre($miniature = 0, $hemicycle = 0, $ref = '') {
     $titre = '';

cpc/trunk/project/lib/model/doctrine/SeanceTable.class.php

@@ -5 +5 @@
 class SeanceTable extends Doctrine_Table
 {
+  public function getFromSeanceArgs($type, $date, $heure, $session, $commission = null) {
+    if ($type == 'commission') {
+      $commission = Doctrine::getTable('Organisme')->findOneByNomOrCreateIt($commission, 'parlementaire');
+      return $commission->getSeanceByDateAndMoment($date, $heure, $session);
+    } 
+    return Doctrine::getTable('Seance')->findOneByTypeDateHeureSession('hemicycle', $date, $heure, $session);
+  }
+
+  public function getOrCreateItFromSeanceArgs($type, $date, $heure, $session, $commission = null) {
+    if ($type == 'commission') {
+      $commission = Doctrine::getTable('Organisme')->findOneByNomOrCreateIt($commission, 'parlementaire');
+      return $commission->getSeanceByDateAndMomentOrCreateIt($date, $heure, $session);
+    } 
+    return Doctrine::getTable('Seance')->findOneOrCreateIt('hemicycle', $date, $heure, $session);
+  }
+
+  public function findOneByTypeDateHeureSession($type, $date, $heure, $session) {
+    return $this->createQuery('s')->where('type = ?', $type)->andWhere('date = ?', $date)->andWhere('moment = ?', $heure)->fetchOne();
+  }
+
   public function findOneOrCreateIt($type, $date, $heure, $session) {
-    $s = $this->createQuery('s')->where('type = ?', $type)->andWhere('date = ?', $date)->andWhere('moment = ?', $heure)->fetchOne();
+    $s = findOneByTypeDateHeureSession($type, $date, $heure, $session);
     if (!$s) {
       if ($type != 'hemicycle')

cpc/trunk/project/lib/task/loadCommissionTask.class.php

@@ -24 +24 @@
             continue;
           echo "$dir$file\n";
+          $first = 1;
           foreach(file($dir.$file) as $line) {
             $json = json_decode($line);
@@ -37 +38 @@
             }
 
+            if ($first) { #On teste si la séance existe déjà.
+                $first = 0;
+                $seance = Doctrine::getTable('Seance')->getFromSeanceArgs('commission', $json->date, $json->heure, $json->session, $json->commission);
+                if ($seance) {
+                  try {
+                    $seance->deleteInterventions();
+                  }catch(Exception $e) {
+                    echo "ERROR: Séance exists (".$e->getMessage().")\n";
+                    continue 2;
+                  }
+                }
+            }
 
             $id = md5($json->intervention.$json->date.$json->heure.$json->commission);
@@ -53 +66 @@
             }
             $intervention->save();
-        $intervention->free();
+            $intervention->free();
           }
           unlink($dir.$file);