New page title schema

[airbundle] / Repository / SessionRepository.php

diff --git a/Repository/SessionRepository.php b/Repository/SessionRepository.php
index f6ecb6d432437092f9502aebbd94e6083119c18b..2cb2b260c8bbb11a44d13d5206cf7c099f2e7dc6 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.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,
        l.title AS l_title,
        l.latitude AS l_latitude,
        l.longitude AS l_longitude,


@@ -232,7 +231,6 @@ SQL;
                        ->addScalarResult('l_city', 'l_city', 'string')
                        ->addScalarResult('l_latitude', 'l_latitude', 'float')
                        ->addScalarResult('l_longitude', 'l_longitude', 'float')
                        ->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')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')


@@ -317,7 +315,6 @@ SELECT
        s.created,
        s.updated,
        s.location_id AS l_id,
        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,
        l.title AS l_title,
        l.address AS l_address,
        l.zipcode AS l_zipcode,


@@ -339,6 +336,8 @@ SELECT
        p.donate AS p_donate,
        p.link AS p_link,
        p.profile AS p_profile,
        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,
        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 +386,6 @@ SQL;
                        ->addScalarResult('created', 'created', 'datetime')
                        ->addScalarResult('updated', 'updated', 'datetime')
                        ->addScalarResult('l_id', 'l_id', 'integer')
                        ->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')
                        ->addScalarResult('l_title', 'l_title', 'string')
                        ->addScalarResult('l_address', 'l_address', 'string')
                        ->addScalarResult('l_zipcode', 'l_zipcode', 'string')


@@ -409,6 +407,8 @@ SQL;
                        ->addScalarResult('p_donate', 'p_donate', 'text')
                        ->addScalarResult('p_link', 'p_link', 'text')
                        ->addScalarResult('p_profile', 'p_profile', 'text')
                        ->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')
                        ->addScalarResult('p_updated', 'p_updated', 'datetime')
                        //XXX: is a string because of \n separator
                        ->addScalarResult('sa_id', 'sa_id', 'string')


@@ -443,7 +443,7 @@ SQL;
         * @param $sessionId The session id
         * @param $granted The session is granted
         */
         * @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();
 
                //Get entity manager
                $em = $this->getEntityManager();
 


@@ -460,6 +460,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: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" => '',
                        'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
                        ':afterid' => 4,
                        "\t" => '',


@@ -486,6 +487,7 @@ SQL;
 
                //Set the request
                $req = <<<SQL
 
                //Set the request
                $req = <<<SQL

+

 SELECT
        s.id,
        s.date,
 SELECT
        s.id,
        s.date,


@@ -497,7 +499,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,
        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,
        l.title AS l_title,
        s.slot_id AS t_id,
        t.title AS t_title,


@@ -505,6 +506,8 @@ SELECT
        a.canceled AS a_canceled,
        a.user_id AS au_id,
        au.pseudonym AS au_pseudonym,
        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
        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 +516,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)
 ${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
 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 +545,13 @@ SQL;
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
                        ->addScalarResult('l_id', 'l_id', 'integer')
                        ->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('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
                        //XXX: is a string because of \n separator
                        ->addScalarResult('sau_id', 'sau_id', 'string')
                        //XXX: is a string because of \n separator


@@ -557,7 +562,8 @@ SQL;
                $res = $em
                        ->createNativeQuery($req, $rsm)
                        ->setParameter('begin', $period->getStartDate())
                $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)) {
 
                //Add optional location id
                if (!empty($locationId)) {


@@ -717,14 +723,16 @@ SQL;
                                                'id' => $session['id'],
                                                'start' => $session['start'],
                                                'stop' => $session['stop'],
                                                '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),
                                                '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 +753,7 @@ SQL;
         * @param $userId The user id
         * @param $sessionId The session id
         */
         * @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();
 
                //Get entity manager
                $em = $this->getEntityManager();
 


@@ -762,6 +770,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: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" => '',
                        'RapsysAirBundle:User' => $qs->getTableName($em->getClassMetadata('RapsysAirBundle:User'), $dp),
                        ':afterid' => 4,
                        "\t" => '',


@@ -793,19 +802,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,
        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,
        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)
        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)
 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 +847,12 @@ SQL;
                        ->addScalarResult('t_id', 't_id', 'integer')
                        ->addScalarResult('t_title', 't_title', 'string')
                        ->addScalarResult('l_id', 'l_id', 'integer')
                        ->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('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
                        //XXX: is a string because of \n separator
                        ->addScalarResult('sau_id', 'sau_id', 'string')
                        //XXX: is a string because of \n separator


@@ -853,6 +865,7 @@ SQL;
                        ->setParameter('begin', $period->getStartDate())
                        ->setParameter('end', $period->getEndDate())
                        ->setParameter('uid', $userId)
                        ->setParameter('begin', $period->getStartDate())
                        ->setParameter('end', $period->getEndDate())
                        ->setParameter('uid', $userId)

+                       ->setParameter('locale', $locale)

                        ->getResult();
 
                //Init calendar
                        ->getResult();
 
                //Init calendar


@@ -1008,14 +1021,16 @@ SQL;
                                                'id' => $session['id'],
                                                'start' => $session['start'],
                                                'stop' => $session['stop'],
                                                '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),
                                                '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']

                                        ];
                                }
                        }
                                        ];
                                }
                        }