[WIP] Make checking optional for dependent encoding profiles

Application/Migrations/__tmp_upgrade_tables-2017-08-21-subencoding-skips.sql

@@ -0,0 +1,152 @@
+BEGIN;
+
+SET ROLE TO postgres;
+
+DROP FUNCTION ticket_state_next(bigint, enum_ticket_type, enum_ticket_state);
+CREATE OR REPLACE FUNCTION ticket_state_next(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_state enum_ticket_state, param_ticket_id bigint default NULL)
+	RETURNS TABLE(ticket_state enum_ticket_state, service_executable boolean) AS
+$$
+DECLARE
+BEGIN
+	RETURN QUERY
+	SELECT
+		pts.ticket_state, pts.service_executable
+	FROM
+		tbl_ticket_state ts1
+		JOIN
+		tbl_project_ticket_state pts ON pts.ticket_type = ts1.ticket_type AND pts.ticket_state = ts1.ticket_state
+		JOIN
+		tbl_ticket_state ts2 ON ts1.ticket_type = ts2.ticket_type AND ts1.sort > ts2.sort
+	WHERE
+		pts.project_id = param_project_id AND
+		ts2.ticket_type = param_ticket_type AND
+		ts2.ticket_state = param_ticket_state AND
+		(pts.skip_on_dependent = false OR
+		 ( /* is master encoding ticket */
+			 SELECT ep.depends_on
+			 FROM tbl_ticket t
+				 JOIN tbl_encoding_profile_version epv ON epv.id = t.encoding_profile_version_id
+				 JOIN tbl_encoding_profile ep ON ep.id = epv.encoding_profile_id
+			 WHERE t.id = param_ticket_id
+		 ) IS NULL
+		)
+	ORDER BY
+		ts1.sort ASC
+	LIMIT 1;
+	IF NOT FOUND THEN
+		RETURN QUERY SELECT NULL::enum_ticket_state, false;
+	END IF;
+END
+$$
+LANGUAGE plpgsql;
+
+DROP FUNCTION ticket_state_previous(bigint, enum_ticket_type, enum_ticket_state);
+CREATE OR REPLACE FUNCTION ticket_state_previous(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_state enum_ticket_state, param_ticket_id bigint default NULL)
+	RETURNS TABLE(ticket_state enum_ticket_state, service_executable boolean) AS
+$$
+DECLARE
+BEGIN
+	RETURN QUERY
+	SELECT
+		pts.ticket_state, pts.service_executable
+	FROM
+		tbl_ticket_state ts1
+		JOIN
+		tbl_project_ticket_state pts ON pts.ticket_type = ts1.ticket_type AND pts.ticket_state = ts1.ticket_state
+		JOIN
+		tbl_ticket_state ts2 ON ts1.ticket_type = ts2.ticket_type AND ts1.sort < ts2.sort
+	WHERE
+		pts.project_id = param_project_id AND
+		ts2.ticket_type = param_ticket_type AND
+		ts2.ticket_state = param_ticket_state AND
+		(pts.skip_on_dependent = false OR
+		 ( /* is master encoding ticket */
+			 SELECT ep.depends_on
+			 FROM tbl_ticket t
+				 JOIN tbl_encoding_profile_version epv ON epv.id = t.encoding_profile_version_id
+				 JOIN tbl_encoding_profile ep ON ep.id = epv.encoding_profile_id
+			 WHERE t.id = param_ticket_id
+		 ) IS NULL
+		)
+	ORDER BY
+		ts1.sort DESC
+	LIMIT 1;
+	IF NOT FOUND THEN
+		RETURN QUERY SELECT NULL::enum_ticket_state, false;
+	END IF;
+END
+$$
+LANGUAGE plpgsql;
+
+DROP FUNCTION ticket_state_commence(bigint, enum_ticket_type);
+CREATE OR REPLACE FUNCTION ticket_state_commence(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_id bigint)
+	RETURNS enum_ticket_state AS
+$$
+DECLARE
+	ret enum_ticket_state;
+	next_state record;
+BEGIN
+	-- special case: meta ticket, since it has no serviceable states
+	IF param_ticket_type = 'meta' THEN
+		RETURN 'staged'::enum_ticket_state;
+	END IF;
+
+	ret := (SELECT ticket_state_initial(param_project_id, param_ticket_type));
+
+	WHILE ret IS NOT NULL LOOP
+		SELECT * INTO next_state FROM ticket_state_next(param_project_id, param_ticket_type, ret, param_ticket_id);
+		IF NOT FOUND THEN
+			ret := NULL;
+			EXIT;
+		END IF;
+
+		-- exit, if serviceable state is found
+		EXIT WHEN next_state.service_executable IS TRUE;
+
+		-- otherwise set current state as possible commence state
+		ret := next_state.ticket_state;
+	END LOOP;
+
+	RETURN ret;
+END
+$$
+LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION update_ticket_next_state()
+	RETURNS trigger AS
+$BODY$
+DECLARE
+	next_state record;
+BEGIN
+	next_state := ticket_state_next(NEW.project_id, NEW.ticket_type, NEW.ticket_state, NEW.id);
+
+	NEW.ticket_state_next := next_state.ticket_state;
+	NEW.service_executable := next_state.service_executable;
+
+	RETURN NEW;
+END
+$BODY$
+LANGUAGE plpgsql VOLATILE;
+
+CREATE OR REPLACE FUNCTION update_all_tickets_progress_and_next_state(param_project_id bigint)
+	RETURNS VOID AS
+$BODY$
+BEGIN
+
+	UPDATE tbl_ticket t SET
+		(progress, ticket_state_next, service_executable)
+		= (tp, (n).ticket_state, (n).service_executable)
+	FROM (
+				 SELECT id, ticket_state_next(t2.project_id, t2.ticket_type, t2.ticket_state, t2.id) AS n, ticket_progress(t2.id) as tp
+				 FROM tbl_ticket t2
+				 WHERE t2.project_id = param_project_id AND param_project_id IS NOT NULL
+			 ) AS x
+	WHERE t.id = x.id;
+
+END;
+$BODY$
+LANGUAGE plpgsql VOLATILE;
+
+ALTER TABLE tbl_project_ticket_state ADD COLUMN skip_on_dependent BOOLEAN NOT NULL DEFAULT FALSE;
+
+COMMIT;

