YumeMichi/honoka-chan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scope unit and accessory data to owning users

Browse Source 
Signed-off-by: Sean Du <do4suki@gmail.com>
This commit is contained in:
YumeMichi
2026-07-13 08:03:10 +08:00
parent 16ab2549d7
commit 96b7951ee1
14 changed files with 67 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/session/accessory.go
+11 -3
View File
@@ -9,7 +9,7 @@ import (
func (ss *Session) GetUserAccessoryWearByUnitOwningUserID(unitOwningUserID int) (bool, *usermodel.UserAccessoryWear) {
wearData := usermodel.UserAccessoryWear{}
has, err := ss.UserEng.Table(new(usermodel.UserAccessoryWear)).
Where("unit_owning_user_id = ?", unitOwningUserID).Get(&wearData)
Where("user_id = ? AND unit_owning_user_id = ?", ss.UserID, unitOwningUserID).Get(&wearData)
if ss.CheckErr(err) {
return false, nil
}
@@ -18,9 +18,13 @@ func (ss *Session) GetUserAccessoryWearByUnitOwningUserID(unitOwningUserID int)
}
func (ss *Session) GetUserAccessoryByAccessoryOwningUserID(accessoryOwningUserID int) (bool, *usermodel.UserAccessory) {
return ss.GetUserAccessoryByAccessoryOwningUserIDForUser(ss.UserID, accessoryOwningUserID)
}
func (ss *Session) GetUserAccessoryByAccessoryOwningUserIDForUser(userID, accessoryOwningUserID int) (bool, *usermodel.UserAccessory) {
accessoryData := usermodel.UserAccessory{}
has, err := ss.UserEng.Table(new(usermodel.UserAccessory)).
Where("accessory_owning_user_id = ?", accessoryOwningUserID).
Where("user_id = ? AND accessory_owning_user_id = ?", userID, accessoryOwningUserID).
Get(&accessoryData)
if ss.CheckErr(err) {
return false, nil
@@ -30,7 +34,11 @@ func (ss *Session) GetUserAccessoryByAccessoryOwningUserID(accessoryOwningUserID
}
func (ss *Session) GetAccessoryByAccessoryOwningUserID(accessoryOwningUserID int) (bool, *accessorymodel.Accessory) {
has, userAccessoryData := ss.GetUserAccessoryByAccessoryOwningUserID(accessoryOwningUserID)
return ss.GetAccessoryByAccessoryOwningUserIDForUser(ss.UserID, accessoryOwningUserID)
}
func (ss *Session) GetAccessoryByAccessoryOwningUserIDForUser(userID, accessoryOwningUserID int) (bool, *accessorymodel.Accessory) {
has, userAccessoryData := ss.GetUserAccessoryByAccessoryOwningUserIDForUser(userID, accessoryOwningUserID)
if !has {
return false, nil
}
internal/session/deck.go
+1 -1
View File
@@ -26,7 +26,7 @@ func (ss *Session) GetUserDeckUnit(deckID int) []usermodel.UserDeckUnit {
unitData := []usermodel.UserDeckUnit{}
err = ss.UserEng.Table("user_deck_unit").
Where("user_deck_id = ?", deckData.ID).Find(&unitData)
Where("user_deck_id = ? AND user_id = ?", deckData.ID, ss.UserID).Find(&unitData)
if ss.CheckErr(err) {
return []usermodel.UserDeckUnit{}
}
internal/session/unit.go
+8 -2
View File
@@ -36,7 +36,7 @@ func (ss *Session) GetUnitInfo(unitID int) (bool, *unitmodel.CommonUnitData) {
func (ss *Session) GetUserUnitInfo(unitOwningUserID int) (bool, *unitmodel.CommonUnitData) {
var unitID int
has, err := ss.UserEng.Table(new(usermodel.UserUnitData)).
Where("unit_owning_user_id = ?", unitOwningUserID).
Where("user_id = ? AND unit_owning_user_id = ?", ss.UserID, unitOwningUserID).
Cols("unit_id").Get(&unitID)
if ss.CheckErr(err) {
return false, nil
@@ -49,10 +49,16 @@ func (ss *Session) GetUserUnitInfo(unitOwningUserID int) (bool, *unitmodel.Commo
return ss.GetUnitInfo(unitID)
}
func (ss *Session) HasUserUnit(unitOwningUserID int) (bool, error) {
return ss.UserEng.Table(new(usermodel.UserUnitData)).
Where("user_id = ? AND unit_owning_user_id = ?", ss.UserID, unitOwningUserID).
Exist()
}
func (ss *Session) GetUserUnitSkillEquip(unitOwningUserID int) []usermodel.UserUnitSkillEquip {
skill := []usermodel.UserUnitSkillEquip{}
err := ss.UserEng.Table("user_unit_skill_equip").
Where("unit_owning_user_id = ?", unitOwningUserID).Find(&skill)
Where("user_id = ? AND unit_owning_user_id = ?", ss.UserID, unitOwningUserID).Find(&skill)
if ss.CheckErr(err) {
return []usermodel.UserUnitSkillEquip{}
}