Add migration for creator field by thejsj · Pull Request #41 · CodeNow/big-poppa

thejsj · 2016-09-19T16:24:07Z

What this PR does

Add creator field to organization
Populated creator field during org creation

Dependencies

Add pg client to big-poppa devops-scripts#551

Reviewers

Deployment

Get all organizations with users

SELECT  id,github_id,name,stripe_customer_id,trial_end,active_period_end FROM organizations 
LEFT JOIN organizations_users
ON organizations.id = organizations_users.organization_id 
WHERE organizations_users.organization_id is NULL;

Run the following query to delete all orgs with no users:

DELETE FROM organizations
WHERE id IN (
    SELECT id FROM organizations 
    LEFT JOIN organizations_users
    ON organizations.id = organizations_users.organization_id 
    WHERE organizations_users.organization_id is NULL
);

Deploy new version of BP
Run the following query to use new user relationships:

SELECT DISTINCT ON (organizations.id) organizations.id, name, creator, users.created_at
FROM organizations_users
LEFT JOIN organizations
ON organizations.id = organizations_users.organization_id
LEFT JOIN users
ON users.id = organizations.creator
ORDER BY organizations.id, users.created_at DESC;

Rollback steps

ssh into app-services
Start one of the BP containers with a different command (sleep infinity)
Run npm run rollback
Revert commit for BP
Re-deploy BP

Tests

Run migration in gamma
Test route
Create new org in gamma

runnabot · 2016-09-19T16:24:15Z

Deployed big-poppa-http/add-creator-field-to-org. View on Runnable.
_{From Runnable}

runnabot · 2016-09-19T16:24:18Z

Deployed big-poppa-worker/add-creator-field-to-org. View on Runnable.
_{From Runnable}

…r-field-to-org * 'master' of github.com:CodeNow/big-poppa: 0.11.4 Default aha guide to true (#43) 0.11.3 Add creator to organiztion created job (#40)

anandkumarpatel · 2016-09-20T17:46:40Z

-            `Organization with id already exists: ${err.toString()}`
+      return User.fetchByGithubId(job.creator.githubId)
+        .catch(NotFoundError, (err) => {
+          // User might have not been created yet. Retry until user gets created


if you're doing this, then we should probably add retry limit if the user never gets created...

Maybe also give it like a 1000ms of time between iterations?

Ponos does that automatically though.

isn't that a variable you have to set?

retryDelay

retryDelay = 500

Nathan219 · 2016-09-20T22:36:59Z

        { err: err }
      )
    })