src/Application/Controller/XMLRPC/Handler.php

@@ -437,7 +437,7 @@ public function setCommenceTicketState($ticket_id) {
 				throw new Exception(__FUNCTION__.': ticket is not in initial state!',1304);
 			}
 
-			$commenceState = ProjectTicketState::getCommenceState($ticket['project_id'], $ticket['ticket_type']);
+			$commenceState = ProjectTicketState::getCommenceState($ticket['project_id'], $ticket['ticket_type'], $ticket_id);
 			if(!$commenceState) {
 				throw new Exception(__FUNCTION__.': ticket has no commence state!',1305);
 			}

src/Application/Migrations/04_projects.sql

@@ -50,6 +50,7 @@ CREATE TABLE tbl_project_ticket_state
   ticket_type enum_ticket_type NOT NULL,
   ticket_state enum_ticket_state NOT NULL,
   service_executable boolean NOT NULL DEFAULT false,
+  skip_on_dependent boolean NOT NULL DEFAULT false,
   CONSTRAINT tbl_project_ticket_state_pk PRIMARY KEY (project_id, ticket_type, ticket_state),
   CONSTRAINT tbl_project_ticket_state_project_fk FOREIGN KEY (project_id)
       REFERENCES tbl_project (id) MATCH SIMPLE

src/Application/Migrations/06_tickets.sql

@@ -40,7 +40,7 @@ $BODY$
   DECLARE
    next_state record;
   BEGIN
