[profiles] split promotion property

Japan7 · Dec 12, 2024 · 5881940 · 5881940
1 parent 05eb063
commit 5881940
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 23 deletions.
diff --git a/nanapi/database/user/profile_get_by_discord_id.edgeql b/nanapi/database/user/profile_get_by_discord_id.edgeql
@@ -7,9 +7,10 @@ with
 select profiles {
   birthday,
   full_name,
+  graduation_year,
   photo,
-  promotion,
   pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,

diff --git a/nanapi/database/user/profile_get_by_discord_id.py b/nanapi/database/user/profile_get_by_discord_id.py
@@ -13,9 +13,10 @@
 select profiles {
   birthday,
   full_name,
+  graduation_year,
   photo,
-  promotion,
   pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,
@@ -33,9 +34,10 @@ class ProfileGetByDiscordIdResultUser(BaseModel):
 class ProfileGetByDiscordIdResult(BaseModel):
     birthday: datetime | None
     full_name: str | None
+    graduation_year: str | None
     photo: str | None
-    promotion: str | None
     pronouns: str | None
+    n7_major: str | None
     telephone: str | None
     user: ProfileGetByDiscordIdResultUser
 

diff --git a/nanapi/database/user/profile_merge_select.edgeql b/nanapi/database/user/profile_merge_select.edgeql
@@ -3,9 +3,10 @@ with
   discord_username := <str>$discord_username,
   birthday := <optional datetime>$birthday,
   full_name := <optional str>$full_name,
+  graduation_year := <optional str>$graduation_year,
   photo := <optional str>$photo,
-  promotion := <optional str>$promotion,
   pronouns := <optional str>$pronouns,
+  n7_major := <optional str>$n7_major,
   telephone := <optional str>$telephone,
   user := (
     insert user::User {
@@ -23,9 +24,10 @@ with
     insert user::Profile {
       birthday := birthday,
       full_name := full_name,
+      graduation_year := graduation_year,
       photo := photo,
-      promotion := promotion,
       pronouns := pronouns,
+      n7_major := n7_major,
       telephone := telephone,
       user := user,
     }
@@ -34,19 +36,21 @@ with
       update user::Profile set {
         birthday := birthday,
         full_name := full_name,
+        graduation_year := graduation_year,
         photo := photo,
-        promotion := promotion,
         pronouns := pronouns,
+        n7_major := n7_major,
         telephone := telephone,
       }
     )
   )
 select profile {
   birthday,
+  graduation_year,
   full_name,
   photo,
-  promotion,
   pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,

diff --git a/nanapi/database/user/profile_merge_select.py b/nanapi/database/user/profile_merge_select.py
@@ -9,9 +9,10 @@
   discord_username := <str>$discord_username,
   birthday := <optional datetime>$birthday,
   full_name := <optional str>$full_name,
+  graduation_year := <optional str>$graduation_year,
   photo := <optional str>$photo,
-  promotion := <optional str>$promotion,
   pronouns := <optional str>$pronouns,
+  n7_major := <optional str>$n7_major,
   telephone := <optional str>$telephone,
   user := (
     insert user::User {
@@ -29,9 +30,10 @@
     insert user::Profile {
       birthday := birthday,
       full_name := full_name,
+      graduation_year := graduation_year,
       photo := photo,
-      promotion := promotion,
       pronouns := pronouns,
+      n7_major := n7_major,
       telephone := telephone,
       user := user,
     }
@@ -40,19 +42,21 @@
       update user::Profile set {
         birthday := birthday,
         full_name := full_name,
+        graduation_year := graduation_year,
         photo := photo,
-        promotion := promotion,
         pronouns := pronouns,
+        n7_major := n7_major,
         telephone := telephone,
       }
     )
   )
 select profile {
   birthday,
+  graduation_year,
   full_name,
   photo,
-  promotion,
   pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,
@@ -69,10 +73,11 @@ class ProfileMergeSelectResultUser(BaseModel):
 
 class ProfileMergeSelectResult(BaseModel):
     birthday: datetime | None
+    graduation_year: str | None
     full_name: str | None
     photo: str | None
-    promotion: str | None
     pronouns: str | None
+    n7_major: str | None
     telephone: str | None
     user: ProfileMergeSelectResultUser
 
@@ -87,9 +92,10 @@ async def profile_merge_select(
     discord_username: str,
     birthday: datetime | None = None,
     full_name: str | None = None,
+    graduation_year: str | None = None,
     photo: str | None = None,
-    promotion: str | None = None,
     pronouns: str | None = None,
+    n7_major: str | None = None,
     telephone: str | None = None,
 ) -> ProfileMergeSelectResult:
     resp = await executor.query_single_json(
@@ -98,9 +104,10 @@ async def profile_merge_select(
         discord_username=discord_username,
         birthday=birthday,
         full_name=full_name,
+        graduation_year=graduation_year,
         photo=photo,
-        promotion=promotion,
         pronouns=pronouns,
+        n7_major=n7_major,
         telephone=telephone,
     )
     return adapter.validate_json(resp, strict=False)
diff --git a/nanapi/database/user/profile_select_filter_discord_id.edgeql b/nanapi/database/user/profile_select_filter_discord_id.edgeql
@@ -2,9 +2,12 @@ with
   discord_ids := <array<int64>>$discord_ids,
   _discord_ids := array_unpack(discord_ids),
 select user::Profile {
+  birthday,
   full_name,
+  graduation_year,
   photo,
-  promotion,
+  pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,

diff --git a/nanapi/database/user/profile_select_filter_discord_id.py b/nanapi/database/user/profile_select_filter_discord_id.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from edgedb import AsyncIOExecutor
 from pydantic import BaseModel, TypeAdapter
 
@@ -6,9 +8,12 @@
   discord_ids := <array<int64>>$discord_ids,
   _discord_ids := array_unpack(discord_ids),
 select user::Profile {
+  birthday,
   full_name,
+  graduation_year,
   photo,
-  promotion,
+  pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,
@@ -26,9 +31,12 @@ class ProfileSelectFilterDiscordIdResultUser(BaseModel):
 
 
 class ProfileSelectFilterDiscordIdResult(BaseModel):
+    birthday: datetime | None
     full_name: str | None
+    graduation_year: str | None
     photo: str | None
-    promotion: str | None
+    pronouns: str | None
+    n7_major: str | None
     telephone: str | None
     user: ProfileSelectFilterDiscordIdResultUser
 

diff --git a/nanapi/database/user/profile_select_ilike.edgeql b/nanapi/database/user/profile_select_ilike.edgeql
@@ -1,13 +1,16 @@
 with
   pattern := <str>$pattern
 select user::Profile {
+  birthday,
   full_name,
+  graduation_year,
   photo,
-  promotion,
+  pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,
     discord_id_str,
   },
 }
-filter .full_name ilike pattern or .promotion ilike pattern or .telephone ilike pattern
+filter .full_name ilike pattern or .telephone ilike pattern
diff --git a/nanapi/database/user/profile_select_ilike.py b/nanapi/database/user/profile_select_ilike.py
@@ -1,20 +1,25 @@
+from datetime import datetime
+
 from edgedb import AsyncIOExecutor
 from pydantic import BaseModel, TypeAdapter
 
 EDGEQL_QUERY = r"""
 with
   pattern := <str>$pattern
 select user::Profile {
+  birthday,
   full_name,
+  graduation_year,
   photo,
-  promotion,
+  pronouns,
+  n7_major,
   telephone,
   user: {
     discord_id,
     discord_id_str,
   },
 }
-filter .full_name ilike pattern or .promotion ilike pattern or .telephone ilike pattern
+filter .full_name ilike pattern or .telephone ilike pattern
 """
 
 
@@ -24,9 +29,12 @@ class ProfileSelectIlikeResultUser(BaseModel):
 
 
 class ProfileSelectIlikeResult(BaseModel):
+    birthday: datetime | None
     full_name: str | None
+    graduation_year: str | None
     photo: str | None
-    promotion: str | None
+    pronouns: str | None
+    n7_major: str | None
     telephone: str | None
     user: ProfileSelectIlikeResultUser
 

diff --git a/nanapi/models/user.py b/nanapi/models/user.py
@@ -18,7 +18,8 @@ class UpsertProfileBody(BaseModel):
     birthday: datetime | None = None
     discord_username: str
     full_name: str | None = None
+    graduation_year: str | None = None
+    n7_specialty: str | None = None
     photo: str | None = None
-    promotion: str | None = None
     pronouns: str | None = None
     telephone: str | None = None