Codestin Search App

mohinid · 2022-06-09T12:46:43Z

Notion card

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

Summary

Creates employment_details table with appropriate columns.
Creates 1-1 association between CompanyUser and EmploymentDetail model.
Adds validation for the EmploymentDetail model.
Add RSpec for both EmploymentDetail and CompanyUser models.

Type of change

Please delete options that are not relevant.

New feature (non-breaking change which adds functionality)

How Has This Been Tested?

Added validations & RSpecs for User and EmploymentDetail models.

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

github-actions · 2022-06-09T12:47:19Z

Current Code Coverage Percent of this PR:

88.13 %

Files having coverage below 100%

Impacted Files	Coverage
/app/controllers/users/invitations_controller.rb	86.36 %
/app/policies/payments/provider_policy.rb	85.71 %
/app/services/invoice_payment/checkout.rb	44.0 %
/app/services/invoice_payment/pdf_generation.rb	70.97 %
/app/services/report/filters.rb	87.1 %
/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/payments/providers_controller.rb	94.74 %
/lib/benchmarking/benchmarker.rb	0.0 %

rohitjoshixyz

@mohinid Added a few suggestions

spec/models/employment_detail_spec.rb

rohitjoshixyz · 2022-06-09T14:11:40Z

spec/models/employment_detail_spec.rb

+    describe "validate comparisons" do
+      it "resignation date should be later than joining date" do
+        expect(employment_detail.resigned_at).to be > employment_detail.joined_at
+      end
+    end


What happens when either of them is nil? Add a spec for each

Joined_at cannot be nill. I have validation added for the same. Will add test for nil resigned_at date.

rohitjoshixyz · 2022-06-09T14:13:21Z

spec/factories/employment_details.rb

+    joined_at { Faker::Date.between(from: "2020-01-01", to: "2021-01-01") }
+    resigned_at { Date.today }


This factory will always create a resigned employee by default.
Let's keep resigned_at nil by default

Co-authored-by: Rohit Joshi <[email protected]>

akhilgkrishnan · 2022-06-10T03:13:24Z

app/models/user.rb

  has_many :identities, dependent: :delete_all
  has_one_attached :avatar
  rolify strict: true
+  has_one :employment_detail, dependent: :destroy


can you move this on line:62

akhilgkrishnan

@mohinid I have got a couple of doubts related to this flow because, As per the Miru workflow the User can be part of multiple companies and the employee details vary with the position handled in each company. This EmploymentDetails model hasn't given an idea about the company which the employee is associated with. So we should add a scope for the company model.

mohinid · 2022-06-13T05:25:54Z

@mohinid I have got a couple of doubts related to this flow because, As per the Miru workflow the User can be part of multiple companies and the employee details vary with the position handled in each company. This EmploymentDetails model hasn't given an idea about the company which the employee is associated with. So we should add a scope for the company model.

Hi @akhilgkrishnan , let's discuss today.

rohitjoshixyz · 2022-06-13T08:53:05Z

@akhilgkrishnan Good catch: we could associate the employment_details table with the company_users table instead of the user model, which should address this concern @mohinid

mohinid · 2022-06-13T09:47:35Z

Removed User reference and added reference of company_user with employment_detail. @akhilgkrishnan @rohitjoshixyz
All tests passed. Please review.

rohitjoshixyz

LGTM 🎉

akhilgkrishnan

LGTM. Thanks @mohinid for making the requested changes

* Creates EmploymentDetail model * Update spec/models/employment_detail_spec.rb Co-authored-by: Rohit Joshi <[email protected]> * update validation and test for nil resigned_at date * move employment_detail relation to line 62 in user.rb file * update reference of company_user with employment_detail Co-authored-by: Rohit Joshi <[email protected]> Co-authored-by: Akhil G Krishnan <[email protected]>

Creates EmploymentDetail model

9a02d60

mohinid added the feature label Jun 9, 2022

mohinid requested review from akhilgkrishnan and rohitjoshixyz June 9, 2022 12:46

mohinid self-assigned this Jun 9, 2022

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

rohitjoshixyz reviewed Jun 9, 2022

View reviewed changes

Update spec/models/employment_detail_spec.rb

991b34b

Co-authored-by: Rohit Joshi <[email protected]>

akhilgkrishnan reviewed Jun 10, 2022

View reviewed changes

mohinid added 2 commits June 13, 2022 10:52

update validation and test for nil resigned_at date

90f157f

move employment_detail relation to line 62 in user.rb file

c70a278

Mohini Dahiya and others added 2 commits June 13, 2022 14:28

Merge branch 'develop' into add-employment-details-table

d445668

update reference of company_user with employment_detail

a7f48dd

rohitjoshixyz approved these changes Jun 13, 2022

View reviewed changes

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

akhilgkrishnan approved these changes Jun 13, 2022

View reviewed changes

Merge branch 'develop' into add-employment-details-table

9a6572c

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

akhilgkrishnan merged commit 63068e8 into develop Jun 13, 2022

akhilgkrishnan deleted the add-employment-details-table branch June 13, 2022 11:16

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

		joined_at { Faker::Date.between(from: "2020-01-01", to: "2021-01-01") }
		resigned_at { Date.today }

Conversation

mohinid commented Jun 9, 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:

Uh oh!

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

Uh oh!

Current Code Coverage Percent of this PR:

88.13 %

Files having coverage below 100%

Uh oh!

rohitjoshixyz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rohitjoshixyz Jun 9, 2022

Choose a reason for hiding this comment

Uh oh!

mohinid Jun 9, 2022

Choose a reason for hiding this comment

Uh oh!

rohitjoshixyz Jun 9, 2022

Choose a reason for hiding this comment

Uh oh!

akhilgkrishnan Jun 10, 2022

Choose a reason for hiding this comment

Uh oh!

mohinid Jun 13, 2022

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!

mohinid commented Jun 13, 2022

Uh oh!

rohitjoshixyz commented Jun 13, 2022

Uh oh!

mohinid commented Jun 13, 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!

akhilgkrishnan left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mohinid commented Jun 9, 2022 •

edited

Loading

github-actions bot commented Jun 9, 2022 •

edited

Loading

akhilgkrishnan left a comment •

edited

Loading

mohinid commented Jun 13, 2022 •

edited

Loading