Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

委員会開催企画が対象でない申請は、委員会開催企画に送信しないようにした #325

Merged
merged 1 commit into from
Jul 28, 2024
Merged

委員会開催企画が対象でない申請は、委員会開催企画に送信しないようにした #325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions crates/sos24-domain/src/entity/project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,13 @@ bitflags! {

impl ProjectAttributes {
pub fn matches(self, attributes: ProjectAttributes) -> bool {
attributes.intersects(self)
if self.contains(Self::OFFICIAL) {
// フィルターに委員会開催企画が含まれている場合はORで判定する
attributes.intersects(self)
} else {
// フィルターに委員会開催企画が含まれていない場合はORで判定し、かつ、委員会開催企画が含まれていない企画のみを対象とする
attributes.intersects(self) && !attributes.contains(Self::OFFICIAL)
arata-nvm marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

Expand Down Expand Up @@ -499,23 +505,37 @@ mod tests {
#[test]
fn match_project_attributes() {
let filter_attributes = ProjectAttributes::ACADEMIC | ProjectAttributes::INSIDE;
for attributes in ProjectAttributes::all().iter() {
if attributes.contains(ProjectAttributes::ACADEMIC)
|| attributes.contains(ProjectAttributes::INSIDE)
for attributes_bits in 0..ProjectAttributes::all().bits() {
let attributes = ProjectAttributes::from_bits(attributes_bits).unwrap();
if !attributes.contains(ProjectAttributes::OFFICIAL)
&& (attributes.contains(ProjectAttributes::ACADEMIC)
|| attributes.contains(ProjectAttributes::INSIDE))
{
assert!(filter_attributes.matches(attributes));
} else {
assert!(!filter_attributes.matches(attributes));
}
}

let filter_attributes = ProjectAttributes::OFFICIAL;
assert!(filter_attributes.matches(ProjectAttributes::OFFICIAL));
assert!(
filter_attributes.matches(ProjectAttributes::OFFICIAL | ProjectAttributes::ACADEMIC)
);
}

#[test]
fn not_match_project_attributes() {
let attributes = ProjectAttributes::empty();
assert!(!attributes.matches(ProjectAttributes::ACADEMIC));
let filter_attributes = ProjectAttributes::empty();
assert!(!filter_attributes.matches(ProjectAttributes::ACADEMIC));

let filter_attributes = ProjectAttributes::ACADEMIC | ProjectAttributes::INSIDE;
assert!(!filter_attributes.matches(ProjectAttributes::OUTSIDE));

let attributes = ProjectAttributes::ACADEMIC | ProjectAttributes::INSIDE;
assert!(!attributes.matches(ProjectAttributes::OUTSIDE));
let filter_attributes = ProjectAttributes::ACADEMIC;
assert!(!filter_attributes.matches(ProjectAttributes::OFFICIAL));
assert!(
!filter_attributes.matches(ProjectAttributes::OFFICIAL | ProjectAttributes::ACADEMIC)
);
}
}