liquid_feedback_core
changeset 501:4a8d9f00867b
Use "recipient_id" instead of "member_id" in function "get_initiatives_for_notification"
author | jbe |
---|---|
date | Mon Apr 04 18:51:13 2016 +0200 (2016-04-04) |
parents | c1a2954078d7 |
children | f39c673420cb |
files | core.sql update/core-update.v3.1.0-v3.2.0.sql |
line diff
1.1 --- a/core.sql Mon Apr 04 18:46:44 2016 +0200 1.2 +++ b/core.sql Mon Apr 04 18:51:13 2016 +0200 1.3 @@ -3120,7 +3120,7 @@ 1.4 ------------------------- 1.5 1.6 CREATE FUNCTION "get_initiatives_for_notification" 1.7 - ( "member_id_p" "member"."id"%TYPE ) 1.8 + ( "recipient_id_p" "member"."id"%TYPE ) 1.9 RETURNS SETOF "initiative_for_notification" 1.10 LANGUAGE 'plpgsql' VOLATILE AS $$ 1.11 DECLARE 1.12 @@ -3129,10 +3129,10 @@ 1.13 "last_suggestion_id_v" "suggestion"."id"%TYPE; 1.14 BEGIN 1.15 PERFORM "require_transaction_isolation"(); 1.16 - PERFORM NULL FROM "member" WHERE "id" = "member_id_p" FOR UPDATE; 1.17 + PERFORM NULL FROM "member" WHERE "id" = "recipient_id_p" FOR UPDATE; 1.18 FOR "result_row" IN 1.19 SELECT * FROM "initiative_for_notification" 1.20 - WHERE "member_id" = "member_id_p" 1.21 + WHERE "recipient_id" = "recipient_id_p" 1.22 LOOP 1.23 SELECT "id" INTO "last_draft_id_v" FROM "draft" 1.24 WHERE "draft"."initiative_id" = "result_row"."initiative_id" 1.25 @@ -3143,7 +3143,7 @@ 1.26 INSERT INTO "initiative_notification_sent" 1.27 ("member_id", "initiative_id", "last_draft_id", "last_suggestion_id") 1.28 VALUES ( 1.29 - "member_id_p", 1.30 + "recipient_id_p", 1.31 "result_row"."initiative_id", 1.32 "last_draft_id_v", 1.33 "last_suggestion_id_v" ) 1.34 @@ -3162,12 +3162,12 @@ 1.35 END LOOP; 1.36 DELETE FROM "initiative_notification_sent" 1.37 USING "initiative", "issue" 1.38 - WHERE "initiative_notification_sent"."member_id" = "member_id_p" 1.39 + WHERE "initiative_notification_sent"."member_id" = "recipient_id_p" 1.40 AND "initiative"."id" = "initiative_notification_sent"."initiative_id" 1.41 AND "issue"."id" = "initiative"."issue_id" 1.42 AND ( "issue"."closed" NOTNULL OR "issue"."fully_frozen" NOTNULL ); 1.43 UPDATE "member" SET "notification_counter" = "notification_counter" + 1 1.44 - WHERE "id" = "member_id_p"; 1.45 + WHERE "id" = "recipient_id_p"; 1.46 RETURN; 1.47 END; 1.48 $$;
2.1 --- a/update/core-update.v3.1.0-v3.2.0.sql Mon Apr 04 18:46:44 2016 +0200 2.2 +++ b/update/core-update.v3.1.0-v3.2.0.sql Mon Apr 04 18:51:13 2016 +0200 2.3 @@ -350,7 +350,7 @@ 2.4 "subscription"."member_id" NOTNULL ); 2.5 2.6 CREATE FUNCTION "get_initiatives_for_notification" 2.7 - ( "member_id_p" "member"."id"%TYPE ) 2.8 + ( "recipient_id_p" "member"."id"%TYPE ) 2.9 RETURNS SETOF "initiative_for_notification" 2.10 LANGUAGE 'plpgsql' VOLATILE AS $$ 2.11 DECLARE 2.12 @@ -359,10 +359,10 @@ 2.13 "last_suggestion_id_v" "suggestion"."id"%TYPE; 2.14 BEGIN 2.15 PERFORM "require_transaction_isolation"(); 2.16 - PERFORM NULL FROM "member" WHERE "id" = "member_id_p" FOR UPDATE; 2.17 + PERFORM NULL FROM "member" WHERE "id" = "recipient_id_p" FOR UPDATE; 2.18 FOR "result_row" IN 2.19 SELECT * FROM "initiative_for_notification" 2.20 - WHERE "member_id" = "member_id_p" 2.21 + WHERE "recipient_id" = "recipient_id_p" 2.22 LOOP 2.23 SELECT "id" INTO "last_draft_id_v" FROM "draft" 2.24 WHERE "draft"."initiative_id" = "result_row"."initiative_id" 2.25 @@ -373,7 +373,7 @@ 2.26 INSERT INTO "initiative_notification_sent" 2.27 ("member_id", "initiative_id", "last_draft_id", "last_suggestion_id") 2.28 VALUES ( 2.29 - "member_id_p", 2.30 + "recipient_id_p", 2.31 "result_row"."initiative_id", 2.32 "last_draft_id_v", 2.33 "last_suggestion_id_v" ) 2.34 @@ -392,12 +392,12 @@ 2.35 END LOOP; 2.36 DELETE FROM "initiative_notification_sent" 2.37 USING "initiative", "issue" 2.38 - WHERE "initiative_notification_sent"."member_id" = "member_id_p" 2.39 + WHERE "initiative_notification_sent"."member_id" = "recipient_id_p" 2.40 AND "initiative"."id" = "initiative_notification_sent"."initiative_id" 2.41 AND "issue"."id" = "initiative"."issue_id" 2.42 AND ( "issue"."closed" NOTNULL OR "issue"."fully_frozen" NOTNULL ); 2.43 UPDATE "member" SET "notification_counter" = "notification_counter" + 1 2.44 - WHERE "id" = "member_id_p"; 2.45 + WHERE "id" = "recipient_id_p"; 2.46 RETURN; 2.47 END; 2.48 $$;