emallson/scorecard - Change GGREOYIRZE2GH62X7YXQA7IUSSB25ENLQ5OKVJYWPNI462DP37FAC

if you know a url, its honestly pretty functional

Created by emallson on February 18, 2021

GGREOYIRZE2GH62X7YXQA7IUSSB25ENLQ5OKVJYWPNI462DP37FAC

Dependencies

In channels

test

production

main

Change contents

Insertion in server/src/queries/guild.rs at line 13 [3.4504]

[3.4806]


#[derive(GraphQLQuery)]
#[graphql(
    schema_path = "schema.json",
    query_path = "queries/guild_by_id.graphql",
    response_derives = "Debug"
)]
pub struct GuildById;

Insertion in server/src/queries/guild.rs at line 37 [3.4504]

[3.5206]

        .send()
        .await?
        .json()
        .await
        .map_err(anyhow::Error::from)
}
pub async fn lookup_guild_by_id(
    client: &Client,
    token: &WclToken,
    id: i64,
) -> Result<Response<guild_by_id::ResponseData>> {
    client
        .post(WCL_ENDPOINT)
        .bearer_auth(&token.access_token)
        .json(&GuildById::build_query(guild_by_id::Variables { id }))

Insertion in server/src/import.rs at line 6 [3.9354]
[4.1635]
[3.9540]
```
use diesel::pg::upsert::excluded;
```

Replacement in server/src/import.rs at line 11 [3.9354]

B:BD[3.9765] → [3.9765:9825]

    guild: guild::guild_by_name::GuildByNameGuildDataGuild,

[3.9765]

[3.9825]

    guild: guild::guild_by_id::GuildByIdGuildDataGuild,

Insertion in server/src/import.rs at line 13 [3.9354]

[3.9843]

    use crate::schema::teams::dsl;
    let value = NewTeam {
        id: guild.id as i32,
        tag: false,
        name: guild.name.clone(),
        server_slug: guild.server.slug.clone(),
        region_slug: guild.server.region.slug.clone(),
        tag_name: None,
    };

Replacement in server/src/import.rs at line 24 [3.9354]

B:BD[3.9881] → [3.9881:10187]

        .values(&NewTeam {
            id: guild.id as i32,
            tag: false,
            name: guild.name.clone(),
            server_slug: guild.server.slug.clone(),
            region_slug: guild.server.region.slug.clone(),
            tag_name: None,
        })
        .on_conflict_do_nothing()

[3.9881]

[3.10187]

        .values(&value)
        .on_conflict((dsl::id, dsl::tag))
        .do_update()
        .set((
            dsl::name.eq(excluded(dsl::name)),
            dsl::server_slug.eq(excluded(dsl::server_slug)),
            dsl::region_slug.eq(excluded(dsl::region_slug)),
        ))

Replacement in server/src/import.rs at line 52 [3.9354]

B:BD[3.10848] → [3.10848:10882]

        .on_conflict_do_nothing()

[3.10848]

[3.10882]

        .on_conflict((dsl::id, dsl::tag))
        .do_update()
        .set((
            dsl::name.eq(excluded(dsl::name)),
            dsl::server_slug.eq(excluded(dsl::server_slug)),
            dsl::region_slug.eq(excluded(dsl::region_slug)),
            dsl::tag_name.eq(excluded(dsl::tag_name)),
        ))

Replacement in server/src/graphql.rs at line 188 [3.13630]

B:BD[3.15926] → [3.15926:16017]

    guild: String,
    server_slug: String,
    region_slug: String,
    tag: Option<i64>,

[3.15926]

[3.16017]

    guild_id: i64,
    tag_id: Option<i64>,

Replacement in server/src/graphql.rs at line 195 [3.13630]

B:BD[3.16128] → [3.16128:16270]

    debug!("importing log info for {}", guild);
    let guild = guild::lookup_guild(&client, &token, guild, server_slug, region_slug).await?;

[3.16128]

[3.16270]

    let guild = guild::lookup_guild_by_id(&client, &token, guild_id).await?;

Replacement in server/src/graphql.rs at line 208 [3.13630]

B:BD[3.16665] → [3.16665:16747]

    let guild_id = tag.map_or(GuildId::Guild(guild.id), |tid| GuildId::Tag(tid));

[3.16665]

[3.16747]

    let guild_id = tag_id.map_or(GuildId::Guild(guild.id), |tid| GuildId::Tag(tid));

Replacement in server/src/graphql.rs at line 305 [3.13630]

B:BD[3.19399] → [3.19399:19480]

        guild: String,
        server_slug: String,
        region_slug: String,

[3.19399]

[3.19480]

        guild_id: i64,

Replacement in server/src/graphql.rs at line 319 [3.13630]

B:BD[3.19770] → [3.19770:20158]

            background_import(
                client.clone(),
                token.clone(),
                con,
                tx,
                guild,
                server_slug,
                region_slug,
                tag,
                zone,
            )
            .inspect_err(|e| {
                error!("an error occurred during import: {:?}", e);
            }),

[3.19770]

[3.20158]

            background_import(client.clone(), token.clone(), con, tx, guild_id, tag, zone)
                .inspect_err(|e| {
                    error!("an error occurred during import: {:?}", e);
                }),

File addition: guild_by_id.graphql (-rw-r--r--)

[5.303667]

query GuildById($id: Int!) {
  guildData {
    guild(id: $id) {
      id,
      name,
      server { name, region { slug }, slug },
      tags {
        id, name
      }
    }
  }
}

Insertion in client/yarn.lock at line 10385 [6.12]

[6.455472]

slugify@^1.4.6:
  version "1.4.6"
  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.4.6.tgz#ef288d920a47fb01c2be56b3487b6722f5e34ace"
  integrity sha512-ZdJIgv9gdrYwhXqxsH9pv7nXxjUEyQ6nqhngRxoAAOlmMGA28FDq5O4/5US4G2/Nod7d1ovNcgURQJ7kHq50KQ==

File deletion: SyncTest.tsx

BF:BFD[6.529116] → [6.2757720:2757734]

BF:BFD[6.2757734] → [6.2757735:2757735]

B:BD[6.2757763] → [6.2757763:2758894]

import { useParams } from 'react-router-dom';
import { gql, useSubscription } from '@apollo/client';
import { read_id, Params } from './Details';
const SYNC_SUB = gql`
  subscription SyncGuild($guild: String!, $server: String!, $region: String!, $zone: Int!, $tag: Int) {
    sync(guild: $guild, serverSlug: $server, regionSlug: $region, zone: $zone, tag: $tag) {
      kind, totalLogs, remainingLogs
    }
  }
`;
export default function SyncTest() {
  const { region, server, guild, tag, zone } = useParams<Params>();
  const { loading, data, error } = useSubscription(SYNC_SUB, {
    variables: { region, server, guild, tag: read_id(tag), zone: read_id(zone) }
  });
  console.log(loading, data, error);
  if (data !== undefined) {
    return (
      <div>
        <div className="h-3 relative max-w-xl rounded-full overflow-hidden">
          <div className="w-full h-full bg-gray-200 absolute"></div>
          <div className="h-full bg-blue-500 absolute" style={{ width: `${(1 - data.sync.remainingLogs / data.sync.totalLogs) * 100}%` }}></div>
        </div>
      </div>
    );
  } else {
    return <div></div>;
  }
}

Replacement in client/src/model.ts at line 2 [5.308562]
B:BD[5.308617] → [5.308617:308647]
```
  26: new Date('2020-12-08'),
```
[5.308617]
[5.308647]
```
  26: new Date(2020, 11, 8),
```

Replacement in client/src/model.ts at line 52 [5.308562]

B:BD[5.309795] → [5.309795:309913]

  const days = Math.floor((diff / 1000 / 60 / 60 / 24 + regionOffset(region)) / 7);
  return days + (mythic ? 0 : 1);

[5.309795]

[5.309913]

  const weeks = Math.floor((diff / 1000 / 60 / 60 / 24 + regionOffset(region)) / 7);
  return weeks + (mythic ? 0 : 1);

File addition: Sync.tsx (-rw-r--r--)

[6.529116]

import { useEffect } from 'react';
import { gql, useSubscription } from '@apollo/client';
const SYNC_SUB = gql`
  subscription SyncGuild($id: Int!, $tag: Int, $zone: Int!) {
    sync(guildId: $id, tag: $tag, zone: $zone) {
      kind, totalLogs, remainingLogs
    }
  }
`;
export default function Sync({ syncCallback, id, tag, zone }: { id: number; syncCallback: () => void; tag?: number; zone: number; }) {
  const { data } = useSubscription(SYNC_SUB, {
    variables: { id, tag, zone }
  });
  useEffect(() => {
    if (data && data.sync.kind === 'COMPLETE') {
      syncCallback();
    }
  }, [data, syncCallback]);
  if (data !== undefined) {
    return (
      <div className="m-auto mt-10 max-w-xl">
        <div className="h-3 relative max-w-xl rounded-full overflow-hidden">
          <div className="w-full h-full bg-gray-200 absolute"></div>
          <div className="h-full bg-blue-500 absolute" style={{ width: `${(1 - data.sync.remainingLogs / data.sync.totalLogs) * 100}%` }}></div>
        </div>
      </div>
    );
  } else {
    return <div></div>;
  }
}

Replacement in client/src/EncounterOverview.tsx at line 3 [5.310127]
B:BD[5.310226] → [5.310226:310277]
```
import { Region, differentResets } from './model';
```
[5.310226]
[5.310277]
```
import { Region, differentResets, tierWeek } from './model';
```
Replacement in client/src/EncounterOverview.tsx at line 8 [5.310127]
B:BD[5.310455] → [7.20:57]
```
      iid, startTime, endTime, code,
```
[5.310455]
[5.310483]
```
      iid, startTime, endTime, code, zone: zoneId,
```

Replacement in client/src/EncounterOverview.tsx at line 64 [5.310127]

B:BD[5.311688] → [5.311688:311715]

B:BD[5.311715] → [7.58:74]

∅:D[7.74] → [5.311731:311748]

B:BD[5.311731] → [5.311731:311748]

    background: '#fffff8',
    width: 300,
    height: 250,

[5.311688]

[5.311748]

    config: {
      view: {
        stroke: "transparent"
      },
    },
    background: '#00000000',
    width: 250,
    height: 200,

Insertion in client/src/EncounterOverview.tsx at line 136 [5.310127]
[5.313001]
[5.313001]
```
  zone: number;
```
Replacement in client/src/EncounterOverview.tsx at line 189 [5.310127]
B:BD[7.778] → [7.778:816]
```
    fights: a.fights.concat(b.fights)
```
[7.778]
[7.816]
```
    fights: a.fights.concat(b.fights),
    zone: a.zone,
```

Replacement in client/src/EncounterOverview.tsx at line 238 [5.310127]

B:BD[5.314033] → [5.314033:314047]

B:BD[5.314047] → [7.2261:2324]

    <section>
      <legend className="font-bold">Week {props.week}</legend>

[5.314033]

[5.314088]

    <section className="border border-gray-100 m-1 p-1">
      <legend className="font-bold ml-1">Week {props.week}</legend>

Replacement in client/src/EncounterOverview.tsx at line 243 [5.310127]

B:BD[5.314235] → [2.44:177]

            <div><a href={`https://www.warcraftlogs.com/reports/${code}/`}>{formatDate(startTime)} ({fights.length} Pulls)</a></div>

[5.314235]

[5.314394]

            <div className="ml-1 border-b border-gray-200 w-min whitespace-nowrap"><a href={`https://www.warcraftlogs.com/reports/${code}/`}>{formatDate(startTime)}</a></div>

Replacement in client/src/EncounterOverview.tsx at line 256 [5.310127]

B:BD[5.314558] → [7.2547:2604]

export function EncounterStats(props: { logs: Log[] }) {

[5.314558]

[7.2604]

export function EncounterStats(props: { logs: Log[]; region: Region; difficulty: number; }) {

Insertion in client/src/EncounterOverview.tsx at line 258 [5.310127]

[7.2683]

  const [minIlvl, maxIlvl] = props.logs.reduce((acc, log) => {
    return log.fights.reduce(([min, max], fight) => ([Math.min(min, fight.avgIlvl), Math.max(max, fight.avgIlvl)]), acc);
  }, [1000, 0]);

Insertion in client/src/EncounterOverview.tsx at line 266 [5.310127]

[7.2869]

        <dt>Week of Tier:</dt>
        {killLog ? <dd>Week {tierWeek(killLog.zone, killLog.startTime, props.difficulty === 5, props.region)}</dd> : <dd><em>In Progress</em></dd>}

Insertion in client/src/EncounterOverview.tsx at line 278 [5.310127]

[7.3263]

        <dt>Average Item Level:</dt>
        <dd>
          {(maxIlvl - minIlvl < 0.5) ? maxIlvl.toFixed(1) : <>{minIlvl.toFixed(1)} &mdash; {maxIlvl.toFixed(1)}</>} 
        </dd>

Replacement in client/src/EncounterOverview.tsx at line 307 [5.310127]

B:BD[7.3519] → [7.3519:3558]

        <EncounterStats logs={logs} />

[7.3519]

[7.3558]

        <EncounterStats logs={logs} region={props.region} difficulty={props.difficulty} />

Replacement in client/src/Details.tsx at line 1 [6.2758909]

B:BD[6.2758937] → [6.2758937:2758983]

import { useParams } from 'react-router-dom';

[6.2758909]

[6.2758983]

import { useState } from 'react';
import { Redirect, useParams, useLocation } from 'react-router-dom';

Insertion in client/src/Details.tsx at line 4 [6.2758909]
[6.2759031]
[4.30765]
```
import  slugify  from 'slugify';
```
Insertion in client/src/Details.tsx at line 7 [6.2758909]
[4.30871]
[6.2759031]
```
import Sync from './Sync';
```

Replacement in client/src/Details.tsx at line 10 [6.2758909]

B:BD[8.885] → [2.178:265]

∅:D[2.265] → [8.919:939]

B:BD[8.919] → [8.919:939]

  query DetailsMeta($server: String!, $region: String!, $guild: String!, $tag: Int!) {
    tag(id: $tag) {

[8.885]

[2.266]

  query DetailsMeta($guildId: Int!, $teamId: Int!) {
    team: tag(id: $teamId) {

Replacement in client/src/Details.tsx at line 14 [6.2758909]

B:BD[2.302] → [2.302:391]

    guild(serverSlug: $server, regionSlug: $region, guild: $guild) {
      iid, id, name

[2.302]

[6.2759340]

    guild: tag(id: $guildId) {
      iid, id, name, serverSlug, regionSlug

Insertion in client/src/Details.tsx at line 34 [6.2758909]

[6.2759631]

[6.2759742]

}
function url_for(data: any, tier: string): string {
  return `/details/${data.guild.regionSlug.toLowerCase()}/${data.guild.serverSlug}/${data.guild.id}-${slugify(data.guild.name)}/${data.team ? `${data.team.id}-${slugify(data.team.tagName)}` : 'all'}/${tier}`;

Replacement in client/src/Details.tsx at line 41 [6.2758909]

B:BD[6.2760434] → [6.2760434:2760502]

  const { region, server, guild, tag, zone } = useParams<Params>();

[6.2760434]

[6.2760502]

  const params = useParams<Params>();
  const location = useLocation();
  const { region, server, guild, tag, zone } = params;
  const [syncComplete, setSyncComplete] = useState(false);

Insertion in client/src/Details.tsx at line 48 [6.2758909]
[6.2760563]
[6.2760563]
```
  const guildid = read_id(guild);
```

Replacement in client/src/Details.tsx at line 51 [6.2758909]

B:BD[8.1017] → [2.392:450]

    variables: { tag: tagid || 0, region, server, guild }

[8.1017]

[6.2760687]

    variables: { teamId: tagid || 0, guildId: guildid || 0 }

Insertion in client/src/Details.tsx at line 53 [6.2758909]

[6.2760693]


  if (error) {
    return <div>An error occurred while fetching data: {error.message}</div>;
  }

Replacement in client/src/Details.tsx at line 62 [6.2758909]

B:BD[6.2760750] → [6.2760750:2760843]

  if (error) {
    return <div>An error occurred while fetching data: {error.message}</div>;

[6.2760750]

[6.2760843]

  if(!guildid || (!tagid && tag !== 'all') || !tier) {
    return <Redirect to='/' />;
  }
  if(data.guild) {
    const url = url_for(data, zone);
    if (location.pathname !== url) {
      return <Redirect to={url} />;
    }

Replacement in client/src/Details.tsx at line 76 [6.2758909]

B:BD[2.452] → [2.452:491]

  const team = data.tag || data.guild;

[2.452]

[6.2761188]

  const team = data.team || data.guild;
  let content;
  if(!syncComplete) {
    content = <Sync syncCallback={() => setSyncComplete(true)} id={guildid} tag={tagid} zone={tier} />;
  } else {
    content = (encounters && team.id) ? encounters.map(encounter => <EncounterOverview key={encounter} encounterId={encounter} difficulty={5} team={team.id} region={toRegion(region)}/>) : <div>No tier selected.</div>
  }

Replacement in client/src/Details.tsx at line 90 [6.2758909]

B:BD[6.2761491] → [4.31086:31087]

B:BD[4.31087] → [2.603:814]


      {(encounters && team.id) ? encounters.map(encounter => <EncounterOverview key={encounter} encounterId={encounter} difficulty={5} team={team.id} region={toRegion(region)}/>) : <div>No tier selected.</div>}

[6.2761491]

[6.2761968]

      {content}

Deletion in client/src/App.tsx at line 6 [6.2761997]
B:BD[6.2762159] → [6.2762159:2762194]
```
import SyncTest from './SyncTest';
```

Deletion in client/src/App.tsx at line 33 [6.2761997]

B:BD[6.2762782] → [6.2762782:2762879]

      </Route>
      <Route path="/sync/:region/:server/:guild/:tag/:zone">
        <SyncTest />

Insertion in client/package.json at line 20 [6.2785144]
[4.31323]
[6.2785662]
```
    "slugify": "^1.4.6",
```