X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FCalls.pm;h=0ba04a513c40f2ceabe72a14b0bab6b504afb216;hp=5cfa0e343397ee6bf2b1f8c180e94e869694a281;hb=56ac564207e3abcfcc7929ec155c883a564862c6;hpb=c7cf222c8dfc10dec456bc68c1b7ca028a332baa

diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm
index 5cfa0e3..0ba04a5 100644
--- a/lib/NDWeb/Controller/Calls.pm
+++ b/lib/NDWeb/Controller/Calls.pm
@@ -34,17 +34,17 @@ sub list : Local {
 	my ( $self, $c, $type ) = @_;
 	my $dbh = $c->model;
 
-	my $where = q{open AND c.landing_tick-6 > tick()};
+	my $where = q{status = 'Open' AND landing_tick-6 > tick()};
 	my $order = q{landing_tick DESC, defprio DESC};
 	if (defined $type){
 		if ($type eq 'covered'){
-			$where = 'covered';
+			$where = q{status = 'Covered'};
 		}elsif ($type eq 'all'){
 			$where = 'true';
 		}elsif ($type eq 'uncovered'){
-			$where = 'not covered';
+			$where = q{status <> 'Covered'};
 		}elsif ($type eq 'recent'){
-			$where = q{c.landing_tick > tick()};
+			$where = q{landing_tick >= tick()};
 			$order = q{x,y,z};
 		}
 	}
@@ -53,44 +53,10 @@ sub list : Local {
 	$c->stash(maxprio => $dbh->selectrow_array($pointlimits,undef,'DEFMAXPRIO'));
 
 	my $query = $dbh->prepare(qq{
-		SELECT id,coords(x,y,z),planet,landing_tick,dc,curreta,fleets
-			,(0.2*(attack_points/GREATEST(a.attack,1))
-				+ 0.4*(defense_points/GREATEST(a.defense,1))
-				+ 0.2*(c.size/a.size) + 0.05*(c.score/a.score)
-				+ 0.15*(c.value/a.value))::Numeric(3,2) AS defprio
-			,array_accum(COALESCE(race::text,'')) AS race
-			,array_accum(COALESCE(amount,0)) AS amount
-			,array_accum(COALESCE(eta,0)) AS eta
-			,array_accum(COALESCE(shiptype,'')) AS shiptype
-			,array_accum(COALESCE(alliance,'?')) AS alliance
-			,array_accum(coords) AS attackers
-		FROM (SELECT c.id, p.x,p.y,p.z,p.id AS planet, p.size, p.value, p.score
-			,u.defense_points, u.attack_points, c.landing_tick
-			,dc.username AS dc, (c.landing_tick - tick()) AS curreta
-			,p2.race, i.amount, i.eta, i.shiptype, p2.alliance
-			,coords(p2.x,p2.y,p2.z),	COUNT(DISTINCT f.fid) AS fleets
-			FROM calls c 
-				JOIN users u ON c.member = u.uid
-				JOIN current_planet_stats p ON u.planet = p.id
-				LEFT OUTER JOIN incomings i ON i.call = c.id
-				LEFT OUTER JOIN current_planet_stats p2 ON i.sender = p2.id
-				LEFT OUTER JOIN users dc ON c.dc = dc.uid
-				LEFT OUTER JOIN launch_confirmations f ON f.target = u.planet
-					AND f.landing_tick = c.landing_tick AND f.back = f.landing_tick + f.eta - 1
-			WHERE $where
-			GROUP BY c.id, p.x,p.y,p.z,p.id, p.size, p.score, p.value, c.landing_tick
-				,u.defense_points,u.attack_points,dc.username
-				,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z
-			) c
-			,(SELECT avg(attack_points) AS attack, avg(defense_points) AS defense
-				, avg(size) AS size, avg(score) AS score, avg(value) AS value
-				FROM users u JOIN current_planet_stats p ON p.id = u.planet
-				WHERE uid IN (SELECT uid FROM groupmembers  where gid = 2)
-			) a
-		GROUP BY id, x,y,z,planet,landing_tick, defense_points, attack_points
-			,dc,curreta,fleets, c.size, c.score, c.value
-			, a.attack, a.defense, a.size, a.score, a.value
-		ORDER BY $order
+SELECT *, pid AS planet, coords(x,y,z)
+FROM full_defcalls
+WHERE $where
+ORDER BY $order
 		});
 	$query->execute;
 	$c->stash(calls => $query->fetchall_arrayref({}));
@@ -114,10 +80,10 @@ sub edit : Local {
 
 	my $outgoings = $dbh->prepare(q{ 
 (
-	SELECT DISTINCT ON (mission,name) fid,mission,name,tick, NULL AS eta
-		,amount, NULL AS coords, planet, NULL AS back, NULL AS recalled
+	SELECT DISTINCT ON (mission,name) 1 AS type, fid,mission,name,tick, NULL AS eta
+		,amount, NULL AS coords, pid AS planet, NULL AS back, NULL AS recalled
 	FROM fleets f
-	WHERE planet = $1 AND tick <= $2 AND (
+	WHERE pid = $1 AND tick <= $2 AND (
 			mission = 'Full fleet'
 			OR fid IN (SELECT fid FROM fleet_scans)
 		) AND (
@@ -126,27 +92,30 @@ sub edit : Local {
 		)
 	ORDER BY mission,name,tick DESC
 ) UNION (
-	SELECT fid,mission,name,landing_tick AS tick, eta, amount
-		, coords(x,y,z), t.id AS planet, back
+	SELECT 2 AS type, MAX(fid) AS fid,mission,name,landing_tick AS tick, eta, amount
+		, coords(x,y,z), pid AS planet, back
 		, (back <> landing_tick + eta - 1) AS recalled
-	FROM fleets f
-		JOIN launch_confirmations USING (fid)
-	LEFT OUTER JOIN current_planet_stats t ON target = t.id
-	WHERE f.planet = $1 AND back >= $2 AND landing_tick - eta - 12 < $2
+	FROM launch_confirmations
+		JOIN (
+			SELECT fid,amount,name,mission FROM fleets WHERE pid = $1
+		) f  USING (fid)
+		LEFT OUTER JOIN current_planet_stats t USING (pid)
+	WHERE back >= $2 AND landing_tick - eta - 12 < $2
+	GROUP BY mission,name,landing_tick,eta,amount,back,x,y,z,pid
 ) UNION (
 	SELECT DISTINCT ON (tick,x,y,z,mission,name,amount)
-		NULL as fid, i.mission, i.name, i.tick,eta
-		, i.amount, coords(x,y,z), t.id AS planet, back, NULL AS recalled
+		3 AS type, NULL as fid, i.mission, i.name, i.tick,eta
+		, i.amount, coords(x,y,z), t.pid AS planet, back, NULL AS recalled
 	FROM intel i
-	LEFT OUTER JOIN current_planet_stats t ON i.target = t.id
+	LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
 	WHERE uid = -1 AND i.sender = $1 AND i.tick > $2 - 14 AND i.tick < $2 + 14
 	ORDER BY i.tick,x,y,z,mission,name,amount,back
-)
+) ORDER BY type, mission,name,tick DESC
 	});
 	my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
 		WHERE fid = ? ORDER BY num
 		});
-	$outgoings->execute($call->{planet},$call->{landing_tick});
+	$outgoings->execute($call->{pid},$call->{landing_tick});
 	my @fleets;
 	while (my $fleet = $outgoings->fetchrow_hashref){
 		if (defined $fleet->{back} &&
@@ -166,9 +135,9 @@ sub edit : Local {
 	}
 
 	my $available = $dbh->prepare(q{
-SELECT ship,amount from ships_home WHERE planet = $1 AND tick = $2
+SELECT ship,amount from ships_home WHERE pid = $1 AND tick = $2
 		});
-	$available->execute($call->{planet}, $call->{landing_tick});
+	$available->execute($call->{pid}, $call->{landing_tick});
 	my $fleet = {fid => $call->{member}, mission => 'Available'
 		, name => 'At home', ships => $available->fetchall_arrayref({})
 	};
@@ -176,18 +145,37 @@ SELECT ship,amount from ships_home WHERE planet = $1 AND tick = $2
 
 	$c->stash(fleets => \@fleets);
 
-	my $defenders = $dbh->prepare(q{ 
-SELECT DISTINCT ON (x,y,z,s.id,name,amount,back) fid,mission, name, eta
-	, amount, coords(x,y,z) AS coords, landing_tick AS tick, f.planet
-	,back, (back <> landing_tick + eta - 1) AS recalled
-FROM launch_confirmations lc
-	JOIN fleets f USING (fid)
-	LEFT OUTER JOIN current_planet_stats s ON f.planet = s.id
-WHERE target = ? AND landing_tick = ? AND mission = 'Defend'
+	my $defenders = $dbh->prepare(q{
+WITH lc AS (
+	SELECT fid,uid,back,eta,landing_tick
+	FROM launch_confirmations
+	WHERE pid = $1 AND landing_tick = $2
+), lcp AS (
+	SELECT DISTINCT ON (fid) fid,tick,value
+	FROM lc
+		JOIN users u USING (uid)
+		JOIN planet_stats USING (pid)
+	WHERE tick <= landing_tick - eta
+	ORDER BY fid,tick DESC
+), lcv AS (
+	SELECT fid,(sum(amount*(metal+crystal+eonium)) / value)::int  AS value_ratio
+	FROM lcp
+		JOIN fleet_ships fs USING (fid)
+		JOIN ship_stats s ON s.name = fs.ship
+	GROUP BY fid, value
+)
+SELECT DISTINCT ON (x,y,z,pid,name,amount,back) fid,mission, name, eta
+	, amount, coords(x,y,z) AS coords, landing_tick AS tick, pid AS planet
+	,back, (back <> landing_tick + eta - 1) AS recalled, value_ratio
+FROM fleets f
+	LEFT OUTER JOIN current_planet_stats s USING (pid)
+	JOIN lc USING (fid)
+	JOIN lcv USING (fid)
+WHERE mission IN ('Defend', 'Fake Defend')
 ORDER BY x,y,z
 	});
 
-	$defenders->execute($call->{planet},$call->{landing_tick});
+	$defenders->execute($call->{pid},$call->{landing_tick});
 	my @defenders;
 	while (my $fleet = $defenders->fetchrow_hashref){
 		$ships->execute($fleet->{fid});
@@ -204,16 +192,16 @@ ORDER BY x,y,z
 
 	my $attackers = $dbh->prepare(q{
 		SELECT coords(p.x,p.y,p.z), p.planet_status, p.race,i.eta,i.amount
-			,i.fleet,i.shiptype,p.relationship,p.alliance,i.id,p.id AS planet
+			,i.fleet,i.shiptype,p.relationship,p.alliance,inc,pid
 		FROM incomings i
-			JOIN current_planet_stats p ON i.sender = p.id
+			JOIN current_planet_stats p USING (pid)
 		WHERE i.call = ?
 		ORDER BY p.x,p.y,p.z
 	});
-	$attackers->execute($call->{id});
+	$attackers->execute($call->{call});
 	my @attackers;
 	while(my $attacker = $attackers->fetchrow_hashref){
-		$outgoings->execute($attacker->{planet},$call->{landing_tick});
+		$outgoings->execute($attacker->{pid},$call->{landing_tick});
 		my @missions;
 		while (my $mission = $outgoings->fetchrow_hashref){
 			if ($mission->{fid}){
@@ -233,25 +221,22 @@ ORDER BY x,y,z
 	$c->stash(attackers => \@attackers);
 
 	$c->forward('/forum/findPosts',[$call->{ftid}]);
+
+	my $statuses = $dbh->prepare(q{
+SELECT status FROM call_statuses
+		});
+	$statuses->execute;
+	$c->stash(statuses => $statuses->fetchall_arrayref({}));
 }
 
 sub defleeches : Local {
 	my ( $self, $c, $type ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(q{SELECT username,defense_points,count(id) AS calls
-		, SUM(fleets) AS fleets, SUM(recalled) AS recalled
-		,count(NULLIF(fleets,0)) AS defended_calls
-		FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets
-			, count(NULLIF(f.landing_tick + f.eta -1 = f.back,TRUE)) AS recalled
-			FROM users u JOIN calls c ON c.member = u.uid
-				LEFT OUTER JOIN (
-					SELECT * FROM launch_confirmations JOIN fleets USING (fid)
-					WHERE mission = 'Defend'
-				) f ON u.planet = f.target AND c.landing_tick = f.landing_tick
-			GROUP BY username,defense_points,c.id
-		) d
-		GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
+	my $query = $dbh->prepare(q{
+SELECT username, defense_points, calls, fleets, recalled, defended_calls, value, sent_value
+FROM def_leeches
+ORDER BY value DESC NULLS LAST, defense_points
 		});
 	$query->execute;
 
@@ -265,7 +250,7 @@ sub postcallcomment : Local {
 	$call = $c->stash->{call};
 
 	$c->forward('/forum/insertPost',[$call->{ftid}]);
-	$c->res->redirect($c->uri_for('edit',$call->{id}));
+	$c->res->redirect($c->uri_for('edit',$call->{call}));
 }
 
 sub postcallupdate : Local {
@@ -281,42 +266,39 @@ sub postcallupdate : Local {
 
 	$dbh->begin_work;
 	if ($c->req->param('cmd') eq 'Submit'){
+		my $logmess = '';
 		if ($c->req->param('ctick')){
-			$dbh->do(q{UPDATE calls SET landing_tick = ? WHERE id = ?}
-				,undef,$c->req->param('tick'),$call->{id});
-			$log->execute($c->user->id,$call->{ftid}
-				,"Updated landing tick from [B] $call->{landing_tick} [/B]");
+			$dbh->do(q{UPDATE calls SET landing_tick = ? WHERE call = ?}
+				,undef,$c->req->param('tick'),$call->{call});
+			$logmess .= "Updated landing tick from [B] $call->{landing_tick} [/B]\n";
 		}
 		if ($c->req->param('cinfo')){
-			$dbh->do(q{UPDATE calls SET info = ? WHERE id = ?}
-				,undef,$c->req->param('info'),$call->{id});
-			$log->execute($c->user->id,$call->{ftid},"Updated info");
+			$dbh->do(q{UPDATE calls SET info = ? WHERE call = ?}
+				,undef,$c->req->param('info'),$call->{call});
+			$logmess .= "Updated info\n";
 		}
 		if ($c->req->param('ccalc')){
 			my $calc = $c->req->param('calc');
-			$dbh->do(q{UPDATE calls SET calc = ? WHERE id = ?}
-				,undef,$calc,$call->{id});
-			$log->execute($c->user->id,$call->{ftid},html_escape "Updated calc to: [URL] $calc [/URL]");
+			$dbh->do(q{UPDATE calls SET calc = ? WHERE call = ?}
+				,undef,$calc,$call->{call});
+			$logmess .= html_escape('Updated calc to: [URL]'.$calc."[/URL]\n");
 		}
-	}elsif($c->req->param('cmd') =~ /^(Cover|Uncover|Ignore|Open|Take) call$/){
-		my $extra_vars = '';
-		if ($1 eq 'Cover'){
-			$extra_vars = ", covered = TRUE, open = FALSE";
-		}elsif ($1 eq 'Uncover'){
-			$extra_vars = ", covered = FALSE, open = TRUE";
-		}elsif ($1 eq 'Ignore'){
-			$extra_vars = ", covered = FALSE, open = FALSE";
-		}elsif ($1 eq 'Open'){
-			$extra_vars = ", covered = FALSE, open = TRUE";
+		if ($c->req->param('cstatus')){
+			$dbh->do(q{UPDATE calls SET status = $1, dc = $2 WHERE call = $3}
+				,undef,$c->req->param('status'),$c->user->id,$call->{call});
+			$logmess .= "Changed status to: ".$c->req->param('status')."\n";
 		}
-		$dbh->do(qq{UPDATE calls SET dc = ? $extra_vars WHERE id = ?},
-			,undef,$c->user->id,$call->{id});
+		$log->execute($c->user->id,$call->{ftid},$logmess) if $log;
+	}elsif($c->req->param('cmd') =~ /^Take call$/){
+		my $extra_vars = '';
+		$dbh->do(q{UPDATE calls SET dc = ? WHERE call = ?},
+			,undef,$c->user->id,$call->{call});
 		$log->execute($c->user->id,$call->{ftid}
 			,'Changed status to: [B]'.$c->req->param('cmd').'[/B]');
 	}
 	$dbh->commit;
 
-	$c->res->redirect($c->uri_for('edit',$call->{id}));
+	$c->res->redirect($c->uri_for('edit',$call->{call}));
 }
 
 
@@ -333,24 +315,24 @@ sub postattackerupdate : Local {
 
 	$dbh->begin_work;
 	if($c->req->param('cmd') eq 'Remove'){
-		my $query = $dbh->prepare(q{DELETE FROM incomings WHERE id = ? AND call = ?});
-		my $inc = $dbh->prepare(q{SELECT sender,eta,amount FROM incomings WHERE id = $1});
+		my $query = $dbh->prepare(q{DELETE FROM incomings WHERE inc = ? AND call = ?});
+		my $inc = $dbh->prepare(q{SELECT pid,eta,amount FROM incomings WHERE inc = $1});
 		for my $param ($c->req->param()){
 			if ($param =~ /^change:(\d+)$/){
 				my ($planet,$eta,$amount) = $dbh->selectrow_array($inc,undef,$1);
-				$query->execute($1,$call->{id});
+				$query->execute($1,$call->{call});
 				$log->execute($c->user->id,$call->{ftid}
 					,"Deleted fleet: [B] $1 [/B] ($planet:$eta:$amount)");
 			}
 		}
 	}elsif($c->req->param('cmd') eq 'Change'){
 		my $query = $dbh->prepare(q{UPDATE incomings SET shiptype = ?
-			WHERE id = ? AND call = ?
+			WHERE inc = ? AND call = ?
 		});
 		for my $param ($c->req->param()){
 			if ($param =~ /^change:(\d+)$/){
 				my $shiptype = html_escape($c->req->param("shiptype:$1"));
-				$query->execute($shiptype,$1,$call->{id});
+				$query->execute($shiptype,$1,$call->{call});
 				$log->execute($c->user->id,$call->{ftid}
 					,"set fleet: [B] $1 [/B] to: [B] $shiptype [/B]");
 			}
@@ -358,7 +340,7 @@ sub postattackerupdate : Local {
 	}
 	$dbh->commit;
 
-	$c->res->redirect($c->uri_for('edit',$call->{id}));
+	$c->res->redirect($c->uri_for('edit',$call->{call}));
 }
 
 sub findCall : Private {
@@ -366,14 +348,14 @@ sub findCall : Private {
 	my $dbh = $c->model;
 
 	my $query = $dbh->prepare(q{
-		SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered
-			,open, dc.username AS dc, u.defense_points,c.member AS uid
-			,u.planet, u.username AS member, u.sms,c.ftid,calc
-		FROM calls c 
-		JOIN users u ON c.member = u.uid
+		SELECT call, coords(p.x,p.y,p.z), c.landing_tick, c.info, status
+			,dc.username AS dc, u.defense_points,c.uid
+			,p.pid, u.username AS member, u.sms,c.ftid,calc
+		FROM calls c
+		JOIN users u USING (uid)
+		JOIN current_planet_stats p USING (pid)
 		LEFT OUTER JOIN users dc ON c.dc = dc.uid
-		JOIN current_planet_stats p ON u.planet = p.id
-		WHERE c.id = ?
+		WHERE call = ?
 		});
 	$call = $dbh->selectrow_hashref($query,undef,$call);