feat: Remove versions from orc workflows and lifecycles, making the n…

…ame alone unique, and remove the ability to deactive lifecycles and workflows
joyent · Apr 20, 2018 · 6d26448 · 6d26448
1 parent 60015f7
commit 6d26448
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 160 deletions.
diff --git a/Conch/json-schema/v1.yaml b/Conch/json-schema/v1.yaml
@@ -950,26 +950,17 @@ definitions:
     required:
       - id
       - name
-      - version
       - created
       - updated
-      - deactivated
       - locked
       - steps
       - preflight
     properties:
-      deactivated:
-        anyOf:
-          - type: null
-          - type: string
-            format: date-time
       id:
         type: string
         format: uuid
       name:
         type: string
-      version:  
-        type: number
       created:
         type: string
         format: date-time
@@ -1124,7 +1115,6 @@ definitions:
     required:
       - id
       - name
-      - version
       - locked
       - role_id
       - plan
@@ -1142,8 +1132,6 @@ definitions:
       updated:
         type: string
         format: date-time
-      version:
-        type: number
       role_id:
         type: string
         format: uuid

diff --git a/Conch/lib/Conch/Controller/Orc/Lifecycles.pm b/Conch/lib/Conch/Controller/Orc/Lifecycles.pm
@@ -51,15 +51,11 @@ sub create ($c) {
 	my $body = $c->validate_input('OrcLifecycleCreate') or return;
 
 	$body->{version} = 0 unless $body->{version};
-	if(Conch::Orc::Lifecycle->from_name_and_version(
-		$body->{name},
-		$body->{version}
-	)) {
+	if(Conch::Orc::Lifecycle->from_name($body->{name})) {
 		return $c->status_with_validation(400, Error => {
-			error => "Lifecycle already exists with this name and version"
+			error => "Lifecycle already exists with this name"
 		});
 	}
-
 
 	my $l = Conch::Orc::Lifecycle->new($body->%*)->save();
 

diff --git a/Conch/lib/Conch/Controller/Orc/Workflows.pm b/Conch/lib/Conch/Controller/Orc/Workflows.pm
@@ -79,22 +79,6 @@ sub update ($c) {
 }
 
 
-=head2 delete
-
-"Delete" a workflow by marking it as deactivated
-
-=cut
-
-sub delete ($c) {
-	my $w = Conch::Orc::Workflow->from_id($c->param('id'));
-	return $c->status(404 => { error => "Not found" }) unless $w;
-	return $c->status(404 => { error => "Not found" }) if $w->deactivated;
-
-	$w->update(deactivated => Conch::Time->now)->save;
-	return $c->status(204); 
-}
-
-
 =head2 create_step
 
 Create a Workflow::Step tied to an existing Workflow

diff --git a/Conch/lib/Conch/Orc/Lifecycle.pm b/Conch/lib/Conch/Orc/Lifecycle.pm
@@ -62,20 +62,6 @@ has 'name' => (
 );
 
 
-=item version
-
-Number. Required. Defaults to 1
-
-=cut
-
-has 'version' => (
-	default  => 1,
-	is       => 'rw',
-	isa      => Num,
-	required => 1,
-);
-
-
 
 =item locked
 
@@ -123,7 +109,6 @@ sub _build_serializable_attributes { [qw[
 	created
 	updated
 	name
-	version
 	locked
 	role_id
 	plan
@@ -150,7 +135,7 @@ sub from_id ($class, $id) {
 				order by wlp.plan_order
 			) as plan
 			from workflow_lifecycle l
-			where l.deactivated is null and l.id = ?;
+			where l.id = ?;
 		|, $id)->hash;
 	} catch {
 		Mojo::Exception->throw(__PACKAGE__."->from_id: $_");
@@ -162,13 +147,13 @@ sub from_id ($class, $id) {
 }
 
 
-=head2 from_name_latest
+=head2 from_name
 
-Load the latest version of a Lifecycle for a given name
+Load a Lifecycle for by name
 
 =cut
 
-sub from_name_latest ($class, $name) {
+sub from_name ($class, $name) {
 	my $ret;
 	try {
 		$ret = Conch::Pg->new->db->query(qq|
@@ -179,42 +164,10 @@ sub from_name_latest ($class, $name) {
 				order by wlp.plan_order
 			) as plan
 			from workflow_lifecycle l
-			where l.deactivated is null and l.name = ?
-				order by l.version
-				limit 1
+			where l.name = ?
 		|, $name)->hash;
 	} catch {
-		Mojo::Exception->throw(__PACKAGE__."->from_name_latest: $_");
-		return undef;
-	};
-
-	return undef unless $ret;
-	return $class->new(_fixup_timestamptzs($ret)->%*);
-}
-
-=head2 from_name_and_version
-
-Load a Lifecycle by its name and version
-
-=cut
-
-sub from_name_and_version ($class, $name, $version) {
-	my $ret;
-	try {
-		$ret = Conch::Pg->new->db->query(qq|
-			select l.*, array(
-				select wlp.workflow_id
-				from workflow_lifecycle_plan wlp
-				where wlp.lifecycle_id = l.id
-				order by wlp.plan_order
-			) as plan
-			from workflow_lifecycle l
-			where l.deactivated is null
-				and l.name = ?
-				and l.version = ?;
-		|, $name, $version)->hash;
-	} catch {
-		Mojo::Exception->throw(__PACKAGE__."->from_name_and_version: $_");
+		Mojo::Exception->throw(__PACKAGE__."->from_name: $_");
 		return undef;
 	};
 
@@ -223,41 +176,6 @@ sub from_name_and_version ($class, $name, $version) {
 }
 
 
-=head2 many_from_name
-
-Load all Lifecycles that match a given name
-
-=cut
-
-sub many_from_name ($class, $name) {
-	my $ret;
-	try {
-		$ret = Conch::Pg->new->db->query(qq|
-			select l.*, array(
-				select wlp.workflow_id
-				from workflow_lifecycle_plan wlp
-				where wlp.lifecycle_id = l.id
-				order by wlp.plan_order
-			) as plan
-			from workflow_lifecycle l
-			where l.deactivated is null and l.name = ?;
-		|, $name)->hashes;
-	} catch {
-		Mojo::Exception->throw(__PACKAGE__."->many_from_name: $_");
-		return undef;
-	};
-
-	return [] unless $ret and $ret->@*;
-
-	my @many = map {
-		$class->new(_fixup_timestamptzs($_)->%*);
-	} $ret->@*;
-
-	return \@many;
-}
-
-
-
 =head2 all
 
 Returns an arrayref containing all active Lifecycles
@@ -275,7 +193,6 @@ sub all ($class) {
 				order by wlp.plan_order
 			) as plan
 			from workflow_lifecycle l
-			where l.deactivated is null;
 		|)->hashes;
 	} catch {
 		Mojo::Exception->throw(__PACKAGE__."->all: $_");
@@ -307,10 +224,6 @@ sub save ($self) {
 	delete @fields{ qw(id plan created updated) };
 	$fields{updated} = 'NOW()';
 
-	if ($fields{deactivated}) {
-		$fields{deactivated} = $fields{deactivated}->timestamptz;
-	}
-
 	my $ret;
 	try {
 		if($self->id) {
@@ -337,11 +250,6 @@ sub save ($self) {
 	$self->_set_id($ret->{id});
 	$self->_set_created(Conch::Time->new($ret->{created}));
 	$self->_set_updated(Conch::Time->new($ret->{updated}));
-
-	if($ret->{deactivated}) {
-		$self->deactivated($ret->{deactivated});
-	}
-
 	return $self;
 }
 

diff --git a/Conch/lib/Conch/Orc/Workflow.pm b/Conch/lib/Conch/Orc/Workflow.pm
@@ -62,20 +62,6 @@ has 'name' => (
 );
 
 
-=item version
-
-Number. Required. Defaults to 1
-
-=cut
-
-has 'version' => (
-	default  => 1,
-	is       => 'rw',
-	isa      => Num,
-	required => 1,
-);
-
-
 =item locked
 
 Boolean. Defaults to 0
@@ -126,10 +112,8 @@ has 'steps' => (
 sub _build_serializable_attributes {[qw[
 	id
 	name
-	version
 	created
 	updated
-	deactivated
 	locked
 	preflight
 	steps
@@ -196,6 +180,36 @@ sub from_id ($class, $id) {
 	return $class->new(_fixup_timestamptzs($ret)->%*);
 }
 
+=head2 from_name
+
+Load a Workflow by its name
+
+=cut
+
+sub from_name ($class, $id) {
+	my $ret;
+	try {
+		$ret = Conch::Pg->new->db->query(qq|
+			select w.*, array(
+				select ws.id
+				from workflow_step ws
+				where ws.workflow_id = w.id
+				order by ws.step_order
+			) as steps
+			from workflow w
+			where w.name = ?;
+		|, $id)->hash;
+	} catch {
+		Mojo::Exception->throw(__PACKAGE__."->from_name: $_");
+		return undef;
+	};
+
+	return undef unless $ret;
+
+	return $class->new(_fixup_timestamptzs($ret)->%*);
+}
+
+
 
 =head2 all
 
@@ -213,8 +227,7 @@ sub all ($class) {
 				where ws.workflow_id = w.id
 				order by ws.step_order
 			) as steps
-			from workflow w
-			where deactivated is null;
+			from workflow w;
 		|)->hashes;
 	} catch {
 		Mojo::Exception->throw(__PACKAGE__."->all: $_");
@@ -243,13 +256,10 @@ Returns C<$self>, allowing for method chaining
 sub save ($self) {
 	my $db = Conch::Pg->new()->db;
 
-	$self->_set_updated(Conch::Time->now);
 	my %fields = (
-		deactivated => $self->deactivated ? $self->deactivated->timestamptz : undef,
 		locked      => $self->locked,
 		name        => $self->name,
-		updated     => $self->updated->timestamptz,
-		version     => $self->version,
+		updated     => 'NOW()',
 		preflight   => $self->preflight,
 	);
 

diff --git a/Conch/lib/Conch/Route/Orc.pm b/Conch/lib/Conch/Route/Orc.pm
@@ -54,7 +54,6 @@ sub load ( $class, $r ) {
 
 	my $wi = $w->under("/:id");
 	$wi->post("/")->to("Orc::Workflows#update");
-	$wi->get("/delete")->to("Orc::Workflows#delete");
 	$wi->post("/step")->to("Orc::Workflows#create_step");
 
 	my $si = $o->under("/step/:id");

diff --git a/Conch/t/integration/orc/build.t b/Conch/t/integration/orc/build.t
@@ -92,8 +92,6 @@ $t->post_ok(BASE."/workflow", json => {
 
 $t->get_ok($t->tx->res->headers->location)->json_is(
 	'/locked' => 0,
-)->json_is(
-	'/version' => 1,
 )->json_schema_is("Workflow");
 
 my $wid = $t->tx->res->json->{id};
@@ -117,9 +115,6 @@ $t->get_ok(BASE."/workflow/".$wid)->status_is(200)->json_is(
 	'/name' => 'sungo'
 )->json_schema_is('Workflow');
 
-$t->get_ok(BASE."/workflow/".$wid."/delete")->status_is(204);
-
-$t->get_ok(BASE."/workflow/".$wid)->status_is(404)->json_schema_is("Error");
 
 ##########################
 

diff --git a/sql/migrations/0027-orc-simplification.sql b/sql/migrations/0027-orc-simplification.sql
@@ -0,0 +1,14 @@
+SELECT run_migration(27, $$
+
+	drop index workflow_name_idx;
+	alter table workflow drop constraint workflow_name_version_key;
+	alter table workflow add unique (name);
+
+	alter table workflow drop column version;
+	alter table workflow drop column deactivated;
+
+	drop index workflow_lifecycle_name_version_idx;
+	alter table workflow_lifecycle add unique(name);
+	alter table workflow_lifecycle drop column deactivated;
+
+$$);