@xcpcio/core 0.46.0 → 0.46.1

package/dist/index.cjs

@@ -548,6 +548,36 @@ class ICPCStandingsCsvConverter {
   }
 }
 
+class Person {
+  constructor(name = "") {
+    this.name = name;
+  }
+  toJSON() {
+    return {
+      name: this.name
+    };
+  }
+  static fromJSON(iPerson) {
+    if (typeof iPerson === "string") {
+      iPerson = JSON.parse(iPerson);
+    }
+    const person = new Person();
+    person.name = iPerson.name;
+    return person;
+  }
+}
+function createPersons(iPersons) {
+  if (typeof iPersons === "string") {
+    for (const c of " ,\u3001|") {
+      if (iPersons.includes(c)) {
+        return iPersons.split(c).map((name) => new Person(name));
+      }
+    }
+    return [new Person(iPersons)];
+  }
+  return iPersons.map((name) => new Person(name));
+}
+
 function calcDirt(attemptedNum, solvedNum) {
   if (solvedNum === 0) {
     return 0;
@@ -580,6 +610,10 @@ class RatingHistory {
   constructor() {
     this.rank = 0;
     this.rating = 0;
+    this.teamName = "";
+    this.organization = "";
+    this.members = [];
+    this.coaches = [];
     this.contestID = "";
     this.contestName = "";
     this.contestLink = "";
@@ -589,6 +623,10 @@ class RatingHistory {
     return {
       rank: this.rank,
       rating: this.rating,
+      teamName: this.teamName,
+      organization: this.organization,
+      members: this.members.map((member) => member.toJSON()),
+      coaches: this.coaches.map((coach) => coach.toJSON()),
       contestID: this.contestID,
       contestName: this.contestName,
       contestLink: this.contestLink,
@@ -602,6 +640,10 @@ class RatingHistory {
     const ratingHistory = new RatingHistory();
     ratingHistory.rank = iRatingHistory.rank;
     ratingHistory.rating = iRatingHistory.rating;
+    ratingHistory.teamName = iRatingHistory.teamName;
+    ratingHistory.organization = iRatingHistory.organization;
+    ratingHistory.members = iRatingHistory.members.map((iMember) => Person.fromJSON(iMember));
+    ratingHistory.coaches = iRatingHistory.coaches.map((iCoach) => Person.fromJSON(iCoach));
     ratingHistory.contestID = iRatingHistory.contestID;
     ratingHistory.contestName = iRatingHistory.contestName;
     ratingHistory.contestLink = iRatingHistory.contestLink;
@@ -614,6 +656,9 @@ class RatingUser {
   constructor() {
     this.id = "";
     this.name = "";
+    this.organization = "";
+    this.members = [];
+    this.coaches = [];
     this.rating = 0;
     this.minRating = 1061109567;
     this.maxRating = -1061109567;
@@ -632,6 +677,9 @@ class RatingUser {
     return {
       id: this.id,
       name: this.name,
+      organization: this.organization,
+      members: this.members.map((member) => member.toJSON()),
+      coaches: this.coaches.map((coach) => coach.toJSON()),
       rating: this.rating,
       minRating: this.minRating,
       maxRating: this.maxRating,
@@ -645,6 +693,9 @@ class RatingUser {
     const ratingUser = new RatingUser();
     ratingUser.id = iRatingUser.id;
     ratingUser.name = iRatingUser.name;
+    ratingUser.organization = iRatingUser.organization;
+    ratingUser.members = iRatingUser.members.map((member) => Person.fromJSON(member));
+    ratingUser.coaches = iRatingUser.coaches.map((coach) => Person.fromJSON(coach));
     ratingUser.rating = iRatingUser.rating;
     ratingUser.minRating = iRatingUser.minRating;
     ratingUser.maxRating = iRatingUser.maxRating;
@@ -741,40 +792,54 @@ class Rating {
   buildRating() {
     for (const rank of this.ranks) {
       rank.buildRank();
-      for (const u of this.users) {
-        u.oldRating = u.rating;
-      }
+      const ratingCalculator = new RatingCalculator();
       for (const t of rank.teams) {
         const id = this.generateTeamId(t);
+        let u = null;
         if (!this.userMap.has(id)) {
-          const u = new RatingUser();
+          u = new RatingUser();
           u.id = id;
           u.name = t.name;
+          u.organization = t.organization;
+          u.members = createPersons(t.members ?? []);
+          u.coaches = createPersons(t.coach ?? []);
           u.rank = t.rank;
           u.oldRating = this.baseRating;
           u.UpdateRating(this.baseRating);
           this.userMap.set(id, u);
           this.users.push(u);
+          ratingCalculator.users.push(u);
+        } else {
+          u = this.userMap.get(id);
+          u.rank = t.rank;
+          u.oldRating = u.rating;
+          ratingCalculator.users.push(u);
+        }
+        {
+          const h = new RatingHistory();
+          h.rank = t.rank;
+          h.rating = u.rating;
+          h.teamName = t.name;
+          h.organization = t.organization;
+          h.members = createPersons(t.members ?? []);
+          h.coaches = createPersons(t.coach ?? []);
+          h.contestID = rank.contest.id;
+          h.contestLink = h.contestID;
+          h.contestName = rank.contest.name;
+          h.contestTime = rank.contest.startTime;
+          u.ratingHistories.push(h);
         }
       }
-      const ratingCalculator = new RatingCalculator();
-      ratingCalculator.users = this.users;
       ratingCalculator.calculate();
-      for (const u of this.users) {
-        const h = new RatingHistory();
-        h.rank = u.rank;
-        h.rating = u.rating;
-        h.contestID = rank.contest.id;
-        h.contestLink = h.contestID;
-        h.contestName = rank.contest.name;
-        h.contestTime = rank.contest.startTime;
-        u.ratingHistories.push(h);
+      for (const u of ratingCalculator.users) {
+        u.ratingHistories.at(-1).rating = u.rating;
       }
     }
   }
   generateTeamId(t) {
-    if (Array.isArray(t.members) && t.members.length > 0) {
-      return t.members.join("|");
+    const persons = createPersons(t.members ?? []);
+    if (persons.length > 0) {
+      return persons.map((person) => person.name).join("|");
     }
     return `${t.organization}-${t.name}`;
   }
@@ -2264,6 +2329,7 @@ exports.Giants = Giants;
 exports.GiantsType = GiantsType;
 exports.ICPCStandingsCsvConverter = ICPCStandingsCsvConverter;
 exports.MedalType = MedalType;
+exports.Person = Person;
 exports.PlaceChartPointData = PlaceChartPointData;
 exports.Problem = Problem;
 exports.ProblemStatistics = ProblemStatistics;
@@ -2283,6 +2349,7 @@ exports.createContest = createContest;
 exports.createContestIndex = createContestIndex;
 exports.createContestIndexList = createContestIndexList;
 exports.createDayJS = createDayJS;
+exports.createPersons = createPersons;
 exports.createProblem = createProblem;
 exports.createProblems = createProblems;
 exports.createProblemsByProblemIds = createProblemsByProblemIds;

package/dist/index.d.ts

@@ -1,8 +1,7 @@
-import { TimeUnit, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, Lang, CalculationOfPenalty, StatusTimeDisplay, MedalPreset, Image, BannerMode, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1, IRatingHistory, ContestIndex as ContestIndex$1 } from '@xcpcio/types';
+import { TimeUnit, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, Lang, CalculationOfPenalty, StatusTimeDisplay, MedalPreset, Image, BannerMode, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1, IPerson, IRatingHistory, IRatingUser, IRating, ContestIndex as ContestIndex$1 } from '@xcpcio/types';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
-import { IRatingUser, IRating } from '@xcpcio/types/index';
 
 declare class Submission {
     id: string;
@@ -355,9 +354,22 @@ declare class ICPCStandingsCsvConverter {
     private getMedalCitation;
 }
 
+declare class Person {
+    name: string;
+    constructor(name?: string);
+    toJSON(): IPerson;
+    static fromJSON(iPerson: IPerson | string): Person;
+}
+type Persons = Array<Person>;
+declare function createPersons(iPersons: string | Array<string>): Persons;
+
 declare class RatingHistory {
     rank: number;
     rating: number;
+    teamName: string;
+    organization: string;
+    members: Persons;
+    coaches: Persons;
     contestID: string;
     contestName: string;
     contestLink: string;
@@ -371,6 +383,9 @@ type RatingHistories = Array<RatingHistory>;
 declare class RatingUser {
     id: string;
     name: string;
+    organization: string;
+    members: Persons;
+    coaches: Persons;
     rating: number;
     minRating: number;
     maxRating: number;
@@ -458,4 +473,4 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Award, Awards, Balloon, Balloons, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, ContestOptions, GeneralExcelConverter, Giants, GiantsType, ICPCStandingsCsvConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Ranks, Rating, RatingCalculator, RatingHistories, RatingHistory, RatingUser, RatingUserMap, RatingUsers, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Awards, Balloon, Balloons, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, ContestOptions, GeneralExcelConverter, Giants, GiantsType, ICPCStandingsCsvConverter, MedalType, Person, Persons, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Ranks, Rating, RatingCalculator, RatingHistories, RatingHistory, RatingUser, RatingUserMap, RatingUsers, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/dist/index.mjs

@@ -515,6 +515,36 @@ class ICPCStandingsCsvConverter {
   }
 }
 
+class Person {
+  constructor(name = "") {
+    this.name = name;
+  }
+  toJSON() {
+    return {
+      name: this.name
+    };
+  }
+  static fromJSON(iPerson) {
+    if (typeof iPerson === "string") {
+      iPerson = JSON.parse(iPerson);
+    }
+    const person = new Person();
+    person.name = iPerson.name;
+    return person;
+  }
+}
+function createPersons(iPersons) {
+  if (typeof iPersons === "string") {
+    for (const c of " ,\u3001|") {
+      if (iPersons.includes(c)) {
+        return iPersons.split(c).map((name) => new Person(name));
+      }
+    }
+    return [new Person(iPersons)];
+  }
+  return iPersons.map((name) => new Person(name));
+}
+
 function calcDirt(attemptedNum, solvedNum) {
   if (solvedNum === 0) {
     return 0;
@@ -547,6 +577,10 @@ class RatingHistory {
   constructor() {
     this.rank = 0;
     this.rating = 0;
+    this.teamName = "";
+    this.organization = "";
+    this.members = [];
+    this.coaches = [];
     this.contestID = "";
     this.contestName = "";
     this.contestLink = "";
@@ -556,6 +590,10 @@ class RatingHistory {
     return {
       rank: this.rank,
       rating: this.rating,
+      teamName: this.teamName,
+      organization: this.organization,
+      members: this.members.map((member) => member.toJSON()),
+      coaches: this.coaches.map((coach) => coach.toJSON()),
       contestID: this.contestID,
       contestName: this.contestName,
       contestLink: this.contestLink,
@@ -569,6 +607,10 @@ class RatingHistory {
     const ratingHistory = new RatingHistory();
     ratingHistory.rank = iRatingHistory.rank;
     ratingHistory.rating = iRatingHistory.rating;
+    ratingHistory.teamName = iRatingHistory.teamName;
+    ratingHistory.organization = iRatingHistory.organization;
+    ratingHistory.members = iRatingHistory.members.map((iMember) => Person.fromJSON(iMember));
+    ratingHistory.coaches = iRatingHistory.coaches.map((iCoach) => Person.fromJSON(iCoach));
     ratingHistory.contestID = iRatingHistory.contestID;
     ratingHistory.contestName = iRatingHistory.contestName;
     ratingHistory.contestLink = iRatingHistory.contestLink;
@@ -581,6 +623,9 @@ class RatingUser {
   constructor() {
     this.id = "";
     this.name = "";
+    this.organization = "";
+    this.members = [];
+    this.coaches = [];
     this.rating = 0;
     this.minRating = 1061109567;
     this.maxRating = -1061109567;
@@ -599,6 +644,9 @@ class RatingUser {
     return {
       id: this.id,
       name: this.name,
+      organization: this.organization,
+      members: this.members.map((member) => member.toJSON()),
+      coaches: this.coaches.map((coach) => coach.toJSON()),
       rating: this.rating,
       minRating: this.minRating,
       maxRating: this.maxRating,
@@ -612,6 +660,9 @@ class RatingUser {
     const ratingUser = new RatingUser();
     ratingUser.id = iRatingUser.id;
     ratingUser.name = iRatingUser.name;
+    ratingUser.organization = iRatingUser.organization;
+    ratingUser.members = iRatingUser.members.map((member) => Person.fromJSON(member));
+    ratingUser.coaches = iRatingUser.coaches.map((coach) => Person.fromJSON(coach));
     ratingUser.rating = iRatingUser.rating;
     ratingUser.minRating = iRatingUser.minRating;
     ratingUser.maxRating = iRatingUser.maxRating;
@@ -708,40 +759,54 @@ class Rating {
   buildRating() {
     for (const rank of this.ranks) {
       rank.buildRank();
-      for (const u of this.users) {
-        u.oldRating = u.rating;
-      }
+      const ratingCalculator = new RatingCalculator();
       for (const t of rank.teams) {
         const id = this.generateTeamId(t);
+        let u = null;
         if (!this.userMap.has(id)) {
-          const u = new RatingUser();
+          u = new RatingUser();
           u.id = id;
           u.name = t.name;
+          u.organization = t.organization;
+          u.members = createPersons(t.members ?? []);
+          u.coaches = createPersons(t.coach ?? []);
           u.rank = t.rank;
           u.oldRating = this.baseRating;
           u.UpdateRating(this.baseRating);
           this.userMap.set(id, u);
           this.users.push(u);
+          ratingCalculator.users.push(u);
+        } else {
+          u = this.userMap.get(id);
+          u.rank = t.rank;
+          u.oldRating = u.rating;
+          ratingCalculator.users.push(u);
+        }
+        {
+          const h = new RatingHistory();
+          h.rank = t.rank;
+          h.rating = u.rating;
+          h.teamName = t.name;
+          h.organization = t.organization;
+          h.members = createPersons(t.members ?? []);
+          h.coaches = createPersons(t.coach ?? []);
+          h.contestID = rank.contest.id;
+          h.contestLink = h.contestID;
+          h.contestName = rank.contest.name;
+          h.contestTime = rank.contest.startTime;
+          u.ratingHistories.push(h);
         }
       }
-      const ratingCalculator = new RatingCalculator();
-      ratingCalculator.users = this.users;
       ratingCalculator.calculate();
-      for (const u of this.users) {
-        const h = new RatingHistory();
-        h.rank = u.rank;
-        h.rating = u.rating;
-        h.contestID = rank.contest.id;
-        h.contestLink = h.contestID;
-        h.contestName = rank.contest.name;
-        h.contestTime = rank.contest.startTime;
-        u.ratingHistories.push(h);
+      for (const u of ratingCalculator.users) {
+        u.ratingHistories.at(-1).rating = u.rating;
       }
     }
   }
   generateTeamId(t) {
-    if (Array.isArray(t.members) && t.members.length > 0) {
-      return t.members.join("|");
+    const persons = createPersons(t.members ?? []);
+    if (persons.length > 0) {
+      return persons.map((person) => person.name).join("|");
     }
     return `${t.organization}-${t.name}`;
   }
@@ -2217,4 +2282,4 @@ class Resolver extends Rank {
   }
 }
 
-export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, ICPCStandingsCsvConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingUser, Resolver, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, ICPCStandingsCsvConverter, MedalType, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingUser, Resolver, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcpcio/core",
-  "version": "0.46.0",
+  "version": "0.46.1",
   "description": "XCPCIO Core",
   "author": "Dup4 <lyuzhi.pan@gmail.com>",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "papaparse": "^5.4.1",
     "string-width": "^6.1.0",
     "xlsx-js-style": "^1.2.0",
-    "@xcpcio/types": "0.46.0"
+    "@xcpcio/types": "0.46.1"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/index.ts

@@ -9,6 +9,7 @@ export * from "./battle-of-giants";
 export * from "./contest-index";
 export * from "./contest";
 export * from "./image";
+export * from "./person";
 export * from "./problem";
 export * from "./rank-statistics";
 export * from "./rank";

package/src/person.ts

@@ -0,0 +1,42 @@
+import type { IPerson } from "@xcpcio/types";
+
+export class Person {
+  name: string;
+
+  constructor(name = "") {
+    this.name = name;
+  }
+
+  toJSON(): IPerson {
+    return {
+      name: this.name,
+    };
+  }
+
+  static fromJSON(iPerson: IPerson | string): Person {
+    if (typeof iPerson === "string") {
+      iPerson = JSON.parse(iPerson) as IPerson;
+    }
+
+    const person = new Person();
+    person.name = iPerson.name;
+
+    return person;
+  }
+}
+
+export type Persons = Array<Person>;
+
+export function createPersons(iPersons: string | Array<string>): Persons {
+  if (typeof iPersons === "string") {
+    for (const c of " ,、|") {
+      if (iPersons.includes(c)) {
+        return iPersons.split(c).map(name => new Person(name));
+      }
+    }
+
+    return [new Person(iPersons)];
+  }
+
+  return iPersons.map(name => new Person(name));
+}

package/src/rating/rating-history.ts

@@ -2,11 +2,19 @@ import type { IRatingHistory } from "@xcpcio/types";
 
 import type { dayjs } from "../utils";
 import { createDayJS } from "../utils";
+import { Person } from "../person";
+import type { Persons } from "../person";
 
 export class RatingHistory {
   rank: number;
   rating: number;
 
+  teamName: string;
+  organization: string;
+
+  members: Persons;
+  coaches: Persons;
+
   contestID: string;
   contestName: string;
   contestLink: string;
@@ -16,6 +24,12 @@ export class RatingHistory {
     this.rank = 0;
     this.rating = 0;
 
+    this.teamName = "";
+    this.organization = "";
+
+    this.members = [];
+    this.coaches = [];
+
     this.contestID = "";
     this.contestName = "";
     this.contestLink = "";
@@ -27,6 +41,12 @@ export class RatingHistory {
       rank: this.rank,
       rating: this.rating,
 
+      teamName: this.teamName,
+      organization: this.organization,
+
+      members: this.members.map(member => member.toJSON()),
+      coaches: this.coaches.map(coach => coach.toJSON()),
+
       contestID: this.contestID,
       contestName: this.contestName,
       contestLink: this.contestLink,
@@ -43,6 +63,12 @@ export class RatingHistory {
     ratingHistory.rank = iRatingHistory.rank;
     ratingHistory.rating = iRatingHistory.rating;
 
+    ratingHistory.teamName = iRatingHistory.teamName;
+    ratingHistory.organization = iRatingHistory.organization;
+
+    ratingHistory.members = iRatingHistory.members.map(iMember => Person.fromJSON(iMember));
+    ratingHistory.coaches = iRatingHistory.coaches.map(iCoach => Person.fromJSON(iCoach));
+
     ratingHistory.contestID = iRatingHistory.contestID;
     ratingHistory.contestName = iRatingHistory.contestName;
     ratingHistory.contestLink = iRatingHistory.contestLink;

package/src/rating/rating-user.ts

@@ -1,9 +1,16 @@
-import type { IRatingUser } from "@xcpcio/types/index";
+import type { IRatingUser } from "@xcpcio/types";
+
+import type { Persons } from "../person";
+import { Person } from "../person";
 import { type RatingHistories, RatingHistory } from "./rating-history";
 
 export class RatingUser {
   id: string;
   name: string;
+  organization: string;
+
+  members: Persons;
+  coaches: Persons;
 
   rating: number;
   minRating: number;
@@ -20,6 +27,10 @@ export class RatingUser {
   constructor() {
     this.id = "";
     this.name = "";
+    this.organization = "";
+
+    this.members = [];
+    this.coaches = [];
 
     this.rating = 0;
     this.minRating = 0x3F3F3F3F;
@@ -44,6 +55,10 @@ export class RatingUser {
     return {
       id: this.id,
       name: this.name,
+      organization: this.organization,
+
+      members: this.members.map(member => member.toJSON()),
+      coaches: this.coaches.map(coach => coach.toJSON()),
 
       rating: this.rating,
       minRating: this.minRating,
@@ -62,6 +77,10 @@ export class RatingUser {
 
     ratingUser.id = iRatingUser.id;
     ratingUser.name = iRatingUser.name;
+    ratingUser.organization = iRatingUser.organization;
+
+    ratingUser.members = iRatingUser.members.map(member => Person.fromJSON(member));
+    ratingUser.coaches = iRatingUser.coaches.map(coach => Person.fromJSON(coach));
 
     ratingUser.rating = iRatingUser.rating;
     ratingUser.minRating = iRatingUser.minRating;

package/src/rating/rating.ts

@@ -1,6 +1,8 @@
-import type { IRating } from "@xcpcio/types/index";
+import type { IRating } from "@xcpcio/types";
+
 import type { Ranks } from "../rank";
 import type { Team } from "../team";
+import { createPersons } from "../person";
 
 import { RatingCalculator } from "./rating-calculator";
 import { RatingHistory } from "./rating-history";
@@ -34,48 +36,69 @@ export class Rating {
     for (const rank of this.ranks) {
       rank.buildRank();
 
-      for (const u of this.users) {
-        u.oldRating = u.rating;
-      }
+      const ratingCalculator = new RatingCalculator();
 
       for (const t of rank.teams) {
         const id = this.generateTeamId(t);
 
+        let u = null;
+
         if (!this.userMap.has(id)) {
-          const u = new RatingUser();
+          u = new RatingUser();
           u.id = id;
           u.name = t.name;
+          u.organization = t.organization;
+
+          u.members = createPersons(t.members ?? []);
+          u.coaches = createPersons(t.coach ?? []);
+
           u.rank = t.rank;
           u.oldRating = this.baseRating;
           u.UpdateRating(this.baseRating);
 
           this.userMap.set(id, u);
           this.users.push(u);
+
+          ratingCalculator.users.push(u);
+        } else {
+          u = this.userMap.get(id)!;
+          u.rank = t.rank;
+          u.oldRating = u.rating;
+          ratingCalculator.users.push(u);
         }
-      }
 
-      const ratingCalculator = new RatingCalculator();
-      ratingCalculator.users = this.users;
-      ratingCalculator.calculate();
+        {
+          const h = new RatingHistory();
+          h.rank = t.rank;
+          h.rating = u.rating;
+
+          h.teamName = t.name;
+          h.organization = t.organization;
+
+          h.members = createPersons(t.members ?? []);
+          h.coaches = createPersons(t.coach ?? []);
 
-      for (const u of this.users) {
-        const h = new RatingHistory();
-        h.rank = u.rank;
-        h.rating = u.rating;
+          h.contestID = rank.contest.id;
+          h.contestLink = h.contestID;
+          h.contestName = rank.contest.name;
+          h.contestTime = rank.contest.startTime;
 
-        h.contestID = rank.contest.id;
-        h.contestLink = h.contestID;
-        h.contestName = rank.contest.name;
-        h.contestTime = rank.contest.startTime;
+          u.ratingHistories.push(h);
+        }
+      }
+
+      ratingCalculator.calculate();
 
-        u.ratingHistories.push(h);
+      for (const u of ratingCalculator.users) {
+        u.ratingHistories.at(-1)!.rating = u.rating;
       }
     }
   }
 
   generateTeamId(t: Team) {
-    if (Array.isArray(t.members) && t.members.length > 0) {
-      return t.members.join("|");
+    const persons = createPersons(t.members ?? []);
+    if (persons.length > 0) {
+      return persons.map(person => person.name).join("|");
     }
 
     return `${t.organization}-${t.name}`;