+    .catch(ForeignKeyError, err => {


um, when did this worker get added?
Does anything call it?
I feel like we need to change it ASAP

This worker was here from the beginning. I just fixed this to fix tests. Do we just want to delete these worker? Or maybe leave them around for when we change this to actually just handle isActive?

Let's delete. We can always go back in history and get it

Deleted that and the organization.delete one

Nathan219 · 2016-09-20T22:40:11Z

-   * @param {Object}           opts         - Bookshelf query options. A transaction can be passed here
-   * @resolves {Organization}  organization - Organization model instance
+   * @param {String}            githubId     - Github ID for new organization
+   * @param {User}              creator      - User model instance


User who created this organization

thejsj · 2016-09-20T23:18:35Z

Result of migration:

> big-poppa@0.11.4 migrate-dev /big-poppa-http
> knex migrate:latest

Using environment: production-gamma
[2016-09-20T23:17:55.692Z]  INFO: big-poppa/25 on big-poppa-http: Update query (module=migrations/add_org_creator)
    UPDATE_QUERY:
      UPDATE organizations
      SET creator = org.user_id
      FROM (

      SELECT DISTINCT ON (organizations.id) organizations.id, user_id, users.created_at
      FROM organizations_users
      INNER JOIN organizations
      ON organizations.id = organizations_users.organization_id
      INNER JOIN users
      ON users.id = organizations_users.user_id
      ORDER BY organizations.id, users.created_at DESC

      ) org;

[2016-09-20T23:17:55.918Z] TRACE: big-poppa/25 on big-poppa-http: Add `creator` field (module=migrations/add_org_creator)
[2016-09-20T23:17:55.921Z] TRACE: big-poppa/25 on big-poppa-http: Execute raw migration (module=migrations/add_org_creator)
[2016-09-20T23:17:55.928Z] TRACE: big-poppa/25 on big-poppa-http: Add `creator` field (module=migrations/add_org_creator)
Batch 3 run: 7 migrations
/big-poppa-http/migrations/20160804230848_make_grace_period_optional.js
/big-poppa-http/migrations/20160809141602_add_org_name.js
/big-poppa-http/migrations/20160809184807_add_org_lower_name.js
/big-poppa-http/migrations/20160813180708_add_has_payment_method_property.js
/big-poppa-http/migrations/20160826100242_add_org_metadata_column.js
/big-poppa-http/migrations/20160905172134_add_github_integration_to_organization.js
/big-poppa-http/migrations/20160917140528_add_org_creator.js

thejsj · 2016-09-21T06:00:07Z

Orgs with no users in gamma:

 id  | github_id |          name           | stripe_customer_id
-----+-----------+-------------------------+--------------------
  54 |  20098686 | YouLikeITTestThis       | cus_93q3vjcKz60EKs
  56 |  20507657 | runnableTest20Org       | cus_93q3LKiBXhEBxw
  66 |   8194413 | testtett                | cus_93q3AWpoDSbcZ0
 114 |  22303367 | RunnableEC2FailOverTest | cus_9E9DCUJxu1CdRM

thejsj · 2016-09-21T06:08:47Z

Orgs with no users in Gamma:

big_poppa=# DELETE FROM organizations
big_poppa-# WHERE id IN (
big_poppa(#     SELECT id FROM organizations
big_poppa(#     LEFT JOIN organizations_users
big_poppa(#     ON organizations.id = organizations_users.organization_id
big_poppa(#     WHERE organizations_users.organization_id is NULL
big_poppa(# );
DELETE 4

thejsj · 2016-09-21T06:10:24Z

Final Result:

SELECT DISTINCT ON (organizations.id) organizations.id, name, creator, users.created_at
FROM organizations_users
LEFT JOIN organizations
ON organizations.id = organizations_users.organization_id
LEFT JOIN users
ON users.id = organizations.creator
ORDER BY organizations.id, users.created_at DESC;

big_poppa-# ORDER BY organizations.id, users.created_at DESC;
 id  |              name               | creator |         created_at
-----+---------------------------------+---------+----------------------------
  52 | CodeNow                         |       2 | 2016-08-03 13:38:21.266-07
  53 | SandboxDemo                     |       5 | 2016-08-03 13:38:21.35-07
  55 | silver-octopus-labs             |      51 | 2016-08-03 13:38:21.791-07
  57 | SnapUpDemo                      |       5 | 2016-08-03 13:38:21.35-07
  58 | taylor-test                     |       9 | 2016-08-03 13:38:21.363-07
  59 | KinnekDemo                      |       5 | 2016-08-03 13:38:21.35-07
  60 | Runnable                        |       4 | 2016-08-03 13:38:21.314-07
  61 | code-friends                    |      41 | 2016-08-03 13:38:21.7-07
  62 | RunnableTest                    |       1 | 2016-08-03 13:38:21.324-07
  64 | RunnableDemo                    |       3 | 2016-08-03 13:38:21.303-07
  65 | InfluitiveDemo                  |       5 | 2016-08-03 13:38:21.35-07
  67 | RunnableFailOverTest            |       3 | 2016-08-03 13:38:21.303-07
  69 | GoodSoftware                    |       1 | 2016-08-03 13:38:21.324-07
  71 | VendOPDemo                      |       5 | 2016-08-03 13:38:21.35-07
  72 | BigPopppaTest1                  |      51 | 2016-08-03 13:38:21.791-07
  73 | BigPopppaTest2                  |      51 | 2016-08-03 13:38:21.791-07
  74 | BigPopppaTest3                  |      51 | 2016-08-03 13:38:21.791-07
  75 | hackreactor                     |      59 | 2016-08-17 09:36:08.521-07
  77 | hashobject                      |      14 | 2016-08-03 13:38:21.434-07
  78 | sohailtestingitout              |      48 | 2016-08-03 13:38:21.799-07
  81 | runatest                        |      12 | 2016-08-03 13:38:21.424-07
  83 | LastTestOrg                     |       1 | 2016-08-03 13:38:21.324-07
  85 | BigPopppaTest4                  |      41 | 2016-08-03 13:38:21.7-07
  89 | BigPopppaTest5                  |      51 | 2016-08-03 13:38:21.791-07
  92 | KahnOrg                         |      46 | 2016-08-03 13:38:21.784-07
  93 | ThisIsAShittyOrg                |       1 | 2016-08-03 13:38:21.324-07
  94 | anOrgJustForAnand               |       1 | 2016-08-03 13:38:21.324-07
  95 | CollectiveRay                   |      47 | 2016-08-03 13:38:21.773-07
  96 | djfaze                          |      12 | 2016-08-03 13:38:21.424-07
  97 | dockerHackathon2015             |      12 | 2016-08-03 13:38:21.424-07
  98 | TestsCycle                      |       1 | 2016-08-03 13:38:21.324-07
  99 | LoveTestingonGamma              |       5 | 2016-08-03 13:38:21.35-07
 100 | yeezy2020                       |       9 | 2016-08-03 13:38:21.363-07
 101 | dipable                         |       7 | 2016-08-03 13:38:21.381-07
 102 | testhmo                         |      59 | 2016-08-17 09:36:08.521-07
 103 | gitrun                          |      14 | 2016-08-03 13:38:21.434-07
 105 | DoobieRunnable                  |      47 | 2016-08-03 13:38:21.773-07
 106 | enginimation                    |      14 | 2016-08-03 13:38:21.434-07
 107 | BoardDemo                       |      47 | 2016-08-03 13:38:21.773-07
 108 | shittyShitty                    |       1 | 2016-08-03 13:38:21.324-07
 109 | BigPoppaTest6                   |      51 | 2016-08-03 13:38:21.791-07
 110 | BigPoppaTest7                   |      51 | 2016-08-03 13:38:21.791-07
 111 | yeezy2024                       |       1 | 2016-08-03 13:38:21.324-07
 112 | BigPoppaTest8                   |      41 | 2016-08-03 13:38:21.7-07
 113 | BigPoppaTest9                   |      51 | 2016-08-03 13:38:21.791-07
 115 | BigPoppaTest10                  |      51 | 2016-08-03 13:38:21.791-07
 116 | AnandIsRightOrTonyISRight       |       5 | 2016-08-03 13:38:21.35-07
 117 | sadsdafsadfsdfasdfasfad         |       1 | 2016-08-03 13:38:21.324-07
 118 | KahnTesting                     |      46 | 2016-08-03 13:38:21.784-07
 119 | P4L-thejsj-test-1               |      51 | 2016-08-03 13:38:21.791-07
 120 | P4L-NateExtraStarting           |       5 | 2016-08-03 13:38:21.35-07
 121 | NateAsd                         |       5 | 2016-08-03 13:38:21.35-07
 122 | NateAsd2                        |       5 | 2016-08-03 13:38:21.35-07
 123 | TestSickles                     |       1 | 2016-08-03 13:38:21.324-07
 124 | someStupidOrg                   |       1 | 2016-08-03 13:38:21.324-07
 125 | aTotallyDifferentOrg            |       1 | 2016-08-03 13:38:21.324-07
 126 | ThisIsNotTheBestOrgJustATribute |       1 | 2016-08-03 13:38:21.324-07

Nathan219

LGTM

* 'master' of github.com:CodeNow/big-poppa: 0.12.0 Add migration for creator field (#41)

Add migration for creator field

45fdd8d

thejsj added 3 commits September 19, 2016 11:27

Fix functional tests

9502ee0

Add creator property to big-poppa

0a627c3

Merge branch 'master' of github.com:CodeNow/big-poppa into add-creato…

dee2080

…r-field-to-org * 'master' of github.com:CodeNow/big-poppa: 0.11.4 Default aha guide to true (#43) 0.11.3 Add creator to organiztion created job (#40)

anandkumarpatel requested changes Sep 20, 2016

View reviewed changes

thejsj added 4 commits September 20, 2016 10:59

Update migrationm. Add logs

3faf1b4

Fix logger ref

b35ce9f

Make column have no default and have it be NOT NULL

0292e0d

Add max number of retries

635b104

anandkumarpatel approved these changes Sep 20, 2016

View reviewed changes

Nathan219 self-assigned this Sep 20, 2016

Nathan219 requested changes Sep 20, 2016

View reviewed changes

thejsj added 2 commits September 20, 2016 15:53

Fix JSdoc. Add retryDelay

cdf34e8

Delete the delete workers

0ff5b8f

Fix stuff

19c77e8

Change name of table. Ignore db-backups

af220af

Nathan219 approved these changes Sep 21, 2016

View reviewed changes

thejsj merged commit d5714b5 into master Sep 21, 2016

thejsj deleted the add-creator-field-to-org branch September 21, 2016 21:47

thejsj added a commit that referenced this pull request Sep 22, 2016

Merge branch 'master' of github.com:CodeNow/big-poppa into upgrade-ponos

6712fd4

* 'master' of github.com:CodeNow/big-poppa: 0.12.0 Add migration for creator field (#41)

Uh oh!

Conversation

thejsj commented Sep 19, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR does

Dependencies

Reviewers

Deployment

Rollback steps

Tests

Uh oh!

runnabot commented Sep 19, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

runnabot commented Sep 19, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thejsj commented Sep 20, 2016

Uh oh!

thejsj commented Sep 21, 2016

Uh oh!

thejsj commented Sep 21, 2016

Uh oh!

thejsj commented Sep 21, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Nathan219 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

thejsj commented Sep 19, 2016 •

edited

Loading

runnabot commented Sep 19, 2016 •

edited

Loading

runnabot commented Sep 19, 2016 •

edited

Loading

thejsj commented Sep 21, 2016 •

edited

Loading