Remove location short

[airbundle] / Repository / SessionRepository.php

diff --git a/Repository/SessionRepository.php b/Repository/SessionRepository.php
index f6ecb6d432437092f9502aebbd94e6083119c18b..dd89a9895f43df861d2163787612285760f76c88 100644 (file)
--- a/Repository/SessionRepository.php
+++ b/Repository/SessionRepository.php
@@ -183,7 +183,6 @@ SELECT
        l.address AS l_address,
        l.zipcode AS l_zipcode,
        l.city AS l_city,
-       l.short AS l_short,
        l.title AS l_title,
        l.latitude AS l_latitude,
        l.longitude AS l_longitude,
@@ -196,6 +195,7 @@ SELECT
        p.description AS p_description,
        p.class AS p_class,
        p.short AS p_short,
+       p.hat AS p_hat,
        p.rate AS p_rate,
        p.contact AS p_contact,
        p.donate AS p_donate,
@@ -232,7 +232,6 @@ SQL;
                        ->addScalarResult('l_city', 'l_city', 'string')
                        ->addScalarResult('l_latitude', 'l_latitude', 'float')
                        ->addScalarResult('l_longitude', 'l_longitude', 'float')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
@@ -245,6 +244,7 @@ SQL;
                        ->addScalarResult('p_description', 'p_description', 'string')
                        ->addScalarResult('p_class', 'p_class', 'string')
                        ->addScalarResult('p_short', 'p_short', 'string')
+                       ->addScalarResult('p_hat', 'p_hat', 'integer')
                        ->addScalarResult('p_rate', 'p_rate', 'integer')
                        ->addScalarResult('p_contact', 'p_contact', 'string')
                        ->addScalarResult('p_donate', 'p_donate', 'string')
@@ -317,7 +317,6 @@ SELECT
        s.created,
        s.updated,
        s.location_id AS l_id,
-       l.short AS l_short,
        l.title AS l_title,
        l.address AS l_address,
        l.zipcode AS l_zipcode,
@@ -339,6 +338,8 @@ SELECT
        p.donate AS p_donate,
        p.link AS p_link,
        p.profile AS p_profile,
+       p.rate AS p_rate,
+       p.hat AS p_hat,
        p.updated AS p_updated,
        GROUP_CONCAT(sa.id ORDER BY sa.user_id SEPARATOR "\\n") AS sa_id,
        GROUP_CONCAT(IFNULL(sa.score, 'NULL') ORDER BY sa.user_id SEPARATOR "\\n") AS sa_score,
@@ -387,7 +388,6 @@ SQL;
                        ->addScalarResult('created', 'created', 'datetime')
                        ->addScalarResult('updated', 'updated', 'datetime')
                        ->addScalarResult('l_id', 'l_id', 'integer')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('l_address', 'l_address', 'string')
                        ->addScalarResult('l_zipcode', 'l_zipcode', 'string')
@@ -409,6 +409,8 @@ SQL;
                        ->addScalarResult('p_donate', 'p_donate', 'text')
                        ->addScalarResult('p_link', 'p_link', 'text')
                        ->addScalarResult('p_profile', 'p_profile', 'text')
+                       ->addScalarResult('p_rate', 'p_rate', 'integer')
+                       ->addScalarResult('p_hat', 'p_hat', 'boolean')
                        ->addScalarResult('p_updated', 'p_updated', 'datetime')
                        //XXX: is a string because of \n separator
                        ->addScalarResult('sa_id', 'sa_id', 'string')
@@ -443,7 +445,7 @@ SQL;
         * @param $sessionId The session id
         * @param $granted The session is granted
         */
