TT#49688 Generate ical format for events separately

In v_time_sets_ical LEFT join is used insted of INNER join
Use varchar for the bysetpos for set input
Add duration and wkst fields to voip_timeset_periods
Add dtend into vcalendar header if presented
Add name into vcalendar

Change-Id: I077361c01adf034177f09401db9d7d2c4f838be3

db_scripts/diff/15512.down

@@ -0,0 +1,46 @@
+SET autocommit=0;
+USE provisioning;
+
+ALTER TABLE `voip_time_periods` MODIFY `bysetpos` int(11);
+ALTER TABLE `voip_time_periods` DROP COLUMN `duration`;
+ALTER TABLE `voip_time_periods` DROP COLUMN `wkst`;
+
+DROP VIEW `provisioning`.`v_time_periods_ical`;
+
+DROP VIEW `provisioning`.`v_time_sets_ical`;
+CREATE VIEW `v_time_sets_ical` AS
+SELECT s.id, s.name,
+    concat (
+        "BEGIN:VCALENDAR\n",
+        "PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN\n",
+        "VERSION:2.0\n\n",
+        GROUP_CONCAT(concat(
+            "BEGIN:VEVENT\n",
+            "UID:","sipwise",p.id,"@sipwise",s.id,"\n",
+            "SUMMARY:",s.name," event ",p.id,"\n",
+            "DTSTART:",DATE_FORMAT(p.start,'%Y%m%dT%H%i%s'),"\n",
+            "DTEND:",DATE_FORMAT(p.end,'%Y%m%dT%H%i%s'),"\n",
+            "RRULE:",
+                "FREQ=",p.freq,
+                IFNULL(CONCAT(";COUNT=",     p.`count`),''),
+                IFNULL(CONCAT(";UNTIL=",     DATE_FORMAT(p.until,'%Y%m%dT%H%i%s')),''),
+                IFNULL(CONCAT(";INTERVAL=",  p.`interval`),''),
+                IFNULL(CONCAT(";BYSECOND=",  p.bysecond),''),
+                IFNULL(CONCAT(";BYMINUTE=",  p.byminute),''),
+                IFNULL(CONCAT(";BYHOUR=",    p.byhour),''),
+                IFNULL(CONCAT(";BYDAY=",     p.byday),''),
+                IFNULL(CONCAT(";BYMONTHDAY=",p.bymonthday),''),
+                IFNULL(CONCAT(";BYYEARDAY=", p.byyearday),''),
+                IFNULL(CONCAT(";BYWEEKNO=",  p.byweekno),''),
+                IFNULL(CONCAT(";BYMONTH=",   p.bymonth),''),
+                IFNULL(CONCAT(";BYSETPOS=",  p.bysetpos),''),
+                "\n",
+            IFNULL(CONCAT("DESCRIPTION:",p.`comment`,"\n"),''),
+            "END:VEVENT\n"
+        )SEPARATOR '\n'),
+        "END:VCALENDAR\n"
+    ) AS ical
+FROM provisioning.voip_time_sets s JOIN voip_time_periods p ON s.id = p.time_set_id
+GROUP BY s.id;
+
+COMMIT;

db_scripts/diff/15512.up

