pierre/GeneIT
1
0
Fork 0
Code Issues Pull Requests 7 Packages Projects Releases Wiki Activity

Add new field

Browse Source
This commit is contained in:
Pierre HUBERT 2023-08-08 11:11:29 +02:00
parent 0262889913
commit eacf3b0700
5 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
geneit_backend/migrations/2023-05-24-102711_create_users/up.sql
View File

@ -61,6 +61,7 @@ CREATE TABLE members (
birth_year smallint NULL, birth_year smallint NULL,
birth_month smallint NULL, birth_month smallint NULL,
birth_day smallint NULL, birth_day smallint NULL,
dead BOOLEAN NOT NULL DEFAULT FALSE,
death_year smallint NULL, death_year smallint NULL,
death_month smallint NULL, death_month smallint NULL,
death_day smallint NULL, death_day smallint NULL,

3
geneit_backend/src/controllers/members_controller.rs
View File

@ -45,6 +45,8 @@ pub struct MemberRequest {
father: Option<MemberID>, father: Option<MemberID>,
#[serde(flatten, with = "prefix_birth")] #[serde(flatten, with = "prefix_birth")]
birth: Option<RequestDate>, birth: Option<RequestDate>,
#[serde(default)]
dead: bool,
#[serde(flatten, with = "prefix_death")] #[serde(flatten, with = "prefix_death")]
death: Option<RequestDate>, death: Option<RequestDate>,
note: Option<String>, note: Option<String>,
@ -221,6 +223,7 @@ impl MemberRequest {
member.birth_month = self.birth.as_ref().map(|m| m.month).unwrap_or_default(); member.birth_month = self.birth.as_ref().map(|m| m.month).unwrap_or_default();
member.birth_day = self.birth.as_ref().map(|m| m.day).unwrap_or_default(); member.birth_day = self.birth.as_ref().map(|m| m.day).unwrap_or_default();
member.dead = self.dead;
member.death_year = self.death.as_ref().map(|m| m.year).unwrap_or_default(); member.death_year = self.death.as_ref().map(|m| m.year).unwrap_or_default();
member.death_month = self.death.as_ref().map(|m| m.month).unwrap_or_default(); member.death_month = self.death.as_ref().map(|m| m.month).unwrap_or_default();
member.death_day = self.death.as_ref().map(|m| m.day).unwrap_or_default(); member.death_day = self.death.as_ref().map(|m| m.day).unwrap_or_default();

1
geneit_backend/src/models.rs
View File

@ -242,6 +242,7 @@ pub struct Member {
pub birth_year: Option<i16>, pub birth_year: Option<i16>,
pub birth_month: Option<i16>, pub birth_month: Option<i16>,
pub birth_day: Option<i16>, pub birth_day: Option<i16>,
pub dead: bool,
pub death_year: Option<i16>, pub death_year: Option<i16>,
pub death_month: Option<i16>, pub death_month: Option<i16>,
pub death_day: Option<i16>, pub death_day: Option<i16>,

1
geneit_backend/src/schema.rs
View File

@ -50,6 +50,7 @@ diesel::table! {
birth_year -> Nullable<Int2>, birth_year -> Nullable<Int2>,
birth_month -> Nullable<Int2>, birth_month -> Nullable<Int2>,
birth_day -> Nullable<Int2>, birth_day -> Nullable<Int2>,
dead -> Bool,
death_year -> Nullable<Int2>, death_year -> Nullable<Int2>,
death_month -> Nullable<Int2>, death_month -> Nullable<Int2>,
death_day -> Nullable<Int2>, death_day -> Nullable<Int2>,

1
geneit_backend/src/services/members_service.rs
View File

@ -75,6 +75,7 @@ pub async fn update(member: &mut Member) -> anyhow::Result<()> {
members::dsl::birth_year.eq(member.birth_year), members::dsl::birth_year.eq(member.birth_year),
members::dsl::birth_month.eq(member.birth_month), members::dsl::birth_month.eq(member.birth_month),
members::dsl::birth_day.eq(member.birth_day), members::dsl::birth_day.eq(member.birth_day),
members::dsl::dead.eq(member.dead),
members::dsl::death_year.eq(member.death_year), members::dsl::death_year.eq(member.death_year),
members::dsl::death_month.eq(member.death_month), members::dsl::death_month.eq(member.death_month),
members::dsl::death_day.eq(member.death_day), members::dsl::death_day.eq(member.death_day),