Codestin Search App

mohinid · 2022-06-15T10:22:49Z

Notion card

https://www.notion.so/saeloun/Add-tables-for-personal-employment-Allocated-devices-compensation-71ef49d0c38e4242bd2998120141372d

Summary

Created previous_employment_details table with fields: company_name and role.
Added associations to EmploymentDetails and CompanyUsers model.
Added. validations on fields.
Added RSpec
Tested manually on Console.

Type of change

Please delete options that are not relevant.

New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Manually verified associations and validations on the Rails console.

Checklist:

I have manually tested all workflows
I have performed a self-review of my own code
I have added automated tests for my code

Preview of ERD

github-actions · 2022-06-15T10:24:28Z

Current Code Coverage Percent of this PR:

89.22 %

Files having coverage below 100%

Impacted Files	Coverage
/lib/custom_failure.rb	80.0 %
/app/controllers/users/invitations_controller.rb	86.36 %
/app/controllers/users/sessions_controller.rb	85.71 %
/app/services/invoice_payment/checkout.rb	44.0 %
/app/services/invoice_payment/pdf_generation.rb	70.97 %
/app/controllers/internal_api/v1/companies_controller.rb	95.45 %
/app/controllers/internal_api/v1/profile_controller.rb	96.88 %
/app/controllers/internal_api/v1/payment_settings_controller.rb	93.33 %
/app/controllers/internal_api/v1/wise/recipients_controller.rb	90.0 %
/app/controllers/internal_api/v1/payments/providers_controller.rb	94.74 %
/lib/benchmarking/benchmarker.rb	0.0 %

rohitjoshixyz

Check schema file, rest LGTM

db/schema.rb

apoorv-mishra

Could you resolve conflicts?

apoorv-mishra

LGTM 🎉

akhilgkrishnan

@mohinid I've some concerns about this association. The think the previous company details should be directly associated with the User model. For a user, the previous employment should same for each company and it does not vary from company to company.
Eg: Consider, Currently a user belongs to 2 companies A and B. Same user has worked for 3 companies before. As per your flow, the user has 2 employment_details ( for company A and Company B) and each employee details have 3 same previous employees details.
@keshavbiswa @rohitjoshixyz @apoorv-mishra

rohitjoshixyz · 2022-06-15T13:42:23Z

@akhilgkrishnan Well, it makes sense that we associate the model to users since we are storing only name and role for now. That won't change for any particular individual. It will also reduce a join so let's go for it 👍 @mohinid

mohinid · 2022-06-15T13:49:46Z

@akhilgkrishnan Well, it makes sense that we associate the model to users since we are storing only name and role for now. That won't change for any particular individual. It will also reduce a join so let's go for it 👍 @mohinid

Thanks, @rohitjoshixyz, @akhilgkrishnan I will change it.

keshavbiswa · 2022-06-15T14:14:56Z

, Currently a user belongs to 2 companies A and B. Same user has worked for 3 companies before

Agreed. Shouldn't the same be true for employee_details table?

The user would have the same employee_details regardless of whichever company he is part of.

I mean the user, should have employee_details and previous_employee_details directly or am I missing something?

mohinid · 2022-06-15T14:21:54Z

, Currently a user belongs to 2 companies A and B. Same user has worked for 3 companies before

Agreed. Shouldn't the same be true for employee_details table?

The user would have the same employee_details regardless of whichever company he is part of.

Hi @keshavbiswa Not really. Please check the fields of employment_details table in ERD. It has employee_id, designation etc which are specific to each company.

keshavbiswa · 2022-06-15T14:26:39Z

So, if current_user has two company_users records, this would mean the current_user would have two seperate employment_details?

mohinid · 2022-06-15T14:32:48Z

So, if current_user has two company_users records, this would mean the current_user would have two seperate employment_details?

Yes. because for that user the employment_details varies for both companies.

rohitjoshixyz · 2022-06-15T15:17:51Z

@keshavbiswa @mohinid I think having a separate table is preferable, because the company_users table is bound to grow as we add more features to Miru instead of having 10 other columns which will be rarely fetched (mostly on the employee profile page)

mohinid · 2022-06-15T15:47:34Z

Updated reference from CompanyUser to User as discussed.
Also, tested on local.
Will update the ERD in next PR!

keshavbiswa

Added few suggestions for missing tests, rest LGTM!

spec/models/previous_employment_detail_spec.rb

app/models/employment_detail.rb

spec/models/user_spec.rb

akhilgkrishnan

LGTM

app/models/user.rb

…n test

keshavbiswa

Thanks for making all the changes. Looks good to me!

mohinid · 2022-06-15T16:37:31Z

Thanks for making all the changes. Looks good to me!

Thanks a lot @keshavbiswa , @akhilgkrishnan & @rohitjoshixyz for your time!! :)
@akhilgkrishnan you can merge now.

