获取军团列表测试用例

shared/db/Guild.ts

@@ -1,10 +1,8 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typegoose';
 import Role from './Role';
-export interface pvpUpdate {
-}
 
-class Building {
+class Structure {
     @prop({ required: true })
     id: number;
     @prop({ required: true })
@@ -22,41 +20,47 @@ export default class Guild extends BaseModel {
     @prop({ required: true })
     icon: number;
 
-    @prop({ required: true })
+    @prop({ required: true, default: 1 })
     lv: number;
 
-    @prop({ required: true })
+    @prop({ required: true, default: 0 })
     peopleNum: number;
 
     @prop({ required: true })
     leader:  Ref<Role>;
 
-    @prop({ required: true })
+    @prop({ required: true, default: true })
     isAuto:  boolean;
 
-    @prop({ required: true })
+    @prop({ required: true, default: 0 })
     ceCondition: number;
 
-    @prop({ required: true })
+    @prop({ required: true, default: '' })
     notice: string;
 
-    @prop({ required: true })
+    @prop({ required: true, default: '' })
     introduce: string;
 
-    @prop({ required: true })
+    @prop({ required: true, default: 0 })
     fund: number;
 
-    @prop({ required: true })
+    @prop({ required: true, default: 0 })
     activeDaily: number;
 
-    @prop({ required: true })
+    @prop({ required: true, default: new Date() })
     refTimeDaily: number;
 
-    @prop({ required: true })
+    @prop({ required: true, default: new Date() })
     refTimeWeekly: number;
 
-    @prop({ required: true, type: Building })
-    building: Building[]
+    @prop({ required: true, default: 0 })
+    ce: number;                         // 总战力
+
+    @prop({ required: true, type: String, default: [] })
+    members: string[];                  // 军团成员的roleId，用于增加战力的时候加入总战力
+
+    @prop({ required: true, type: Structure, default: [] })
+    structure: Structure[]
 
     @prop({ required: true })
     status:number;
@@ -65,4 +69,5 @@ export default class Guild extends BaseModel {
 
 export const GuildModel = getModelForClass(Guild);
 
-export interface GuildType extends Pick<DocumentType<Guild>, keyof Guild> { };
+export interface GuildType extends Pick<DocumentType<Guild>, keyof Guild> { };
+export type GuildUpdateParam = Partial<GuildType>; // 将所有字段变成可选项

shared/db/UserGuild.ts

@@ -0,0 +1,49 @@
+import BaseModel from './BaseModel';
+import { index, getModelForClass, prop, DocumentType, Ref } from '@typegoose/typegoose';
+import Role from './Role';
+
+class ActiveRecord {
+    @prop({ required: true })
+    id: number;
+    @prop({ required: true })
+    count: number;
+}
+
+@index({ roleId: 1 })
+export default class UserGuild extends BaseModel {
+    @prop({ required: true })
+    guildCode: string;            
+
+    @prop({ required: true })
+    roleId: string;
+
+    @prop({ required: true })
+    role:  Ref<Role>;
+
+    @prop({ required: true, default: 0 })
+    auth:  number;
+
+    @prop({ required: true, default: 0 })
+    job: number;
+
+    @prop({ required: true, default: 0 })
+    honour: number;
+
+    @prop({ required: true, default: 0 })
+    honourWeek: number;
+
+    @prop({ required: true, default: 0 })
+    status: number;
+
+    @prop({ required: true, type: ActiveRecord, default: [] })
+    activeRecord: ActiveRecord[];
+
+    @prop({ required: true, default: new Date() })
+    refTimeWeekly: number;
+    
+}
+
+export const GuildModel = getModelForClass(UserGuild);
+
+export interface GuildType extends Pick<DocumentType<UserGuild>, keyof UserGuild> { };
+export type GuildUpdateParam = Partial<GuildType>; // 将所有字段变成可选项