-       public function fetchCalendarByDatePeriod(TranslatorInterface $translator, $period, $locationId = null, $sessionId = null, $granted = false) {
+       public function fetchCalendarByDatePeriod(TranslatorInterface $translator, $period, $locationId = null, $sessionId = null, $granted = false, $locale = null) {
                //Get entity manager
                $em = $this->getEntityManager();
 
@@ -460,6 +462,7 @@ SQL;
                        'RapsysAirBundle:Group' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Group'), $dp),
                        'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
                        'RapsysAirBundle:Slot' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Slot'), $dp),
+                       'RapsysAirBundle:Snippet' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Snippet'), $dp),
                        'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
                        ':afterid' => 4,
                        "\t" => '',
@@ -486,6 +489,7 @@ SQL;
 
                //Set the request
                $req = <<<SQL
+
 SELECT
        s.id,
        s.date,
@@ -497,7 +501,6 @@ SELECT
        ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
        ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
        s.location_id AS l_id,
-       l.short AS l_short,
        l.title AS l_title,
        s.slot_id AS t_id,
        t.title AS t_title,
@@ -505,6 +508,8 @@ SELECT
        a.canceled AS a_canceled,
        a.user_id AS au_id,
        au.pseudonym AS au_pseudonym,
+       p.rate AS p_rate,
+       p.hat AS p_hat,
        GROUP_CONCAT(sa.user_id ORDER BY sa.user_id SEPARATOR "\\n") AS sau_id,
        GROUP_CONCAT(sau.pseudonym ORDER BY sa.user_id SEPARATOR "\\n") AS sau_pseudonym
 FROM RapsysAirBundle:Session AS s
@@ -513,6 +518,7 @@ JOIN RapsysAirBundle:Slot AS t ON (t.id = s.slot_id)
 ${grantSql}JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
 ${grantSql}JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
 LEFT JOIN RapsysAirBundle:Application AS sa ON (sa.session_id = s.id)
+LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
 LEFT JOIN RapsysAirBundle:User AS sau ON (sau.id = sa.user_id)
 WHERE s.date BETWEEN :begin AND :end${locationSql}
 GROUP BY s.id
@@ -541,12 +547,13 @@ SQL;
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
                        ->addScalarResult('l_id', 'l_id', 'integer')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('a_id', 'a_id', 'integer')
                        ->addScalarResult('a_canceled', 'a_canceled', 'datetime')
                        ->addScalarResult('au_id', 'au_id', 'integer')
                        ->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
+                       ->addScalarResult('p_rate', 'p_rate', 'integer')
+                       ->addScalarResult('p_hat', 'p_hat', 'boolean')
                        //XXX: is a string because of \n separator
                        ->addScalarResult('sau_id', 'sau_id', 'string')
                        //XXX: is a string because of \n separator
@@ -557,7 +564,8 @@ SQL;
                $res = $em
                        ->createNativeQuery($req, $rsm)
                        ->setParameter('begin', $period->getStartDate())
-                       ->setParameter('end', $period->getEndDate());
+                       ->setParameter('end', $period->getEndDate())
+                       ->setParameter('locale', $locale);
 
                //Add optional location id
                if (!empty($locationId)) {
@@ -717,14 +725,16 @@ SQL;
                                                'id' => $session['id'],
                                                'start' => $session['start'],
                                                'stop' => $session['stop'],
-                                               'location' => $translator->trans($session['l_short']),
+                                               'location' => $translator->trans($session['l_title']),
                                                'pseudonym' => $pseudonym,
                                                'class' => $class,
                                                'slot' => self::GLYPHS[$session['t_title']],
                                                'slottitle' => $translator->trans($session['t_title']),
                                                'weather' => $weather,
                                                'weathertitle' => implode(' ', $weathertitle),
-                                               'applications' => $applications
+                                               'applications' => $applications,
+                                               'rate' => $session['p_rate'],
+                                               'hat' => $session['p_hat']
                                        ];
                                }
                        }
@@ -745,7 +755,7 @@ SQL;
         * @param $userId The user id
         * @param $sessionId The session id
         */
