From 82abdd7c8fea14e3f9d8f690660341f599a7427a Mon Sep 17 00:00:00 2001
From: Laurent Opprecht <laurent.opprecht@unige.ch>
Date: Fri, 22 Jun 2012 14:58:29 +0200
Subject: [PATCH] #5023 Implements Doctrine for database access

---
 main/inc/lib/course_entity.class.php       |   5 +-
 main/inc/lib/entity.class.php              |   4 +-
 main/inc/lib/student_publication.class.php | 130 ++++++++++++++-------
 3 files changed, 96 insertions(+), 43 deletions(-)

diff --git a/main/inc/lib/course_entity.class.php b/main/inc/lib/course_entity.class.php
index bdafaec51a..b453bc7890 100644
--- a/main/inc/lib/course_entity.class.php
+++ b/main/inc/lib/course_entity.class.php
@@ -11,7 +11,10 @@ class CourseEntity extends Entity
 
     public function __construct()
     {
-        $this->defaults('c_id', self::current_course()->get_id());
+        $current_course = self::current_course();
+        if ($current_course) {
+            $this->defaults('c_id', self::current_course()->get_id());
+        }
         $this->defaults('session_id', api_get_session_id());
     }
 
diff --git a/main/inc/lib/entity.class.php b/main/inc/lib/entity.class.php
index 8a63912892..15cbc1fc9d 100644
--- a/main/inc/lib/entity.class.php
+++ b/main/inc/lib/entity.class.php
@@ -19,7 +19,9 @@ class Entity
         if ($result === false) {
             $repo = \Entity\Course::repository();
             $course_id = api_get_course_int_id();
-            $result = $repo->find($course_id);
+            if ($course_id) {
+                $result = $repo->find($course_id);
+            }
         }
         return $result;
     }
diff --git a/main/inc/lib/student_publication.class.php b/main/inc/lib/student_publication.class.php
index 0d8feab323..f39fe53f0b 100644
--- a/main/inc/lib/student_publication.class.php
+++ b/main/inc/lib/student_publication.class.php
@@ -26,20 +26,25 @@ use ResultSet;
  */
 class StudentPublication
 {
-    
+
     public static function void()
     {
         static $result = null;
-        if($result)
-        {
+        if ($result) {
             return $result;
         }
-        
+
         $result = new self();
         return $result;
     }
-    
-    
+
+    /**
+     * @return Model\StudentPublicationRepository 
+     */
+    public static function repository()
+    {
+        return StudentPublicationRepository::instance();
+    }
 
     /**
      *
@@ -48,36 +53,7 @@ class StudentPublication
      */
     public static function query($where)
     {
-        $table_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
-        $table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
-        $tool = 'work';
-
-        $sql = "SELECT pub.*,         
-                       prop.id AS property_id, 
-                       prop.tool, 
-                       prop.insert_user_id,
-                       prop.insert_date,
-                       prop.lastedit_date,
-                       prop.ref,
-                       prop.lastedit_type,
-                       prop.lastedit_user_id,
-                       prop.to_group_id, 
-                       prop.to_user_id, 
-                       prop.visibility, 
-                       prop.start_visible, 
-                       prop.end_visible, 
-                       prop.id_session
-                FROM 
-                    $table AS pub, 
-                    $table_item_property AS prop
-                WHERE 
-                    (pub.id = prop.ref AND
-                     pub.c_id = prop.c_id AND
-                     prop.tool = '$tool')";
-
-        $sql .= $where ? "AND ($where)" : '';
-        $result = new ResultSet($sql);
-        return $result->return_type(__CLASS__);
+        return self::repository()->query($where);
     }
 
     /**
@@ -88,8 +64,7 @@ class StudentPublication
      */
     public static function get_by_id($c_id, $id)
     {
-        $c_id = is_object($c_id) ? $c_id->get_id() : (int) $c_id;
-        return self::query("pub.c_id = $c_id AND pub.id = $id")->first();
+        return self::repository()->get_by_id($c_id, $id);
     }
 
     protected $c_id = 0;
@@ -156,8 +131,6 @@ class StudentPublication
             $this->item_property = null;
         }
     }
-    
-
 
     public function get_c_id()
     {
@@ -435,5 +408,80 @@ class StudentPublication
         $where = "pub.c_id = $c_id AND pub.parent_id = $id";
         return self::query($where);
     }
-    
+
+}
+
+class StudentPublicationRepository
+{
+
+    /**
+     *
+     * @staticvar null $result
+     * @return StudentPublicationRepository 
+     */
+    public static function instance()
+    {
+        static $result = null;
+        if (empty($result)) {
+            $result = new self();
+        }
+        return $resutl;
+    }
+
+    /**
+     *
+     * @param string $where
+     * @return \ResultSet 
+     */
+    public function query($where)
+    {
+        $table_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
+        $table = Database::get_course_table(TABLE_STUDENT_PUBLICATION);
+        $tool = 'work';
+
+        $sql = "SELECT pub.*,         
+                       prop.id AS property_id, 
+                       prop.tool, 
+                       prop.insert_user_id,
+                       prop.insert_date,
+                       prop.lastedit_date,
+                       prop.ref,
+                       prop.lastedit_type,
+                       prop.lastedit_user_id,
+                       prop.to_group_id, 
+                       prop.to_user_id, 
+                       prop.visibility, 
+                       prop.start_visible, 
+                       prop.end_visible, 
+                       prop.id_session
+                FROM 
+                    $table AS pub, 
+                    $table_item_property AS prop
+                WHERE 
+                    (pub.id = prop.ref AND
+                     pub.c_id = prop.c_id AND
+                     prop.tool = '$tool')";
+
+        $sql .= $where ? "AND ($where)" : '';
+        $result = new ResultSet($sql);
+        return $result->return_type(__CLASS__);
+    }
+
+    /**
+     *
+     * @param int|Course $c_id
+     * @param int $id
+     * @return \Model\StudentPublication 
+     */
+    public function get_by_id($c_id, $id)
+    {
+        $c_id = is_object($c_id) ? $c_id->get_id() : (int) $c_id;
+        return $this->query("pub.c_id = $c_id AND pub.id = $id")->first();
+    }
+
+    public function update($pub)
+    {
+        
+    }
+
 }
\ No newline at end of file