Replace 47 with SFBayChapterId variable

Author: alexsapps

server/src/form_processor/queries.go

@@ -1,5 +1,7 @@
 package form_processor
 
+import "github.com/dxe/adb/model"
+
 /* Form application queries */
 const applicationResponsesToProcessQuery = "SELECT id FROM form_application WHERE processed = 0 and name <> ''"
 
@@ -33,7 +35,7 @@ SET
 	# mark as processed
 	form_application.processed = 1
 WHERE
-    chapter_id = 47
+    chapter_id = ` + model.SFBayChapterIdStr + `
 	and form_application.id = ?
 	and form_application.name <> ''
 	and form_application.processed = 0
@@ -74,7 +76,7 @@ SET
 	# mark as processed
 	form_application.processed = 1
 WHERE
-    chapter_id = 47
+    chapter_id = ` + model.SFBayChapterIdStr + `
 	and form_application.id = ?
 	and form_application.name <> ''
 	and form_application.processed = 0
@@ -189,7 +191,7 @@ select
         '',
         '', 
         NULL,
-        '47',
+        '` + model.SFBayChapterIdStr + `',
 		form_application.language,
 		form_application.accessibility
 from
@@ -215,7 +217,7 @@ WHERE
 	and activists.dev_application_date = cast(form_application.timestamp as date)
 	and form_application.processed = 0
 	and activists.hidden < 1
-    and activists.chapter_id = 47;
+    and activists.chapter_id = ` + model.SFBayChapterIdStr + `;
 `
 
 /* Form interest query */
@@ -247,7 +249,7 @@ SET
 	form_interest.processed = 1
 
 WHERE
-    chapter_id = 47
+    chapter_id = ` + model.SFBayChapterIdStr + `
 	and form_interest.id = ?
 	and form_interest.processed = 0
 	and activists.hidden = 0
@@ -282,7 +284,7 @@ SET
 	# mark as processed
 	form_interest.processed = 1
 WHERE
-    chapter_id = 47
+    chapter_id = ` + model.SFBayChapterIdStr + `
 	and form_interest.id = ?
 	AND form_interest.processed = 0
 	AND activists.hidden = 0
@@ -392,7 +394,7 @@ SELECT
     '',
     NULL,
 	IF(LENGTH(form_interest.discord_id),form_interest.discord_id,NULL),
-    '47'
+    '` + model.SFBayChapterIdStr + `'
 FROM
 	form_interest
 WHERE
@@ -411,11 +413,11 @@ INNER JOIN
 SET
 	form_interest.processed = 1
 WHERE
-    activists.chapter_id = 47
+    activists.chapter_id = ` + model.SFBayChapterIdStr + `
 	AND form_interest.id = ?
 	AND form_interest.processed = 0
 	AND activists.hidden < 1;
 `
 
 /* Common queries */
-const countActivistsForEmailQuery = "SELECT count(id) AS amount FROM activists WHERE hidden = 0 and email = ? and chapter_id = 47"
+const countActivistsForEmailQuery = "SELECT count(id) AS amount FROM activists WHERE hidden = 0 and email = ? and chapter_id = " + model.SFBayChapterIdStr

server/src/form_processor/testing_queries.go

@@ -1,8 +1,10 @@
 package form_processor
 
+import "github.com/dxe/adb/model"
+
 /* Common queries */
 const insertActivistQuery = `
-INSERT INTO activists (id, email, name, chapter_id) VALUES (NULL, "email1", ?, 47);
+INSERT INTO activists (id, email, name, chapter_id) VALUES (NULL, "email1", ?, ` + model.SFBayChapterIdStr + `);
 `
 
 const getActivistsQuery = `SELECT id FROM activists;`

server/src/members/index.go

@@ -6,6 +6,8 @@ import (
 	"html/template"
 	"sort"
 	"strings"
+
+	"github.com/dxe/adb/model"
 )
 
 var admins = map[string]bool{
@@ -150,7 +152,7 @@ from (
           from events
         ) e on (e.id = ea.event_id)
   where a.email = ?
-    and a.chapter_id = 47
+    and a.chapter_id = ` + model.SFBayChapterIdStr + `
     and not a.hidden
   group by a.id, e.month
 ) x

server/src/members/reminder.go

@@ -5,6 +5,8 @@ import (
 	"html/template"
 	"sort"
 	"time"
+
+	"github.com/dxe/adb/model"
 )
 
 func (s *server) reminder() {
@@ -62,7 +64,7 @@ with target as (select ?),
 sfbay as (
   select *
   from activists a
-  where a.chapter_id = 47
+  where a.chapter_id = ` + model.SFBayChapterIdStr + `
     and a.activist_level in ('Organizer', 'Chapter Member')
     and not a.hidden
 ),

server/src/members/roster.go

@@ -11,6 +11,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/dxe/adb/model"
 )
 
 func (s *server) roster() {
@@ -112,7 +114,7 @@ with target as (select ?),
 sfbay as (
   select *
   from activists a
-  where a.chapter_id = 47
+  where a.chapter_id = ` + model.SFBayChapterIdStr + `
     and a.activist_level in ('Organizer', 'Chapter Member')
     and not a.hidden
 ),

server/src/model/activist.go

@@ -749,7 +749,7 @@ SELECT
   name,
   email
 FROM activists
-WHERE hidden = 0 AND activist_level IN('Organizer', 'Chapter Member') AND chapter_id = 47
+WHERE hidden = 0 AND activist_level IN('Organizer', 'Chapter Member') AND chapter_id = ` + SFBayChapterIdStr + `
 `
 
 	var activists []Activist
@@ -768,7 +768,7 @@ SELECT
   name,
   email
 FROM activists
-WHERE hidden = 0 AND activist_level = 'Organizer' AND chapter_id = 47
+WHERE hidden = 0 AND activist_level = 'Organizer' AND chapter_id = ` + SFBayChapterIdStr + `
 `
 
 	var activists []Activist
@@ -1152,7 +1152,7 @@ func UpdateActivistData(db *sqlx.DB, activist ActivistExtra, userEmail string) (
 	// if in the Bay Area, add to mailing list if needed
 	// TODO: make this work for other chapters too, maybe based on Chapters table mailing list info?
 	// or maybe just passing chapter Name or ID to the signup service?
-	if origActivist.ChapterID == 47 {
+	if origActivist.ChapterID == SFBayChapterId {
 		mailingListInfoChanged := activist.Name != origActivist.Name ||
 			activist.Email != origActivist.Email ||
 			activist.Phone != origActivist.Phone ||

server/src/model/chapters.go

@@ -74,6 +74,9 @@ type Organizer struct {
 
 type Organizers []*Organizer
 
+const SFBayChapterId = 47
+const SFBayChapterIdStr = "47"
+
 func (o Organizers) Value() (driver.Value, error) {
 	return json.Marshal(o)
 }

server/src/survey_mailer/survey_mailer.go

@@ -112,7 +112,7 @@ func survey(db *sqlx.DB, surveyOptions SurveyOptions) {
 		SurveySent:     "0",
 		SuppressSurvey: "0",
 		// TODO: consider not hard-coding this
-		ChapterID: 47, // SF Bay Area
+		ChapterID: model.SFBayChapterId,
 	})
 	if err != nil {
 		log.Printf("Failed to get events: %v", err)