rohitjoshixyz

LGTM

* Creates previous_employment_details table * Remove invoice changes from schema.rb * Update reference from CompanyUser to User * Additional tests for model * Addedd dependent-destroy to User-PreviousEmploymentDetails association test Co-authored-by: Akhil G Krishnan <[email protected]>

Creates previous_employment_details table

19d1e85

pr-triage bot added the PR: unreviewed label Jun 15, 2022

mohinid requested review from akhilgkrishnan and rohitjoshixyz June 15, 2022 10:22

mohinid self-assigned this Jun 15, 2022

mohinid added the feature label Jun 15, 2022

mohinid requested a review from apoorv-mishra June 15, 2022 10:24

rohitjoshixyz reviewed Jun 15, 2022

View reviewed changes

db/schema.rb Show resolved Hide resolved

Remove invoice changes from schema.rb

92359ff

apoorv-mishra suggested changes Jun 15, 2022

View reviewed changes

pr-triage bot added PR: reviewed-changes-requested and removed PR: unreviewed labels Jun 15, 2022

Merge branch 'develop' into create-previous-employment-details-table

e360625

pr-triage bot added PR: unreviewed and removed PR: reviewed-changes-requested labels Jun 15, 2022

mohinid requested a review from apoorv-mishra June 15, 2022 10:41

apoorv-mishra reviewed Jun 15, 2022

View reviewed changes

apoorv-mishra approved these changes Jun 15, 2022

View reviewed changes

pr-triage bot added PR: partially-approved and removed PR: unreviewed labels Jun 15, 2022

akhilgkrishnan reviewed Jun 15, 2022

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: partially-approved labels Jun 15, 2022

mohinid requested a review from keshavbiswa June 15, 2022 15:10

Update reference from CompanyUser to User

faa49e9

pr-triage bot added PR: unreviewed and removed PR: reviewed-approved labels Jun 15, 2022

mohinid requested review from keshavbiswa and removed request for keshavbiswa June 15, 2022 15:44

keshavbiswa reviewed Jun 15, 2022

View reviewed changes

spec/models/previous_employment_detail_spec.rb Show resolved Hide resolved

app/models/employment_detail.rb Outdated Show resolved Hide resolved

spec/models/user_spec.rb Outdated Show resolved Hide resolved

Additional tests for model

645bef9

akhilgkrishnan approved these changes Jun 15, 2022

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels Jun 15, 2022

keshavbiswa reviewed Jun 15, 2022

View reviewed changes

app/models/user.rb Show resolved Hide resolved

Addedd dependent-destroy to User-PreviousEmploymentDetails associatio…

64df1bb

…n test

pr-triage bot added PR: unreviewed and removed PR: reviewed-approved labels Jun 15, 2022

keshavbiswa approved these changes Jun 15, 2022

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels Jun 15, 2022

rohitjoshixyz approved these changes Jun 15, 2022

View reviewed changes

Merge branch 'develop' into create-previous-employment-details-table

339e72f

pr-triage bot added PR: unreviewed and removed PR: reviewed-approved labels Jun 16, 2022

akhilgkrishnan merged commit 5b53a7b into develop Jun 16, 2022

akhilgkrishnan deleted the create-previous-employment-details-table branch June 16, 2022 07:22

pr-triage bot added PR: merged and removed PR: unreviewed labels Jun 16, 2022

Conversation

mohinid commented Jun 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Notion card

Summary

Type of change

How Has This Been Tested?

Checklist:

Preview of ERD

Uh oh!

github-actions bot commented Jun 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Current Code Coverage Percent of this PR:

89.22 %

Files having coverage below 100%

Uh oh!

rohitjoshixyz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

apoorv-mishra left a comment

Choose a reason for hiding this comment

Uh oh!

apoorv-mishra left a comment

Choose a reason for hiding this comment

Uh oh!

akhilgkrishnan left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rohitjoshixyz commented Jun 15, 2022

Uh oh!

mohinid commented Jun 15, 2022

Uh oh!

keshavbiswa commented Jun 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mohinid commented Jun 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

keshavbiswa commented Jun 15, 2022

Uh oh!

mohinid commented Jun 15, 2022

Uh oh!

rohitjoshixyz commented Jun 15, 2022

Uh oh!

mohinid commented Jun 15, 2022

Uh oh!

keshavbiswa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

akhilgkrishnan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

keshavbiswa left a comment

Choose a reason for hiding this comment

Uh oh!

mohinid commented Jun 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rohitjoshixyz left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mohinid commented Jun 15, 2022 •

edited

Loading

github-actions bot commented Jun 15, 2022 •

edited

Loading

akhilgkrishnan left a comment •

edited

Loading

keshavbiswa commented Jun 15, 2022 •

edited

Loading

mohinid commented Jun 15, 2022 •

edited

Loading

mohinid commented Jun 15, 2022 •

edited

Loading