-    next_state := ticket_state_next(NEW.project_id, NEW.ticket_type, NEW.ticket_state);
+    next_state := ticket_state_next(NEW.project_id, NEW.ticket_type, NEW.ticket_state, NEW.id);
 
     NEW.ticket_state_next := next_state.ticket_state;
     NEW.service_executable := next_state.service_executable;
@@ -76,7 +76,7 @@ $BODY$
       (progress, ticket_state_next, service_executable)
         = (tp, (n).ticket_state, (n).service_executable)
     FROM (
-      SELECT id, ticket_state_next(t2.project_id, t2.ticket_type, t2.ticket_state) AS n, ticket_progress(t2.id) as tp
+      SELECT id, ticket_state_next(t2.project_id, t2.ticket_type, t2.ticket_state, t2.id) AS n, ticket_progress(t2.id) as tp
       FROM tbl_ticket t2
       WHERE t2.project_id = param_project_id AND param_project_id IS NOT NULL
     ) AS x

src/Application/Migrations/15_function_ticket_state.sql

@@ -2,7 +2,7 @@ BEGIN;
 
 SET ROLE TO postgres;
 
-CREATE OR REPLACE FUNCTION ticket_state_next(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_state enum_ticket_state)
+CREATE OR REPLACE FUNCTION ticket_state_next(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_state enum_ticket_state, param_ticket_id bigint default NULL)
   RETURNS TABLE(ticket_state enum_ticket_state, service_executable boolean) AS
   $$
 DECLARE
@@ -19,7 +19,16 @@ BEGIN
 	WHERE
 		pts.project_id = param_project_id AND
 		ts2.ticket_type = param_ticket_type AND
-		ts2.ticket_state = param_ticket_state
+		ts2.ticket_state = param_ticket_state AND
+		(pts.skip_on_dependent = false OR
+			( /* is master encoding ticket */
+				SELECT ep.depends_on
+				FROM tbl_ticket t
+				JOIN tbl_encoding_profile_version epv ON epv.id = t.encoding_profile_version_id
+				JOIN tbl_encoding_profile ep ON ep.id = epv.encoding_profile_id
+				WHERE t.id = param_ticket_id
+			) IS NULL
+		)
   ORDER BY
     ts1.sort ASC
 	LIMIT 1;
@@ -30,7 +39,7 @@ END
 $$
 LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION ticket_state_previous(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_state enum_ticket_state)
+CREATE OR REPLACE FUNCTION ticket_state_previous(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_state enum_ticket_state, param_ticket_id bigint default NULL)
   RETURNS TABLE(ticket_state enum_ticket_state, service_executable boolean) AS
   $$
 DECLARE
@@ -47,7 +56,16 @@ BEGIN
 	WHERE
 		pts.project_id = param_project_id AND
 		ts2.ticket_type = param_ticket_type AND
-		ts2.ticket_state = param_ticket_state
+		ts2.ticket_state = param_ticket_state AND
+		(pts.skip_on_dependent = false OR
+		 ( /* is master encoding ticket */
+			 SELECT ep.depends_on
+			 FROM tbl_ticket t
+				 JOIN tbl_encoding_profile_version epv ON epv.id = t.encoding_profile_version_id
+				 JOIN tbl_encoding_profile ep ON ep.id = epv.encoding_profile_id
+			 WHERE t.id = param_ticket_id
+		 ) IS NULL
+		)
   ORDER BY
     ts1.sort DESC
 	LIMIT 1;
@@ -96,7 +114,7 @@ END
 $$
 LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION ticket_state_commence(param_project_id bigint, param_ticket_type enum_ticket_type)
+CREATE OR REPLACE FUNCTION ticket_state_commence(param_project_id bigint, param_ticket_type enum_ticket_type, param_ticket_id bigint)
   RETURNS enum_ticket_state AS
 $$
 DECLARE
@@ -111,7 +129,7 @@ BEGIN
   ret := (SELECT ticket_state_initial(param_project_id, param_ticket_type));
 
   WHILE ret IS NOT NULL LOOP
