From 14bcea02d01baf1d24135a31a26b993dbc52ef6d Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Tue, 16 Jul 2024 11:09:16 +0800
Subject: [PATCH] :arrow_up: Upgrade dealer

---
 .DS_Store                     | Bin 6148 -> 0 bytes
 .gitignore                    |   4 +++-
 .idea/workspace.xml           |  15 +++++----------
 go.mod                        |   2 +-
 go.sum                        |   2 ++
 pkg/.DS_Store                 | Bin 6148 -> 0 bytes
 pkg/internal/.DS_Store        | Bin 10244 -> 0 bytes
 pkg/internal/grpc/realms.go   |   8 ++++----
 pkg/internal/server/.DS_Store | Bin 6148 -> 0 bytes
 9 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 pkg/.DS_Store
 delete mode 100644 pkg/internal/.DS_Store
 delete mode 100644 pkg/internal/server/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 095ee315b3c3ed9ab08d6fcc4f2736af48a81cd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5Z-O7-BN@e6nb3nTCmk(6)z#y7cim+m70)HLu0n|#~ex_XMG``#OHBl
zcPnZYJc;NG%zl&EnS}Wgb~21H?#-e$V|B)u07WcSVfjRGA9Y1a*5d$jyvJk|rYeN1
zr*O0qO^)Bl0KPkijo6S4!u;*~OOwg8)q3V7r@Xda5fxDr*Z!@_{b?|rO}t=yiC1Sz
zrQy;J!t*4~`}NIZl}&>ri^n=4iDC%3x=6A}<(`^l(M0F^W<yj(wO?<{=bcWsDcc9#
zMN`fXcUw)_+1p<%s$y$<=jgOQOz$%FU?}A9wQ1R~xP(VAY&G}(I7?MF01rkxEN3wb
zKX{jUgv0<bKn(mZ2J9&+YX7Tjs+Jfa2EM@no(~cf(Y06@)JF#_dISJ0gIf#OI7?uT
zwCGwa48jfwH>rRomD>@6n{@C?8|PXq44QPt?eM|vlewKxxPCg^U+QqiU4yg|1H{04
z25|NRsbl{?`Fj4>L9`G9#K7NVfR}rI&x6`*Z(XSpd#wb$0Y$;M!r*HP7`hchEVkkX
bs21=`Gyq+Tg+cIu(2szoffi!mM;Ukl;|ES4

diff --git a/.gitignore b/.gitignore
index 9e23ac2..55a4f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /dist
-/uploads
\ No newline at end of file
+/uploads
+
+.DS_Store
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ca153ed..1df2743 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,8 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":recycle: Refactored relation system&#10;:arrow_up: Support new realm &amp; relation api">
-      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/notifier.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/notifier.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/models/notifications.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/notifications.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/server/admin/notify_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/admin/notify_api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/notifications_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/notifications_api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/notify_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/notify_api.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/services/notifications.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/notifications.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/services/relationships.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/relationships.go" afterDir="false" />
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix model relation issue">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,6 +88,7 @@
     <myKeys>
       <visibility group="Grunt" flag="true" />
       <visibility group="Gulp" flag="true" />
+      <visibility group="HTTP Requests" flag="true" />
       <visibility group="HTTP 请求" flag="true" />
       <visibility group="Recent projects" flag="true" />
       <visibility group="Run configurations" flag="true" />
@@ -157,7 +152,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":bug: Fix status validation issue" />
     <MESSAGE value=":bug: Fix bugs in status" />
     <MESSAGE value=":bug: Fix status query condition" />
     <MESSAGE value=":bug: Fix disturbable condition" />
@@ -182,7 +176,8 @@
     <MESSAGE value=":bug: Fix oauth ticket need mfa" />
     <MESSAGE value=":arrow_up: Support new auth api" />
     <MESSAGE value=":recycle: Refactored relation system&#10;:arrow_up: Support new realm &amp; relation api" />
-    <option name="LAST_COMMIT_MESSAGE" value=":recycle: Refactored relation system&#10;:arrow_up: Support new realm &amp; relation api" />
+    <MESSAGE value=":bug: Fix model relation issue" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix model relation issue" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/go.mod b/go.mod
index 0c802cb..3492e42 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.22.1
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
-	git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154745-ab0b491f45ff
+	git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951
 	git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745
 	github.com/go-playground/validator/v10 v10.17.0
 	github.com/gofiber/fiber/v2 v2.52.4
diff --git a/go.sum b/go.sum
index 45cdac2..776d28f 100644
--- a/go.sum
+++ b/go.sum
@@ -29,6 +29,8 @@ git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154526-59bda7a4117a h1:ozV2DWlcS
 git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154526-59bda7a4117a/go.mod h1:eZwAwP7ahL7TO8GWBlYFYDdjlna+8zHYbDfNabnuUEU=
 git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154745-ab0b491f45ff h1:Bzcu+n1YFD09SGoGxuFnqT56u3kK66sQ/vF8PEhbPJQ=
 git.solsynth.dev/hydrogen/dealer v0.0.0-20240715154745-ab0b491f45ff/go.mod h1:eZwAwP7ahL7TO8GWBlYFYDdjlna+8zHYbDfNabnuUEU=
+git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951 h1:RgZJK4PXhrjhUX75BclBCg2xfetMkswcMwMqfTBtryQ=
+git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951/go.mod h1:eZwAwP7ahL7TO8GWBlYFYDdjlna+8zHYbDfNabnuUEU=
 git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745 h1:40BUsQMNXjqHyytkyF9py1HjTAWlRgO6R57YXUrHNy4=
 git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745/go.mod h1:FsQGSLTl0gvo+9Jmbot02S72suyF9tFTrzDj70Xhifo=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
diff --git a/pkg/.DS_Store b/pkg/.DS_Store
deleted file mode 100644
index eac047245d7eb938cabdd22d343ff1f270dba5df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5Z-O8-BN@e6nb3nTCmk(6)&OI7cim+m70*C!I&*gY7V84v%Zi|;`2DO
zy8%mk@FZeqVDrt+&+g6#*&oIjAI^dvV=cy*fQHCXStDp(>#EpbM6Sn}vV?go_VaYI
zW}v@l!nF$)!MZaRvTy76W95VI!=J=ansvLMyi%=gZP!IzG{wF9q;fa&vROLxrnlI;
zQY!XK-Se-bFdw&e&sCCnQ4&sdLKK7$a(5FYfy#$!mISHJb&W$bL}T1)&*%OApd))H
zgGEQqPY=5t**`j7EE-~O|KRL${2ad|>dlbJfp;xC7E5>sWu>lHcbdd1c?4gXSH=?(
z1H=F^Kn!dS1NICM&CMy9DkTPpfgdt}`-6mr=vXWa>a7Dlczs5H4G{%&d`looi;l&@
zAb3EyNd+{i+&(e5Ne8>MagN2pph;(3&kW<(najru*Rz9N>Tt##gY+c^h=FAWs;1k*
z^Zx>VnYEAn<rL}>1H`~TV}RF2?q~=_*|T+}JUnY9v<GM?7+0VI0{YS=06Msjw6)Xt
cCF&68SS$?UC}`K|fOHYigwTf=_yq>O0Ne9T9RL6T

diff --git a/pkg/internal/.DS_Store b/pkg/internal/.DS_Store
deleted file mode 100644
index bb2309c3518f3501fb1a5f3272159026fdfc2c2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHMU2GIp6uxI#${j{vsO4A2ow`D6S;O{^A5mDgZRDqg!nX8>pLKR;pcAGuWoC9u
zZL0N20&3!m#{V~>KA=WX^ws~w_&|^-F%e_p6E7OU2NUDDb7x7rEl-3%a3;C;%sKa*
zJA1zQ&fUFt2_cX!=#7M^gb<32N%<b^X1UlnYcnn(w6H<IctR}V<wm`coaN+Zct?f^
zfe3*Jfe3*Jfe3*+0RjBZW*3#XjQR+H2!RNJ>j<#*LB+;oDwLC421^Ha!4?2zC7Oc^
z?{Oax#HgW6g>sV1AQb21y9WqEA>3jB565wpxuZ;la*|6PPJo9K2%ik$4h4dzW1Jee
z6G(9x^$`LQ0y7a{Wm83li9>W^l<nWo<wh*i^OMPoAXHS&shUgYQi&eS3^}72U-JuI
zT66a^t;cb!T<KoR?K6$htX$LP*uG}kh8qN!x`8eS`b=AQM$=Bg*1aG$!w0BH#jLz+
ze7w22F`+iKHcuqf@r_N%gxb=)Zel{Di{ooI?adywhHd90PXofGfXpvT>r{D8#f)oP
zj(r5}ET)Qhn5#>Qte<jTaa;0jX<4688#k=K>3pZ;RF*Hjp07#rnDf*#n%k0dYqAyJ
zF}~NEd&e{Kvb<s&KYOakl(>7T#9eWoB+Xa)`UeL0AIQpb!87(6mgbv9qh0e2FDozf
zkjmThj@|7VMWk?F-mwb9HjXUHYgWF1&c;^D%9u}b@4V|+R=4AszUkNl{l0PBXJc%l
zX+!;kp5yv$!DRg=&d<H7*)w*JuwZYW;d&@V@yvpyu?OoPZd(6ns$+ZCo(l`*Mb%P`
zw4|?SdS=ctdPhy&9~#iSykYC6ePj@;$M(&`rs0Z<AR+eH+OTn<dfD<7_pMZva_`bC
z{e_%)tYG?Ma-35Bj9Miw%4g{T9h2;GbT*?Nj3~8A9i{u3z0EbS=VqxvNr<vWdpt~;
zPq9{N6lG8BIf^CDLtCVERMy2_OUoG+H*J(QQF*7>SL7LUV~w<hiv4+Kco>uMxGk-;
zQ~4Wuh&{Md^ZeZ-hF$tdX=NLwgWizl8oNhvfhk3FQX0HQw6l;7-SizdKx0>}q71O9
zw(7c}W6~>@Ew5HGN-veqV~lLtMH81ad<T4Gqw!RC3YQ8(;;Du}k~kNH1Q^FtNv_wF
z%%NmIWE7GlX|jVHA|qssoFXrgx5!82EcuvxNxml+$<O3>@(1~oTqW1YKTrwtpaxdL
zDyV~ccnF%H8Cqc-v_U6y!7dntJm_#3j(`OPD8g|VgQwtGH~}Z&6ubzp!fWsbya}h_
zJ$N5JfY0D__yWFyui+y60+-=exB^$<8vHGYLbb3`P=x!1I-y=@5Y`Brg)PE1VUI8<
zWQ8G~flyjj4^Gca7(;!wk_(S}g)_64T<q~}+js2jykkr5rv<FY?yXt8WU0EUVQtHX
z$F^RlB4=)itW%31;Qh2}33wlHqnxw68l_k-7KU;BMnx&lWd%$xFz?z2q?kMhONXng
z>rk!2vf=8QL@Xu?Sgl-5HpV2m0&7tWVp|iaLa1zfM3Ur6tV%w%SwWSAO1cfFVKqi?
z72Cfh=gE)cGP#0m{}(EN!ctISH6)PTn<0e^Z-)+KcsJ~Y4D`T3$btqr<hunnjKDE)
zVH_slX_$m(knPXG^Y8+^46h*LUq{ZLhPUAzco#l|v+xO=gHHqQe+NInCHSq3&0W*k
z41dkW=CUu&=^>F8ArK)DArK)DA#hh9P{FfM+4+CRjsO3@D{_sJh!BVnm>mJAY|pf(
zajdlSD|cgO?JBk>u(6BzO>!B8U>6+6qYRGYQDNtb_1KtixKj@9Q=x5=%OD(mf^d}l
WH2;?W84&INqy2yB$nAf+|NjrMvoO2>

diff --git a/pkg/internal/grpc/realms.go b/pkg/internal/grpc/realms.go
index aad261c..a9d6e59 100644
--- a/pkg/internal/grpc/realms.go
+++ b/pkg/internal/grpc/realms.go
@@ -121,8 +121,8 @@ func (v *Server) ListRealmMember(ctx context.Context, request *proto.RealmMember
 	}
 
 	return &proto.ListRealmMemberResponse{
-		Data: lo.Map(members, func(item models.RealmMember, index int) *proto.MemberInfo {
-			return &proto.MemberInfo{
+		Data: lo.Map(members, func(item models.RealmMember, index int) *proto.RealmMemberInfo {
+			return &proto.RealmMemberInfo{
 				RealmId:    uint64(item.RealmID),
 				UserId:     uint64(item.AccountID),
 				PowerLevel: int32(item.PowerLevel),
@@ -131,7 +131,7 @@ func (v *Server) ListRealmMember(ctx context.Context, request *proto.RealmMember
 	}, nil
 }
 
-func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.MemberInfo, error) {
+func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberLookupRequest) (*proto.RealmMemberInfo, error) {
 	var member models.RealmMember
 	tx := database.C.Where("realm_id = ?", request.GetRealmId())
 	if request.UserId != nil {
@@ -142,7 +142,7 @@ func (v *Server) GetRealmMember(ctx context.Context, request *proto.RealmMemberL
 		return nil, err
 	}
 
-	return &proto.MemberInfo{
+	return &proto.RealmMemberInfo{
 		RealmId:    uint64(member.RealmID),
 		UserId:     uint64(member.AccountID),
 		PowerLevel: int32(member.PowerLevel),
diff --git a/pkg/internal/server/.DS_Store b/pkg/internal/server/.DS_Store
deleted file mode 100644
index 1df53153ff030818272e15bfa66033680df16bfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKQA+|r5S~@b6A64M@NuD6AuY+Gm&5E2bWsl#c85|&*R6PG1|r;Z{h@wIzo(hq
zRWi%Rh?;@fZ+CX)j`{A`*#Q929`zak6##Hh33DYJz7X0cU6P!&6c7bHBN+sd3UKur
z43@mv@EaMRZ<hxj1`r10kKZo}leAuc6S;h0ZN2Ceow9T7-Knvc`spZX`@>6GohcOs
zv$-Ffhy8K4vU#lH)DPqSPzQv)KDu08gmF)e+iDc|5*_QA4X5Okx|Ql=(rmVBvT@Lw
z*5u@Hw_cOYz5VI5<ZNy49G!OWqlZ{M8wv&fZCW-g&fo<nHk(Ip7)L6;MGJWspbt-w
zLh?tloagf?&lwYp%m6dM46I_no}x~9l@sqV1I)m`WPr{GiAv~N%na(I0|(s#AksBb
z3(l#RpcrY<wU`;i9TZ_g5lyJDEru}RXqVQ{wU`++;UH}DA?%xl?NEe%J3e1(cMz^Y
z9+?4VV3C2mSyrh2pM2l{F9z|78DIwf6a%8r@j7ix$=24T<fzt4)EiV1^2-d)LvW%?
gG5S&|uA*u|yQB%CYcVs378Je+Xc~B627Z)*cMK$jod5s;