Feature/612 join zusatzsektion model #651
Merged
Conversation
This file contains 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
amaierhofer
force-pushed
the
feature/612-join-zusatzsektion-model
branch
from
fd9c497
to
e419216
Compare
mtnstar
force-pushed
the
feature/612-join-zusatzsektion-model
branch
from
e419216
to
fd8666f
Compare
mtnstar
requested changes
Jun 19, 2024
| def initialize(person, reference_date: Time.zone.today) | ||
| @person = person | ||
| @reference_date = reference_date | ||
| end | ||
|
|
||
| def calculate | ||
| return CATEGORY_FAMILY if family_member? | ||
| def calculate(consider_family: true) |
There was a problem hiding this comment.
Suggested change
| def calculate(consider_family: true) | |
| def calculate(concern_sac_family: true) |
consider ist für mich jetzt eher überlegen ob ich was machen soll oder nicht.
concerning ist berücksichtigen auf deutsch, oder?!
ich weiss, das war so spezifiziert 😉
ggf. einfach auch for_sac_family
There was a problem hiding this comment.
habs auf for_sac_family
| @group = join_section.group_for_neuanmeldung | ||
| @created_at = Time.zone.now | ||
|
|
||
| raise 'missing subgroup' unless group |
There was a problem hiding this comment.
Suggested change
| raise 'missing subgroup' unless group | |
| raise 'missing neuanmeldungen subgroup' unless group |
| def initialize(join_section, person, join_date, family_membership: false, **params) | ||
| super(join_section, person, join_date, **params) | ||
| @family_membership = family_membership | ||
| @group = join_section.group_for_neuanmeldung |
There was a problem hiding this comment.
Suggested change
| @group = join_section.group_for_neuanmeldung | |
| @neuanmeldungen_group = join_section.group_for_neuanmeldung |
etwas längerer name, dafür aber gleich klar um was es sich handelt ?!
There was a problem hiding this comment.
via delegation gelöst
| def prepare_roles(person) | ||
| group.roles.build( | ||
| person: person, | ||
| type: group.class.const_get('NeuanmeldungZusatzsektion'), |
| ] | ||
| end | ||
|
|
||
| it 'is invalid if person has requested membership via section' do |
There was a problem hiding this comment.
Suggested change
| it 'is invalid if person has requested membership via section' do | |
| it 'is invalid if person has requested membership in join section with approval' do |
| ] | ||
| end | ||
|
|
||
| it 'is invalid if person has requested membership via nv' do |
There was a problem hiding this comment.
Suggested change
| it 'is invalid if person has requested membership via nv' do | |
| it 'is invalid if person has requested membership in join section' do |
|
|
||
| describe 'saving' do | ||
| let(:person) { Fabricate(:person) } | ||
| let(:group) { groups(:matterhorn) } |
There was a problem hiding this comment.
Suggested change
| let(:group) { groups(:matterhorn) } | |
| let(:sac_section) { groups(:matterhorn) } |
| end | ||
|
|
||
| context 'single person' do | ||
| describe 'group priority in sektion' do |
There was a problem hiding this comment.
Suggested change
| describe 'group priority in sektion' do | |
| describe 'neuanmeldungen priority in sac section' do |
| expect(role.group).to eq groups(:matterhorn_neuanmeldungen_sektion) | ||
| expect(role.type).to eq 'Group::SektionsNeuanmeldungenSektion::NeuanmeldungZusatzsektion' | ||
| end | ||
|
|
There was a problem hiding this comment.
hier auch das Naming ... Grundsätzlich gibt es zwei Arten von Neuanmeldunge. ...
- mit Freigabe durch Sektion
- ohne Freigabe durch Sektion
die Begriffe hier sind sehr technisch und man muss genau wissen warum diese unterschiedlichen Gruppen vorhanden sind.
amaierhofer
force-pushed
the
feature/612-join-zusatzsektion-model
branch
from
fd8666f
to
d0d1680
Compare
amaierhofer
force-pushed
the
feature/612-join-zusatzsektion-model
branch
from
d0d1680
to
4f0326b
Compare
amaierhofer
force-pushed
the
feature/612-join-zusatzsektion-model
branch
from
4f0326b
to
e8b836a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #612