Refactor relationships #971
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #971 +/- ##
==========================================
+ Coverage 36.8% 37.9% +1.1%
Complexity 11 11
==========================================
Files 192 193 +1
Lines 5225 5119 -106
==========================================
+ Hits 1919 1936 +17
+ Misses 3306 3183 -123
Continue to review full report at Codecov.
|
asbiin
previously requested changes
Mar 20, 2018
| 'name' => 'boss', | ||
| 'name_reverse_relationship' => 'boss', | ||
| 'relationship_type_group_id' => $id, | ||
| ]); |
Member
There was a problem hiding this comment.
Should you not add a relation colleague<=>boss ?
Member
|
This PR would close #117 too right ? |
…to replace-relationships
asbiin
requested changes
Apr 1, 2018
app/Account.php
Outdated
| // create new account | ||
| $account = new self; | ||
| $account->api_key = str_random(30); | ||
| $account->created_at = Carbon::now(); |
| */ | ||
| public function getRelationshipTypeByType(string $relationshipTypeName) | ||
| { | ||
| return $this->relationshipTypes->where('name', $relationshipTypeName)->first(); |
Member
There was a problem hiding this comment.
add ->get() to return the object, and not the Query\Builder instance
Member
Author
There was a problem hiding this comment.
get would return a collection, I need a single item.
| {{ csrf_field() }} | ||
| </form> | ||
| <p class="mb0"> | ||
| <a href="/people/{{ $contact->id }}/relationships/new?type={{ $contact->account->getRelationshipTypeByType('child')->id }}">Add</a> |
| @include('people.relationship._relationship', ['relationships' => $workRelationships]) | ||
|
|
||
| <p class="mb0"> | ||
| <a href="/people/{{ $contact->id }}/relationships/new?type={{ $contact->account->getRelationshipTypeByType('friend')->id }}">Add</a> |
…to replace-relationships
asbiin
approved these changes
Apr 1, 2018
djaiss
changed the title
Merged
|
This pull request has been automatically locked since there |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a massive change of the codebase, including some breaking changes in the API.
This is the first step to address #19 (set relationship to a person) and #117.
The idea is
relationship_typeswhich would allow any type of relationships between two persons.The scope of this PR is not to allow custom relationships now. It is to have the equivalent of what we have now, with the new tables structure, make sure it works. It has to be transparent to the user.
The new system manages masculine/feminine of each relationship type (and localized too), like
Father/mother,daughter/son, etc...Each new relationship type belongs to a relationship type group. For instance,
daughter/sontype belongs to theFamilyrelationship type group.Here are the relationship types that we are going to introduce:
Remaining tasks
vCardand.csvfiles.UNRELEASED.