feat: limit User model to a single membership #135

greatislander · 2022-05-12T19:03:49Z

This PR makes a few changes:

Users can not be a member of more than one Organization. This is enforced when a User attempts to create or join an Organization if they already are part of one.
Memberships and Invitations now use more conventional Controller methods and Form requests instead of Actions for clarity and consistency with other Controllers.
The HearthCommand has been updated to use file globbing to copy stubs rather than requiring changes every time a new stub file is added.

codecov · 2022-05-12T19:05:39Z

Codecov Report

Merging #135 (96cb663) into main (dc740d8) will increase coverage by 8.27%.
The diff coverage is 47.82%.

❗ Current head 96cb663 differs from pull request most recent head 02365ea. Consider uploading reports for the commit 02365ea to get more accurate results

@@             Coverage Diff              @@
##               main     #135      +/-   ##
============================================
+ Coverage     54.09%   62.36%   +8.27%     
- Complexity       73       82       +9     
============================================
  Files            21       25       +4     
  Lines           342      372      +30     
============================================
+ Hits            185      232      +47     
+ Misses          157      140      -17

Impacted Files	Coverage Δ
src/Commands/HearthCommand.php	`22.22% <14.28%> (+3.17%)`	⬆️
src/HearthServiceProvider.php	`100.00% <100.00%> (+3.70%)`	⬆️
src/Models/Invitation.php	`100.00% <100.00%> (ø)`
src/Models/Membership.php	`100.00% <100.00%> (ø)`
src/Traits/AriaDescribable.php	`100.00% <100.00%> (ø)`
src/Traits/HandlesValidation.php	`80.00% <100.00%> (ø)`
src/Traits/HasInvitations.php	`100.00% <100.00%> (ø)`
src/Traits/HasMembers.php	`100.00% <100.00%> (ø)`
src/Components/Textarea.php	`100.00% <0.00%> (+100.00%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dc740d8...02365ea. Read the comment docs.

chore: improve stub routines

# Conflicts: # src/Commands/HearthCommand.php # stubs/app/Models/User.php

src/Commands/HearthCommand.php

jobara · 2022-05-19T19:13:04Z

tests/Feature/MembershipTest.php

+    protected function getEnvironmentSetUp($app)
+    {
+        Schema::dropAllTables();
+
+        $create_users_table = include __DIR__ . '/../../database/migrations/create_users_table.php.stub';
+        $update_users_table = include __DIR__ . '/../../database/migrations/update_users_table.php.stub';
+        $create_memberships_table = include __DIR__ . '/../../database/migrations/2021_03_01_000000_create_memberships_table.php';
+        $create_organizations_table = include __DIR__ . '/../../database/migrations/create_organizations_table.php.stub';
+
+        $create_users_table->up();
+        $update_users_table->up();
+        $create_memberships_table->up();
+        $create_organizations_table->up();
+    }


Not sure if this will work for you, but I used the DatabaseMigrations trait to run the migrations with the tests.

jobara · 2022-05-19T19:21:56Z

@greatislander I'm getting errors when running composer test from hearth directly. The first thing I had to do was create the test database. However, after that there are still errors. I think they're all instances of the following:

In Organization.php line 13:
                                                         
  Trait "Spatie\Translatable\HasTranslations" not found

Not sure if there's something I'm missing and causing this error. For the database requirement, it's probably best to update the README to explain what's needed.

jobara · 2022-05-19T19:23:51Z

In Organization.php line 13:
                                                         
  Trait "Spatie\Translatable\HasTranslations" not found

I missed running composer update, the tests are passing now.

Co-authored-by: greatislander <greatislander@users.noreply.github.com>

greatislander and others added 2 commits May 12, 2022 16:03

feat: provide Invitation and Membership models from Hearth

c2e33bc

fix: apply code styling rules

b2c4c9c

greatislander and others added 19 commits May 12, 2022 16:09

feat: add Membership policy

38eab7c

ci: remove deprecated flags

9aed7f5

fix: resolve static analysis errors

e25bed0

fix: correct relationship type

d6aa933

fix: resolve static analysis error in integration test

2aec502

fix: more static analysis issues

3964eff

test: add some new tests

31f6dc9

test: add coverage for Membership model

2d9ed08

fix: resolve missing pivot name

133a6df

test: remove unnecessary fixture

841fb10

fix: remove unnecessary return in HearthServiceProvider

666528f

fix: resolve static analysis issue

87dcfac

test: add Invitation test

3573bd8

fix: apply code styling rules

1f4ef16

test: test invitations further

ed98998

test: apply formatting to tests

e371e3b

feat: convert AcceptInvitation to a form request

6cc3e97

feat: don't allow users with existing memberships to accept invitations

a795835

test: test membership acceptance

0baa44c

greatislander marked this pull request as ready for review May 17, 2022 01:10

greatislander self-assigned this May 17, 2022

greatislander added the enhancement New feature or request label May 17, 2022

greatislander added this to In progress in v3 via automation May 17, 2022

greatislander added this to the v3 milestone May 17, 2022

greatislander added 3 commits May 18, 2022 16:39

feat: move membership updates to a FormRequest

52e55ce

chore: improve stub routines

feat: make update Membership a form request

9cc9f86

fix: apply code style fixes

319d503

greatislander added 3 commits May 19, 2022 08:46

Merge branch 'main' into feat/single-memberships

95f7daa

# Conflicts: # src/Commands/HearthCommand.php # stubs/app/Models/User.php

fix: resolve testing and analysis errors

ed34973

test: increase coverage for Invitation model

0cd0d55

greatislander marked this pull request as draft May 19, 2022 13:24

greatislander added 2 commits May 19, 2022 10:29

feat: replace DestroyMembership action

4046dc4

fix: clean up policies, relocate ResourceCollectionTest

3c61a7f

greatislander requested review from jobara and chosww May 19, 2022 15:08

greatislander marked this pull request as ready for review May 19, 2022 15:10

greatislander added 4 commits May 19, 2022 12:31

fix: configure dev autoloader for testing

821bd44

fix: adjust PHPStan configuration

e8fab62

test: increase coverage

73c149a

test: fix import

222685d

jobara reviewed May 19, 2022

View reviewed changes

src/Commands/HearthCommand.php Outdated Show resolved Hide resolved

feat: use single filesystem instance

8b1a29a

jobara reviewed May 19, 2022

View reviewed changes

v3 automation moved this from In progress to Reviewer approved May 19, 2022

jobara approved these changes May 19, 2022

View reviewed changes

chore(docs): update README

02365ea

greatislander merged commit 78280b4 into main May 19, 2022

v3 automation moved this from Reviewer approved to Done May 19, 2022

greatislander deleted the feat/single-memberships branch May 19, 2022 19:33

greatislander added a commit that referenced this pull request May 19, 2022

feat!: limit User model to a single membership (#135)

6f06a8d

Co-authored-by: greatislander <greatislander@users.noreply.github.com>

This was referenced May 19, 2022

chore: release 3.0.0 #131

Closed

chore: release 3.0.0 #139

Merged

chore: release 3.0.0 jobara/hearth#3

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: limit User model to a single membership #135

feat: limit User model to a single membership #135

greatislander commented May 12, 2022 •

edited

codecov bot commented May 12, 2022 •

edited

jobara May 19, 2022

jobara commented May 19, 2022

jobara commented May 19, 2022

feat: limit User model to a single membership #135

feat: limit User model to a single membership #135

Conversation

greatislander commented May 12, 2022 • edited

codecov bot commented May 12, 2022 • edited

Codecov Report

jobara May 19, 2022

Choose a reason for hiding this comment

jobara commented May 19, 2022

jobara commented May 19, 2022

greatislander commented May 12, 2022 •

edited

codecov bot commented May 12, 2022 •

edited