-    SELECT * INTO next_state FROM ticket_state_next(param_project_id, param_ticket_type, ret);
+    SELECT * INTO next_state FROM ticket_state_next(param_project_id, param_ticket_type, ret, param_ticket_id);
     IF NOT FOUND THEN
       ret := NULL;
       EXIT;

src/Application/Model/ProjectTicketState.php

@@ -21,30 +21,30 @@ class ProjectTicketState extends Model {
 		];
 
 		// TODO: use Ticket::queryNextState / queryPreviousState?
-		public static function getNextState($project, $type, $state) {
+		public static function getNextState($project, $type, $state, $ticket) {
 			$handle = Database::$Instance->query(
-				'SELECT * FROM ticket_state_next(?, ?, ?)',
-				[$project, $type, $state]
+				'SELECT * FROM ticket_state_next(?, ?, ?, ?)',
+				[$project, $type, $state, $ticket]
 			);
 			$row = $handle->fetch();
 
 			return ($row === false)? null : $row;
 		}
 
-		public static function getPreviousState($project, $type, $state) {
+		public static function getPreviousState($project, $type, $state, $ticket) {
 			$handle = Database::$Instance->query(
-				'SELECT * FROM ticket_state_previous(?, ?, ?)',
-				[$project, $type, $state]
+				'SELECT * FROM ticket_state_previous(?, ?, ?, ?)',
+				[$project, $type, $state, $ticket]
 			);
 
 			$row = $handle->fetch();
 			return ($row === false)? null : $row;
 		}
 
-		public static function getCommenceState($project, $type) {
+		public static function getCommenceState($project, $type, $ticket) {
 			$handle = Database::$Instance->query(
-				'SELECT ticket_state_commence(?, ?)',
-				[$project, $type]
+				'SELECT ticket_state_commence(?, ?, ?)',
+				[$project, $type, $ticket]
 			);
 
 			return $handle->fetch()['ticket_state_commence'];

src/Application/Model/Ticket.php

@@ -855,12 +855,13 @@ public function queryPreviousState($state = null) {
 			return (new Database_Query(''))
 				->select('ticket_state')
 				->from(
-					'ticket_state_previous(?, ?, ?)',
+					'ticket_state_previous(?, ?, ?, ?)',
 					'previous_state',
 					[
 						$this['project_id'],
 						$this['ticket_type'],
-						($state === null)? $this['ticket_state'] : $state
+						($state === null)? $this['ticket_state'] : $state,
+						$this['id']
 					]
 				);
 		}
@@ -869,16 +870,17 @@ public function queryNextState($state = null) {
 			return (new Database_Query(''))
 				->select('ticket_state')
 				->from(
-					'ticket_state_next(?, ?, ?)',
+					'ticket_state_next(?, ?, ?, ?)',
 					'next_state',
 					[
 						$this['project_id'],
 						$this['ticket_type'],
-						($state === null)? $this['ticket_state'] : $state
+						($state === null)? $this['ticket_state'] : $state,
+						$this['id']
 					]
 				);
 		}
-		
+
 		public function findNextForAction($state) {
 			$next = null;
 

src/Application/Model/TicketState.php

@@ -9,7 +9,9 @@ class TicketState extends Model {
 		public $hasOne = [
 			'ProjectTicketState' => [
 				'foreign_key' => ['ticket_type', 'ticket_state'],
-				'select' => '(ticket_state IS NOT NULL) AS project_enabled, service_executable AS project_service_executable'
+				'select' => '(ticket_state IS NOT NULL) AS project_enabled,' .
+					'service_executable AS project_service_executable,' .
+					'skip_on_dependent AS project_skip_on_dependent'
 			]
 		];
 
@@ -31,6 +33,11 @@ public static function getStateByAction($action) {
 
 			return self::$_actions[$action];
 		}
+
+		public static function isSkippable($state) {
+			return ($state === 'postencoded' ||
+				$state === 'checking');
+		}
 
 		public function defaultScope(Model_Resource $resource) {
 			$resource->orderBy('ticket_type, sort');