# HG changeset patch
# User jbe
# Date 1288124298 -7200
# Node ID e588fdf1676e1e069e9c84ba791465482ca2720c
# Parent  f77c0f3d443c79d7c70e3f5075b31a9afe6ff4cb
Bugfix: "autoreject" only taken into account, when member is "active"

diff -r f77c0f3d443c -r e588fdf1676e core.sql
--- a/core.sql	Tue Sep 07 21:20:18 2010 +0200
+++ b/core.sql	Tue Oct 26 22:18:18 2010 +0200
@@ -6,7 +6,7 @@
 BEGIN;
 
 CREATE VIEW "liquid_feedback_version" AS
-  SELECT * FROM (VALUES ('1.2.8', 1, 2, 8))
+  SELECT * FROM (VALUES ('1.2.9', 1, 2, 9))
   AS "subquery"("string", "major", "minor", "revision");
 
 
@@ -2765,6 +2765,8 @@
       FOR "member_id_v" IN
         SELECT "interest"."member_id"
           FROM "interest"
+          JOIN "member"
+            ON "interest"."member_id" = "member"."id"
           LEFT JOIN "direct_voter"
             ON "interest"."member_id" = "direct_voter"."member_id"
             AND "interest"."issue_id" = "direct_voter"."issue_id"
@@ -2773,10 +2775,13 @@
             AND "interest"."issue_id" = "delegating_voter"."issue_id"
           WHERE "interest"."issue_id" = "issue_id_p"
           AND "interest"."autoreject" = TRUE
+          AND "member"."active"
           AND "direct_voter"."member_id" ISNULL
           AND "delegating_voter"."member_id" ISNULL
         UNION SELECT "membership"."member_id"
           FROM "membership"
+          JOIN "member"
+            ON "membership"."member_id" = "member"."id"
           LEFT JOIN "interest"
             ON "membership"."member_id" = "interest"."member_id"
             AND "interest"."issue_id" = "issue_id_p"
@@ -2788,6 +2793,7 @@
             AND "delegating_voter"."issue_id" = "issue_id_p"
           WHERE "membership"."area_id" = "issue_row"."area_id"
           AND "membership"."autoreject" = TRUE
+          AND "member"."active"
           AND "interest"."autoreject" ISNULL
           AND "direct_voter"."member_id" ISNULL
           AND "delegating_voter"."member_id" ISNULL
