Open platform to collect and prioritize feedback
refactoring: rename all database objects from idea to post (#488)
Guilherme Oenningdd09f520220b
diff --git a/app/handlers/settings_test.go b/app/handlers/settings_test.goindex 9527cdbc7..d1de866aa 100644--- a/app/handlers/settings_test.go+++ b/app/handlers/settings_test.go@@ -63,7 +63,7 @@ func TestUpdateUserSettingsHandler_NewSettings(t *testing.T) {ExecutePost(handlers.UpdateUserSettings(), `{"name": "Jon Stark","settings": {- "event_notification_new_idea": "1",+ "event_notification_new_post": "1","event_notification_new_comment": "2","event_notification_change_status": "3"}diff --git a/app/models/feedback.go b/app/models/feedback.goindex 642d4ad5a..e27512b2f 100644--- a/app/models/feedback.go+++ b/app/models/feedback.go@@ -193,7 +193,7 @@ func notificationEventValidation(v string) bool {var (//NotificationEventNewPost is triggered when a new post is postedNotificationEventNewPost = NotificationEvent{- UserSettingsKeyName: "event_notification_new_idea",+ UserSettingsKeyName: "event_notification_new_post",DefaultSettingValue: strconv.Itoa(int(NotificationChannelWeb | NotificationChannelEmail)),RequiresSubscripionUserRoles: []Role{},DefaultEnabledUserRoles: []Role{diff --git a/app/storage/postgres/notifications.go b/app/storage/postgres/notifications.goindex c3bfd1dee..dc5b06e90 100644--- a/app/storage/postgres/notifications.go+++ b/app/storage/postgres/notifications.go@@ -46,7 +46,7 @@ func (s *NotificationStorage) Insert(user *models.User, title, link string, postRead: false,}err := s.trx.Get(¬ification.ID, `- INSERT INTO notifications (tenant_id, user_id, title, link, read, idea_id, author_id, created_on, updated_on)+ INSERT INTO notifications (tenant_id, user_id, title, link, read, post_id, author_id, created_on, updated_on)VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $8)RETURNING id`, s.tenant.ID, user.ID, title, link, false, postID, s.user.ID, now)diff --git a/app/storage/postgres/post.go b/app/storage/postgres/post.goindex 8a462e3fb..b39066f4f 100644--- a/app/storage/postgres/post.go+++ b/app/storage/postgres/post.go@@ -128,46 +128,46 @@ var (sqlSelectPostsWhere = ` WITHagg_comments AS (SELECT- idea_id,+ post_id,COUNT(CASE WHEN comments.created_on > CURRENT_DATE - INTERVAL '30 days' THEN 1 END) as recent,COUNT(*) as allFROM comments- INNER JOIN ideas- ON ideas.id = comments.idea_id- AND ideas.tenant_id = comments.tenant_id- WHERE ideas.tenant_id = $1- GROUP BY idea_id+ INNER JOIN posts+ ON posts.id = comments.post_id+ AND posts.tenant_id = comments.tenant_id+ WHERE posts.tenant_id = $1+ GROUP BY post_id),agg_supporters AS (SELECT- idea_id,- COUNT(CASE WHEN idea_supporters.created_on > CURRENT_DATE - INTERVAL '30 days' THEN 1 END) as recent,+ post_id,+ COUNT(CASE WHEN post_supporters.created_on > CURRENT_DATE - INTERVAL '30 days' THEN 1 END) as recent,COUNT(*) as all- FROM idea_supporters- INNER JOIN ideas- ON ideas.id = idea_supporters.idea_id- AND ideas.tenant_id = idea_supporters.tenant_id- WHERE ideas.tenant_id = $1- GROUP BY idea_id+ FROM post_supporters+ INNER JOIN posts+ ON posts.id = post_supporters.post_id+ AND posts.tenant_id = post_supporters.tenant_id+ WHERE posts.tenant_id = $1+ GROUP BY post_id)- SELECT i.id,- i.number,- i.title,- i.slug,- i.description,- i.created_on,+ SELECT p.id,+ p.number,+ p.title,+ p.slug,+ p.description,+ p.created_on,COALESCE(agg_s.all, 0) as supporters,COALESCE(agg_c.all, 0) as comments,COALESCE(agg_s.recent, 0) AS recent_supporters,COALESCE(agg_c.recent, 0) AS recent_comments,- i.status,+ p.status,u.id AS user_id,u.name AS user_name,u.email AS user_email,u.role AS user_role,u.status AS user_status,- i.response,- i.response_date,+ p.response,+ p.response_date,r.id AS response_user_id,r.name AS response_user_name,r.email AS response_user_email,@@ -179,30 +179,30 @@ var (d.status AS original_status,array_remove(array_agg(t.slug), NULL) AS tags,COALESCE(%s, false) AS viewer_supported- FROM ideas i+ FROM posts pINNER JOIN users u- ON u.id = i.user_id+ ON u.id = p.user_idLEFT JOIN users r- ON r.id = i.response_user_id- LEFT JOIN idea_tags it- ON it.idea_id = i.id- LEFT JOIN ideas d- ON d.id = i.original_id+ ON r.id = p.response_user_id+ LEFT JOIN post_tags pt+ ON pt.post_id = p.id+ LEFT JOIN posts d+ ON d.id = p.original_idLEFT JOIN tags t- ON t.id = it.tag_id+ ON t.id = pt.tag_id%sLEFT JOIN agg_comments agg_c- ON agg_c.idea_id = i.id+ ON agg_c.post_id = p.idLEFT JOIN agg_supporters agg_s- ON agg_s.idea_id = i.id- WHERE i.status != ` + strconv.Itoa(models.PostDeleted) + ` AND %s- GROUP BY i.id, u.id, r.id, d.id, agg_s.all, agg_c.all, agg_c.recent, agg_s.recent`+ ON agg_s.post_id = p.id+ WHERE p.status != ` + strconv.Itoa(models.PostDeleted) + ` AND %s+ GROUP BY p.id, u.id, r.id, d.id, agg_s.all, agg_c.all, agg_c.recent, agg_s.recent`)func (s *PostStorage) getPostQuery(filter string) string {viewerSupportedSubQuery := "null"if s.user != nil {- viewerSupportedSubQuery = fmt.Sprintf("(SELECT true FROM idea_supporters WHERE idea_id = i.id AND user_id = %d)", s.user.ID)+ viewerSupportedSubQuery = fmt.Sprintf("(SELECT true FROM post_supporters WHERE post_id = p.id AND user_id = %d)", s.user.ID)}tagCondition := `AND t.is_public = true`if s.user != nil && s.user.IsCollaborator() {@@ -223,7 +223,7 @@ func (s *PostStorage) getSingle(query string, args ...interface{}) (*models.Post// GetByID returns post by given idfunc (s *PostStorage) GetByID(postID int) (*models.Post, error) {- post, err := s.getSingle(s.getPostQuery("i.tenant_id = $1 AND i.id = $2"), s.tenant.ID, postID)+ post, err := s.getSingle(s.getPostQuery("p.tenant_id = $1 AND p.id = $2"), s.tenant.ID, postID)if err != nil {return nil, errors.Wrap(err, "failed to get post with id '%d'", postID)}@@ -232,7 +232,7 @@ func (s *PostStorage) GetByID(postID int) (*models.Post, error) {// GetBySlug returns post by tenant and slugfunc (s *PostStorage) GetBySlug(slug string) (*models.Post, error) {- post, err := s.getSingle(s.getPostQuery("i.tenant_id = $1 AND i.slug = $2"), s.tenant.ID, slug)+ post, err := s.getSingle(s.getPostQuery("p.tenant_id = $1 AND p.slug = $2"), s.tenant.ID, slug)if err != nil {return nil, errors.Wrap(err, "failed to get post with slug '%s'", slug)}@@ -241,7 +241,7 @@ func (s *PostStorage) GetBySlug(slug string) (*models.Post, error) {// GetByNumber returns post by tenant and numberfunc (s *PostStorage) GetByNumber(number int) (*models.Post, error) {- post, err := s.getSingle(s.getPostQuery("i.tenant_id = $1 AND i.number = $2"), s.tenant.ID, number)+ post, err := s.getSingle(s.getPostQuery("p.tenant_id = $1 AND p.number = $2"), s.tenant.ID, number)if err != nil {return nil, errors.Wrap(err, "failed to get post with number '%d'", number)}@@ -260,7 +260,7 @@ func (s *PostStorage) GetAll() ([]*models.Post, error) {// CountPerStatus returns total number of posts per statusfunc (s *PostStorage) CountPerStatus() (map[int]int, error) {stats := []*dbStatusCount{}- err := s.trx.Select(&stats, "SELECT status, COUNT(*) AS count FROM ideas WHERE tenant_id = $1 GROUP BY status", s.tenant.ID)+ err := s.trx.Select(&stats, "SELECT status, COUNT(*) AS count FROM posts WHERE tenant_id = $1 GROUP BY status", s.tenant.ID)if err != nil {return nil, errors.Wrap(err, "failed to count posts per status")}@@ -273,7 +273,7 @@ func (s *PostStorage) CountPerStatus() (map[int]int, error) {// Search existing posts based on inputfunc (s *PostStorage) Search(query, filter, limit string, tags []string) ([]*models.Post, error) {- innerQuery := s.getPostQuery("i.tenant_id = $1 AND i.status = ANY($2)")+ innerQuery := s.getPostQuery("p.tenant_id = $1 AND p.status = ANY($2)")if limit != "all" {if _, err := strconv.Atoi(limit); err != nil {@@ -341,17 +341,17 @@ func (s *PostStorage) GetCommentsByPost(post *models.Post) ([]*models.Comment, ee.role AS edited_by_role,e.status AS edited_by_statusFROM comments c- INNER JOIN ideas i- ON i.id = c.idea_id- AND i.tenant_id = c.tenant_id+ INNER JOIN posts p+ ON p.id = c.post_id+ AND p.tenant_id = c.tenant_idINNER JOIN users uON u.id = c.user_idAND u.tenant_id = c.tenant_idLEFT JOIN users eON e.id = c.edited_by_idAND e.tenant_id = c.tenant_id- WHERE i.id = $1- AND i.tenant_id = $2+ WHERE p.id = $1+ AND p.tenant_id = $2ORDER BY c.created_on ASC`, post.ID, s.tenant.ID)if err != nil {return nil, errors.Wrap(err, "failed get comments of post with id '%d'", post.ID)@@ -366,7 +366,7 @@ func (s *PostStorage) GetCommentsByPost(post *models.Post) ([]*models.Comment, e// Update given postfunc (s *PostStorage) Update(post *models.Post, title, description string) (*models.Post, error) {- _, err := s.trx.Execute(`UPDATE ideas SET title = $1, slug = $2, description = $3+ _, err := s.trx.Execute(`UPDATE posts SET title = $1, slug = $2, description = $3WHERE id = $4 AND tenant_id = $5`, title, slug.Make(title), description, post.ID, s.tenant.ID)if err != nil {return nil, errors.Wrap(err, "failed update post")@@ -383,8 +383,8 @@ func (s *PostStorage) Update(post *models.Post, title, description string) (*modfunc (s *PostStorage) Add(title, description string) (*models.Post, error) {var id interr := s.trx.Get(&id,- `INSERT INTO ideas (title, slug, number, description, tenant_id, user_id, created_on, status)- VALUES ($1, $2, (SELECT COALESCE(MAX(number), 0) + 1 FROM ideas i WHERE i.tenant_id = $4), $3, $4, $5, $6, 0)+ `INSERT INTO posts (title, slug, number, description, tenant_id, user_id, created_on, status)+ VALUES ($1, $2, (SELECT COALESCE(MAX(number), 0) + 1 FROM posts p WHERE p.tenant_id = $4), $3, $4, $5, $6, 0)RETURNING id`, title, slug.Make(title), description, s.tenant.ID, s.user.ID, time.Now())if err != nil {return nil, errors.Wrap(err, "failed add new post")@@ -406,7 +406,7 @@ func (s *PostStorage) Add(title, description string) (*models.Post, error) {func (s *PostStorage) AddComment(post *models.Post, content string) (int, error) {var id intif err := s.trx.Get(&id,- "INSERT INTO comments (tenant_id, idea_id, content, user_id, created_on) VALUES ($1, $2, $3, $4, $5) RETURNING id",+ "INSERT INTO comments (tenant_id, post_id, content, user_id, created_on) VALUES ($1, $2, $3, $4, $5) RETURNING id",s.tenant.ID, post.ID, content, s.user.ID, time.Now()); err != nil {return 0, errors.Wrap(err, "failed add new comment")}@@ -471,7 +471,7 @@ func (s *PostStorage) AddSupporter(post *models.Post, user *models.User) error {}_, err := s.trx.Execute(- `INSERT INTO idea_supporters (tenant_id, user_id, idea_id, created_on) VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING`,+ `INSERT INTO post_supporters (tenant_id, user_id, post_id, created_on) VALUES ($1, $2, $3, $4) ON CONFLICT DO NOTHING`,s.tenant.ID, user.ID, post.ID, time.Now())if err != nil {@@ -487,7 +487,7 @@ func (s *PostStorage) RemoveSupporter(post *models.Post, user *models.User) erroreturn nil}- _, err := s.trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2 AND tenant_id = $3`, user.ID, post.ID, s.tenant.ID)+ _, err := s.trx.Execute(`DELETE FROM post_supporters WHERE user_id = $1 AND post_id = $2 AND tenant_id = $3`, user.ID, post.ID, s.tenant.ID)if err != nil {return errors.Wrap(err, "failed to delete post supporter")}@@ -503,11 +503,11 @@ func (s *PostStorage) AddSubscriber(post *models.Post, user *models.User) errorfunc (s *PostStorage) internalAddSubscriber(post *models.Post, user *models.User, force bool) error {conflict := " DO NOTHING"if force {- conflict = "(user_id, idea_id) DO UPDATE SET status = $5, updated_on = $4"+ conflict = "(user_id, post_id) DO UPDATE SET status = $5, updated_on = $4"}_, err := s.trx.Execute(fmt.Sprintf(`- INSERT INTO idea_subscribers (tenant_id, user_id, idea_id, created_on, updated_on, status)+ INSERT INTO post_subscribers (tenant_id, user_id, post_id, created_on, updated_on, status)VALUES ($1, $2, $3, $4, $4, $5) ON CONFLICT %s`, conflict),s.tenant.ID, user.ID, post.ID, time.Now(), models.SubscriberActive,)@@ -520,8 +520,8 @@ func (s *PostStorage) internalAddSubscriber(post *models.Post, user *models.User// RemoveSubscriber removes user from post list of subscribersfunc (s *PostStorage) RemoveSubscriber(post *models.Post, user *models.User) error {_, err := s.trx.Execute(`- INSERT INTO idea_subscribers (tenant_id, user_id, idea_id, created_on, updated_on, status)- VALUES ($1, $2, $3, $4, $4, 0) ON CONFLICT (user_id, idea_id)+ INSERT INTO post_subscribers (tenant_id, user_id, post_id, created_on, updated_on, status)+ VALUES ($1, $2, $3, $4, $4, 0) ON CONFLICT (user_id, post_id)DO UPDATE SET status = 0, updated_on = $4`,s.tenant.ID, user.ID, post.ID, time.Now(),)@@ -564,9 +564,9 @@ func (s *PostStorage) GetActiveSubscribers(number int, channel models.Notificatierr = s.trx.Select(&users, `SELECT DISTINCT u.id, u.name, u.email, u.tenant_id, u.role, u.statusFROM users u- LEFT JOIN idea_subscribers sub+ LEFT JOIN post_subscribers subON sub.user_id = u.id- AND sub.idea_id = $1+ AND sub.post_id = $1AND sub.tenant_id = u.tenant_idLEFT JOIN user_settings setON set.user_id = u.id@@ -613,7 +613,7 @@ func (s *PostStorage) SetResponse(post *models.Post, text string, status int) er}_, err := s.trx.Execute(`- UPDATE ideas+ UPDATE postsSET response = $3, original_id = NULL, response_date = $4, response_user_id = $5, status = $6WHERE id = $1 and tenant_id = $2`, post.ID, s.tenant.ID, text, respondedOn, s.user.ID, status)@@ -638,7 +638,7 @@ func (s *PostStorage) MarkAsDuplicate(post *models.Post, original *models.Post)}var users []*dbUser- err := s.trx.Select(&users, "SELECT user_id AS id FROM idea_supporters WHERE idea_id = $1 AND tenant_id = $2", post.ID, s.tenant.ID)+ err := s.trx.Select(&users, "SELECT user_id AS id FROM post_supporters WHERE post_id = $1 AND tenant_id = $2", post.ID, s.tenant.ID)if err != nil {return errors.Wrap(err, "failed to get supporters of post with id '%d'", post.ID)}@@ -650,7 +650,7 @@ func (s *PostStorage) MarkAsDuplicate(post *models.Post, original *models.Post)}_, err = s.trx.Execute(`- UPDATE ideas+ UPDATE postsSET response = '', original_id = $3, response_date = $4, response_user_id = $5, status = $6WHERE id = $1 and tenant_id = $2`, post.ID, s.tenant.ID, original.ID, respondedOn, s.user.ID, models.PostDuplicate)@@ -675,11 +675,11 @@ func (s *PostStorage) MarkAsDuplicate(post *models.Post, original *models.Post)// IsReferenced returns true if another post is referencing given postfunc (s *PostStorage) IsReferenced(post *models.Post) (bool, error) {exists, err := s.trx.Exists(`- SELECT 1 FROM ideas i- INNER JOIN ideas o- ON o.tenant_id = i.tenant_id- AND o.id = i.original_id- WHERE i.tenant_id = $1+ SELECT 1 FROM posts p+ INNER JOIN posts o+ ON o.tenant_id = p.tenant_id+ AND o.id = p.original_id+ WHERE p.tenant_id = $1AND o.id = $2`, s.tenant.ID, post.ID)if err != nil {return false, errors.Wrap(err, "failed to check if post is referenced")@@ -689,7 +689,7 @@ func (s *PostStorage) IsReferenced(post *models.Post) (bool, error) {// SupportedBy returns a list of Post ID supported by given userfunc (s *PostStorage) SupportedBy() ([]int, error) {- posts, err := s.trx.QueryIntArray("SELECT idea_id FROM idea_supporters WHERE user_id = $1 AND tenant_id = $2", s.user.ID, s.tenant.ID)+ posts, err := s.trx.QueryIntArray("SELECT post_id FROM post_supporters WHERE user_id = $1 AND tenant_id = $2", s.user.ID, s.tenant.ID)if err != nil {return nil, errors.Wrap(err, "failed to get user's supported posts")}diff --git a/app/storage/postgres/post_test.go b/app/storage/postgres/post_test.goindex 0babb953b..13d748049 100644--- a/app/storage/postgres/post_test.go+++ b/app/storage/postgres/post_test.go@@ -16,8 +16,8 @@ func TestPostStorage_GetAll(t *testing.T) {now := time.Now()- trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, status) VALUES ('add twitter integration', 'add-twitter-integration', 1, 'Would be great to see it integrated with twitter', $1, 1, 1, 1)", now)- trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, status) VALUES ('this is my post', 'this-is-my-post', 2, 'no description', $1, 1, 2, 2)", now)+ trx.Execute("INSERT INTO posts (title, slug, number, description, created_on, tenant_id, user_id, status) VALUES ('add twitter integration', 'add-twitter-integration', 1, 'Would be great to see it integrated with twitter', $1, 1, 1, 1)", now)+ trx.Execute("INSERT INTO posts (title, slug, number, description, created_on, tenant_id, user_id, status) VALUES ('this is my post', 'this-is-my-post', 2, 'no description', $1, 1, 2, 2)", now)posts.SetCurrentTenant(demoTenant)diff --git a/app/storage/postgres/tag.go b/app/storage/postgres/tag.goindex cffed20fc..3b3a3d343 100644--- a/app/storage/postgres/tag.go+++ b/app/storage/postgres/tag.go@@ -95,7 +95,7 @@ func (s *TagStorage) Update(tag *models.Tag, name, color string, isPublic bool)// Delete a tag by its idfunc (s *TagStorage) Delete(tag *models.Tag) error {- _, err := s.trx.Execute(`DELETE FROM idea_tags WHERE tag_id = $1 AND tenant_id = $2`, tag.ID, s.tenant.ID)+ _, err := s.trx.Execute(`DELETE FROM post_tags WHERE tag_id = $1 AND tenant_id = $2`, tag.ID, s.tenant.ID)if err != nil {return errors.Wrap(err, "failed to remove tag with id '%d' from all posts", tag.ID)}@@ -109,7 +109,7 @@ func (s *TagStorage) Delete(tag *models.Tag) error {// AssignTag adds a tag to an postfunc (s *TagStorage) AssignTag(tag *models.Tag, post *models.Post) error {- alreadyAssigned, err := s.trx.Exists("SELECT 1 FROM idea_tags WHERE idea_id = $1 AND tag_id = $2 AND tenant_id = $3", post.ID, tag.ID, s.tenant.ID)+ alreadyAssigned, err := s.trx.Exists("SELECT 1 FROM post_tags WHERE post_id = $1 AND tag_id = $2 AND tenant_id = $3", post.ID, tag.ID, s.tenant.ID)if err != nil {return errors.Wrap(err, "failed to check if tag is already assigned")}@@ -119,7 +119,7 @@ func (s *TagStorage) AssignTag(tag *models.Tag, post *models.Post) error {}_, err = s.trx.Execute(- `INSERT INTO idea_tags (tag_id, idea_id, created_on, created_by_id, tenant_id) VALUES ($1, $2, $3, $4, $5)`,+ `INSERT INTO post_tags (tag_id, post_id, created_on, created_by_id, tenant_id) VALUES ($1, $2, $3, $4, $5)`,tag.ID, post.ID, time.Now(), s.user.ID, s.tenant.ID,)@@ -132,7 +132,7 @@ func (s *TagStorage) AssignTag(tag *models.Tag, post *models.Post) error {// UnassignTag removes a tag from an postfunc (s *TagStorage) UnassignTag(tag *models.Tag, post *models.Post) error {_, err := s.trx.Execute(- `DELETE FROM idea_tags WHERE tag_id = $1 AND idea_id = $2 AND tenant_id = $3`,+ `DELETE FROM post_tags WHERE tag_id = $1 AND post_id = $2 AND tenant_id = $3`,tag.ID, post.ID, s.tenant.ID,)@@ -147,10 +147,10 @@ func (s *TagStorage) GetAssigned(post *models.Post) ([]*models.Tag, error) {tags, err := s.getTags(`SELECT t.id, t.name, t.slug, t.color, t.is_publicFROM tags t- INNER JOIN idea_tags it- ON it.tag_id = t.id- AND it.tenant_id = t.tenant_id- WHERE it.idea_id = $1 AND t.tenant_id = $2+ INNER JOIN post_tags pt+ ON pt.tag_id = t.id+ AND pt.tenant_id = t.tenant_id+ WHERE pt.post_id = $1 AND t.tenant_id = $2ORDER BY t.name`, post.ID, s.tenant.ID)diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex 0712ad9d2..78283bd48 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -261,7 +261,7 @@ func (s *UserStorage) HasSubscribedTo(postID int) (bool, error) {}var status int- err := s.trx.Scalar(&status, "SELECT status FROM idea_subscribers WHERE user_id = $1 AND idea_id = $2", s.user.ID, postID)+ err := s.trx.Scalar(&status, "SELECT status FROM post_subscribers WHERE user_id = $1 AND post_id = $2", s.user.ID, postID)if err != nil && errors.Cause(err) != app.ErrNotFound {return false, errors.Wrap(err, "failed to get subscription status")}@@ -301,8 +301,8 @@ func (s *UserStorage) Delete() error {{"user_settings", "user_id"},{"notifications", "user_id"},{"notifications", "author_id"},- {"idea_supporters", "user_id"},- {"idea_subscribers", "user_id"},+ {"post_supporters", "user_id"},+ {"post_subscribers", "user_id"},{"email_verifications", "user_id"},}diff --git a/migrations/201808152020_rename_idea_post.sql b/migrations/201808152020_rename_idea_post.sqlnew file mode 100644index 000000000..5ac006be1--- /dev/null+++ b/migrations/201808152020_rename_idea_post.sql@@ -0,0 +1,40 @@+UPDATE user_settings+SET key = 'event_notification_new_post'+WHERE key = 'event_notification_new_idea';++ALTER TABLE idea_subscribers RENAME COLUMN idea_id TO post_id;+ALTER TABLE idea_supporters RENAME COLUMN idea_id TO post_id;+ALTER TABLE idea_tags RENAME COLUMN idea_id TO post_id;+ALTER TABLE comments RENAME COLUMN idea_id TO post_id;+ALTER TABLE notifications RENAME COLUMN idea_id TO post_id;++ALTER TABLE ideas RENAME TO posts;+ALTER TABLE idea_subscribers RENAME TO post_subscribers;+ALTER TABLE idea_supporters RENAME TO post_supporters;+ALTER TABLE idea_tags RENAME TO post_tags;++ALTER INDEX idea_id_tenant_id_key RENAME TO post_id_tenant_id_key;+ALTER INDEX idea_number_tenant_key RENAME TO post_number_tenant_key;+ALTER INDEX idea_slug_tenant_key RENAME TO post_slug_tenant_key;+ALTER INDEX idea_subscribers_pkey RENAME TO post_subscribers_pkey;+ALTER INDEX idea_supporters_pkey RENAME TO post_supporters_pkey;+ALTER INDEX idea_tags_pkey RENAME TO post_tags_pkey;+ALTER INDEX ideas_pkey RENAME TO posts_pkey;++ALTER TABLE comments RENAME CONSTRAINT comments_idea_id_fkey TO comments_post_id_fkey;+ALTER TABLE post_subscribers RENAME CONSTRAINT idea_subscribers_idea_id_fkey TO post_subscribers_post_id_fkey;+ALTER TABLE post_subscribers RENAME CONSTRAINT idea_subscribers_tenant_id_fkey TO post_subscribers_tenant_id_fkey;+ALTER TABLE post_subscribers RENAME CONSTRAINT idea_subscribers_user_id_fkey TO post_subscribers_user_id_fkey;+ALTER TABLE post_supporters RENAME CONSTRAINT idea_supporters_idea_id_fkey TO post_supporters_post_id_fkey;+ALTER TABLE post_supporters RENAME CONSTRAINT idea_supporters_tenant_id_fkey TO post_supporters_tenant_id_fkey;+ALTER TABLE post_supporters RENAME CONSTRAINT idea_supporters_user_id_fkey TO post_supporters_user_id_fkey;+ALTER TABLE post_tags RENAME CONSTRAINT idea_tags_created_by_id_fkey TO post_tags_created_by_id_fkey;+ALTER TABLE post_tags RENAME CONSTRAINT idea_tags_idea_id_fkey TO post_tags_post_id_fkey;+ALTER TABLE post_tags RENAME CONSTRAINT idea_tags_tag_id_fkey TO post_tags_tag_id_fkey;+ALTER TABLE post_tags RENAME CONSTRAINT idea_tags_tenant_id_fkey TO post_tags_tenant_id_fkey;+ALTER TABLE posts RENAME CONSTRAINT ideas_original_id_fkey TO posts_original_id_fkey;+ALTER TABLE posts RENAME CONSTRAINT ideas_tenant_id_fkey TO posts_tenant_id_fkey;+ALTER TABLE posts RENAME CONSTRAINT ideas_user_id_fkey TO posts_user_id_fkey;+ALTER TABLE notifications RENAME CONSTRAINT notifications_idea_id_fkey TO notifications_post_id_fkey;++ALTER SEQUENCE ideas_id_seq RENAME TO posts_id_seq;\ No newline at end of filediff --git a/public/pages/MySettings/components/NotificationSettings.tsx b/public/pages/MySettings/components/NotificationSettings.tsxindex 2800cd439..57884439e 100644--- a/public/pages/MySettings/components/NotificationSettings.tsx+++ b/public/pages/MySettings/components/NotificationSettings.tsx@@ -98,10 +98,10 @@ export class NotificationSettings extends React.Component<NotificationSettingsPr<Segments><Segment><span className="event-title">New Post</span>- {this.info("event_notification_new_idea", "new posts on this site", "new posts on this site")}+ {this.info("event_notification_new_post", "new posts on this site", "new posts on this site")}<p>- {this.icon("event_notification_new_idea", WebChannel)}- {this.icon("event_notification_new_idea", EmailChannel)}+ {this.icon("event_notification_new_post", WebChannel)}+ {this.icon("event_notification_new_post", EmailChannel)}</p></Segment><Segment>