@@ -0,0 +1,72 @@
+SET autocommit=0;
+USE provisioning;
+
+ALTER TABLE `voip_time_periods` MODIFY `bysetpos` varchar(45);
+ALTER TABLE `voip_time_periods` ADD COLUMN `duration` varchar(45);
+ALTER TABLE `voip_time_periods` ADD COLUMN `wkst` varchar(2);
+
+DROP VIEW IF EXISTS `provisioning`.`v_time_periods_ical`;
+CREATE VIEW `provisioning`.`v_time_periods_ical` AS
+SELECT p.`id`, p.`time_set_id`, p.`start`, p.`end`, p.`comment`,
+concat(
+    "DTSTART:",DATE_FORMAT(p.start,'%Y%m%dT%H%i%s'),"\n",
+    "RRULE:",
+    "FREQ=",p.freq,
+    IFNULL(CONCAT(";COUNT=",     p.`count`),''),
+    IFNULL(CONCAT(";UNTIL=",     DATE_FORMAT(p.until,'%Y%m%dT%H%i%s')),''),
+    IFNULL(CONCAT(";INTERVAL=",  p.`interval`),''),
+    IFNULL(CONCAT(";BYSECOND=",  p.bysecond),''),
+    IFNULL(CONCAT(";BYMINUTE=",  p.byminute),''),
+    IFNULL(CONCAT(";BYHOUR=",    p.byhour),''),
+    IFNULL(CONCAT(";BYDAY=",     p.byday),''),
+    IFNULL(CONCAT(";BYMONTHDAY=",p.bymonthday),''),
+    IFNULL(CONCAT(";BYYEARDAY=", p.byyearday),''),
+    IFNULL(CONCAT(";BYWEEKNO=",  p.byweekno),''),
+    IFNULL(CONCAT(";BYMONTH=",   p.bymonth),''),
+    IFNULL(CONCAT(";BYSETPOS=",  p.bysetpos),''),
+    IFNULL(CONCAT(";WKST=",      p.wkst),'')
+) AS rrule_ical,
+concat(
+    "BEGIN:VEVENT\n",
+    "UID:","sipwise",p.id,"@sipwise",s.id,"\n",
+    "SUMMARY:",s.name," event ",p.id,"\n",
+    "DTSTART:",DATE_FORMAT(p.start,'%Y%m%dT%H%i%s'),"\n",
+    IF(year(p.end) !="0000",CONCAT("DTEND:",DATE_FORMAT(p.end,'%Y%m%dT%H%i%s'),"\n"),""),
+    IFNULL(CONCAT("DURATION:",p.`duration`,"\n"),''),
+    "RRULE:",
+        "FREQ=",p.freq,
+        IFNULL(CONCAT(";COUNT=",     p.`count`),''),
+        IFNULL(CONCAT(";UNTIL=",     DATE_FORMAT(p.until,'%Y%m%dT%H%i%s')),''),
+        IFNULL(CONCAT(";INTERVAL=",  p.`interval`),''),
+        IFNULL(CONCAT(";BYSECOND=",  p.bysecond),''),
+        IFNULL(CONCAT(";BYMINUTE=",  p.byminute),''),
+        IFNULL(CONCAT(";BYHOUR=",    p.byhour),''),
+        IFNULL(CONCAT(";BYDAY=",     p.byday),''),
+        IFNULL(CONCAT(";BYMONTHDAY=",p.bymonthday),''),
+        IFNULL(CONCAT(";BYYEARDAY=", p.byyearday),''),
+        IFNULL(CONCAT(";BYWEEKNO=",  p.byweekno),''),
+        IFNULL(CONCAT(";BYMONTH=",   p.bymonth),''),
+        IFNULL(CONCAT(";BYSETPOS=",  p.bysetpos),''),
+        IFNULL(CONCAT(";WKST=",      p.wkst),''),
+        "\n",
+    IFNULL(CONCAT("DESCRIPTION:",p.`comment`,"\n"),''),
+    "END:VEVENT\n") AS event_ical
+FROM provisioning.voip_time_sets s JOIN voip_time_periods p ON s.id = p.time_set_id;
+
+DROP VIEW IF EXISTS `provisioning`.`v_time_sets_ical`;
+CREATE VIEW `v_time_sets_ical` AS
+SELECT s.id, s.name,
+    concat (
+        "BEGIN:VCALENDAR\n",
+        "PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN\n",
+		IFNULL(CONCAT("NAME:",s.name,"\n"),''),
+        "VERSION:2.0\n\n",
+        GROUP_CONCAT(p.event_ical SEPARATOR '\n'),
+        "END:VCALENDAR\n"
+    ) AS ical
+FROM provisioning.voip_time_sets s LEFT JOIN v_time_periods_ical p ON s.id = p.time_set_id
+GROUP BY s.id;
+
+
+COMMIT;
+