forked from OpenWF/SpaceNinjaServer
		
	chore: add alliance information to getAccountInfo (#1439)
Reviewed-on: OpenWF/SpaceNinjaServer#1439 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									710470ca2d
								
							
						
					
					
						commit
						abeb17ce44
					
				@ -1,4 +1,4 @@
 | 
			
		||||
import { Guild, GuildMember } from "@/src/models/guildModel";
 | 
			
		||||
import { AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
 | 
			
		||||
import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
 | 
			
		||||
import { RequestHandler } from "express";
 | 
			
		||||
 | 
			
		||||
@ -12,9 +12,19 @@ export const getAccountInfoController: RequestHandler = async (req, res) => {
 | 
			
		||||
    }
 | 
			
		||||
    const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank");
 | 
			
		||||
    if (guildMember) {
 | 
			
		||||
        const guild = (await Guild.findById(guildMember.guildId, "Ranks"))!;
 | 
			
		||||
        const guild = (await Guild.findById(guildMember.guildId, "Ranks AllianceId"))!;
 | 
			
		||||
        info.GuildId = guildMember.guildId.toString();
 | 
			
		||||
        info.GuildPermissions = guild.Ranks[guildMember.rank].Permissions;
 | 
			
		||||
        info.GuildRank = guildMember.rank;
 | 
			
		||||
        if (guild.AllianceId) {
 | 
			
		||||
            //const alliance = (await Alliance.findById(guild.AllianceId))!;
 | 
			
		||||
            const allianceMember = (await AllianceMember.findOne({
 | 
			
		||||
                allianceId: guild.AllianceId,
 | 
			
		||||
                guildId: guild._id
 | 
			
		||||
            }))!;
 | 
			
		||||
            info.AllianceId = guild.AllianceId.toString();
 | 
			
		||||
            info.AlliancePermissions = allianceMember.Permissions;
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    res.json(info);
 | 
			
		||||
};
 | 
			
		||||
@ -24,4 +34,7 @@ interface IAccountInfo {
 | 
			
		||||
    IsAdministrator?: boolean;
 | 
			
		||||
    GuildId?: string;
 | 
			
		||||
    GuildPermissions?: number;
 | 
			
		||||
    GuildRank?: number;
 | 
			
		||||
    AllianceId?: string;
 | 
			
		||||
    AlliancePermissions?: number;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user