-       public function fetchUserCalendarByDatePeriod(TranslatorInterface $translator, $period, $userId = null, $sessionId = null) {
+       public function fetchUserCalendarByDatePeriod(TranslatorInterface $translator, $period, $userId = null, $sessionId = null, $locale = null) {
                //Get entity manager
                $em = $this->getEntityManager();
 
@@ -762,6 +772,7 @@ SQL;
                        'RapsysAirBundle:Group' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Group'), $dp),
                        'RapsysAirBundle:Location' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Location'), $dp),
                        'RapsysAirBundle:Slot' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Slot'), $dp),
+                       'RapsysAirBundle:Snippet' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:Snippet'), $dp),
                        'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
                        ':afterid' => 4,
                        "\t" => '',
@@ -793,19 +804,21 @@ SELECT
        ADDDATE(ADDTIME(s.date, s.begin), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS start,
        ADDDATE(ADDTIME(ADDTIME(s.date, s.begin), s.length), INTERVAL IF(s.slot_id = :afterid, 1, 0) DAY) AS stop,
        s.location_id AS l_id,
-       l.short AS l_short,
        l.title AS l_title,
        s.slot_id AS t_id,
        t.title AS t_title,
        s.application_id AS a_id,
        a.user_id AS au_id,
        au.pseudonym AS au_pseudonym,
+       p.rate AS p_rate,
+       p.hat AS p_hat,
        GROUP_CONCAT(sa.user_id ORDER BY sa.user_id SEPARATOR "\\n") AS sau_id,
        GROUP_CONCAT(CONCAT("- ", sau.pseudonym) ORDER BY sa.user_id SEPARATOR "\\n") AS sau_pseudonym
 FROM RapsysAirBundle:Session AS s
 JOIN RapsysAirBundle:Location AS l ON (l.id = s.location_id)
 JOIN RapsysAirBundle:Slot AS t ON (t.id = s.slot_id)
 ${userJoinSql}LEFT JOIN RapsysAirBundle:Application AS a ON (a.id = s.application_id)
+LEFT JOIN RapsysAirBundle:Snippet AS p ON (p.location_id = s.location_id AND p.user_id = a.user_id AND p.locale = :locale)
 LEFT JOIN RapsysAirBundle:User AS au ON (au.id = a.user_id)
 LEFT JOIN RapsysAirBundle:Application AS sa ON (sa.session_id = s.id)
 LEFT JOIN RapsysAirBundle:User AS sau ON (sau.id = sa.user_id)
@@ -836,11 +849,12 @@ SQL;
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
                        ->addScalarResult('l_id', 'l_id', 'integer')
-                       ->addScalarResult('l_short', 'l_short', 'string')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('a_id', 'a_id', 'integer')
                        ->addScalarResult('au_id', 'au_id', 'integer')
                        ->addScalarResult('au_pseudonym', 'au_pseudonym', 'string')
+                       ->addScalarResult('p_rate', 'p_rate', 'integer')
+                       ->addScalarResult('p_hat', 'p_hat', 'boolean')
                        //XXX: is a string because of \n separator
                        ->addScalarResult('sau_id', 'sau_id', 'string')
                        //XXX: is a string because of \n separator
@@ -853,6 +867,7 @@ SQL;
                        ->setParameter('begin', $period->getStartDate())
                        ->setParameter('end', $period->getEndDate())
                        ->setParameter('uid', $userId)
+                       ->setParameter('locale', $locale)
                        ->getResult();
 
                //Init calendar
@@ -1008,14 +1023,16 @@ SQL;
                                                'id' => $session['id'],
                                                'start' => $session['start'],
                                                'stop' => $session['stop'],
-                                               'location' => $translator->trans($session['l_short']),
+                                               'location' => $translator->trans($session['l_title']),
                                                'pseudonym' => $pseudonym,
                                                'class' => $class,
                                                'slot' => self::GLYPHS[$session['t_title']],
                                                'slottitle' => $translator->trans($session['t_title']),
                                                'weather' => $weather,
                                                'weathertitle' => implode(' ', $weathertitle),
-                                               'applications' => $applications
+                                               'applications' => $applications,
+                                               'rate' => $session['p_rate'],
+                                               'hat' => $session['p_hat']
                                        ];
                                }
                        }