diff -r f77c0f3d443c -r e588fdf1676e update/core-update.v1.2.8-v1.2.9.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/update/core-update.v1.2.8-v1.2.9.sql	Tue Oct 26 22:18:18 2010 +0200
@@ -0,0 +1,145 @@
+BEGIN;
+ 
+CREATE OR REPLACE VIEW "liquid_feedback_version" AS
+  SELECT * FROM (VALUES ('1.2.9', 1, 2, 9))
+  AS "subquery"("string", "major", "minor", "revision");
+
+CREATE OR REPLACE FUNCTION "close_voting"("issue_id_p" "issue"."id"%TYPE)
+  RETURNS VOID
+  LANGUAGE 'plpgsql' VOLATILE AS $$
+    DECLARE
+      "issue_row"   "issue"%ROWTYPE;
+      "member_id_v" "member"."id"%TYPE;
+    BEGIN
+      PERFORM "lock_issue"("issue_id_p");
+      SELECT * INTO "issue_row" FROM "issue" WHERE "id" = "issue_id_p";
+      DELETE FROM "delegating_voter"
+        WHERE "issue_id" = "issue_id_p";
+      DELETE FROM "direct_voter"
+        WHERE "issue_id" = "issue_id_p"
+        AND "autoreject" = TRUE;
+      DELETE FROM "direct_voter" USING "member"
+        WHERE "direct_voter"."member_id" = "member"."id"
+        AND "direct_voter"."issue_id" = "issue_id_p"
+        AND "member"."active" = FALSE;
+      UPDATE "direct_voter" SET "weight" = 1
+        WHERE "issue_id" = "issue_id_p";
+      PERFORM "add_vote_delegations"("issue_id_p");
+      FOR "member_id_v" IN
+        SELECT "interest"."member_id"
+          FROM "interest"
+          JOIN "member"
+            ON "interest"."member_id" = "member"."id"
+          LEFT JOIN "direct_voter"
+            ON "interest"."member_id" = "direct_voter"."member_id"
+            AND "interest"."issue_id" = "direct_voter"."issue_id"
+          LEFT JOIN "delegating_voter"
+            ON "interest"."member_id" = "delegating_voter"."member_id"
+            AND "interest"."issue_id" = "delegating_voter"."issue_id"
+          WHERE "interest"."issue_id" = "issue_id_p"
+          AND "interest"."autoreject" = TRUE
+          AND "member"."active"
+          AND "direct_voter"."member_id" ISNULL
+          AND "delegating_voter"."member_id" ISNULL
+        UNION SELECT "membership"."member_id"
+          FROM "membership"
+          JOIN "member"
+            ON "membership"."member_id" = "member"."id"
+          LEFT JOIN "interest"
+            ON "membership"."member_id" = "interest"."member_id"
+            AND "interest"."issue_id" = "issue_id_p"
+          LEFT JOIN "direct_voter"
+            ON "membership"."member_id" = "direct_voter"."member_id"
+            AND "direct_voter"."issue_id" = "issue_id_p"
+          LEFT JOIN "delegating_voter"
+            ON "membership"."member_id" = "delegating_voter"."member_id"
+            AND "delegating_voter"."issue_id" = "issue_id_p"
+          WHERE "membership"."area_id" = "issue_row"."area_id"
+          AND "membership"."autoreject" = TRUE
+          AND "member"."active"
+          AND "interest"."autoreject" ISNULL
+          AND "direct_voter"."member_id" ISNULL
+          AND "delegating_voter"."member_id" ISNULL
+      LOOP
+        INSERT INTO "direct_voter"
+          ("member_id", "issue_id", "weight", "autoreject") VALUES
+          ("member_id_v", "issue_id_p", 1, TRUE);
+        INSERT INTO "vote" (
+          "member_id",
+          "issue_id",
+          "initiative_id",
+          "grade"
+          ) SELECT
+            "member_id_v" AS "member_id",
+            "issue_id_p"  AS "issue_id",
+            "id"          AS "initiative_id",
+            -1            AS "grade"
+          FROM "initiative" WHERE "issue_id" = "issue_id_p";
+      END LOOP;
+      PERFORM "add_vote_delegations"("issue_id_p");
+      UPDATE "issue" SET
+        "closed" = now(),
+        "voter_count" = (
+          SELECT coalesce(sum("weight"), 0)
+          FROM "direct_voter" WHERE "issue_id" = "issue_id_p"
+        )
+        WHERE "id" = "issue_id_p";
+      UPDATE "initiative" SET
+        "positive_votes" = "vote_counts"."positive_votes",
+        "negative_votes" = "vote_counts"."negative_votes",
+        "agreed" = CASE WHEN "majority_strict" THEN
+          "vote_counts"."positive_votes" * "majority_den" >
+          "majority_num" *
+          ("vote_counts"."positive_votes"+"vote_counts"."negative_votes")
+        ELSE
+          "vote_counts"."positive_votes" * "majority_den" >=
+          "majority_num" *
+          ("vote_counts"."positive_votes"+"vote_counts"."negative_votes")
+        END
+        FROM
+          ( SELECT
+              "initiative"."id" AS "initiative_id",
+              coalesce(
+                sum(
+                  CASE WHEN "grade" > 0 THEN "direct_voter"."weight" ELSE 0 END
+                ),
+                0
+              ) AS "positive_votes",
+              coalesce(
+                sum(
+                  CASE WHEN "grade" < 0 THEN "direct_voter"."weight" ELSE 0 END
+                ),
+                0
+              ) AS "negative_votes"
+            FROM "initiative"
+            JOIN "issue" ON "initiative"."issue_id" = "issue"."id"
+            JOIN "policy" ON "issue"."policy_id" = "policy"."id"
+            LEFT JOIN "direct_voter"
+              ON "direct_voter"."issue_id" = "initiative"."issue_id"
+            LEFT JOIN "vote"
+              ON "vote"."initiative_id" = "initiative"."id"
+              AND "vote"."member_id" = "direct_voter"."member_id"
+            WHERE "initiative"."issue_id" = "issue_id_p"
+            AND "initiative"."admitted"  -- NOTE: NULL case is handled too
+            GROUP BY "initiative"."id"
+          ) AS "vote_counts",
+          "issue",
+          "policy"
+        WHERE "vote_counts"."initiative_id" = "initiative"."id"
+        AND "issue"."id" = "initiative"."issue_id"
+        AND "policy"."id" = "issue"."policy_id";
+      -- NOTE: "closed" column of issue must be set at this point
+      DELETE FROM "battle" WHERE "issue_id" = "issue_id_p";
+      INSERT INTO "battle" (
+        "issue_id",
+        "winning_initiative_id", "losing_initiative_id",
+        "count"
+      ) SELECT
+        "issue_id",
+        "winning_initiative_id", "losing_initiative_id",
+        "count"
+        FROM "battle_view" WHERE "issue_id" = "issue_id_p";
+    END;
+  $$;
+
+COMMIT;