Skip to content

Commit 3e75e28

Browse files
TimWheeler-SQUPTimWheeler-SQUP
committed
Clean-up of names and values
1 parent 11af232 commit 3e75e28

7 files changed

Lines changed: 64 additions & 55 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ logs/
7979
.env
8080
.env.*
8181
*.local.json
82+
CLAUDE.local.md
8283

8384

8485
############################################

‎plugins/FantasyPremierLeague/v2/cspell.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"FPL",
44
"Gameweek",
55
"bboost",
6-
"freehit"
6+
"freehit",
7+
"favourite"
78
]
89
}

‎plugins/FantasyPremierLeague/v2/dataStreams/classicLeagues.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "classicLeagues",
33
"displayName": "Classic Leagues",
4+
"hidden": true,
45
"baseDataSourceName": "httpRequestUnscoped",
56
"config": {
67
"httpMethod": "get",

‎plugins/FantasyPremierLeague/v2/dataStreams/leagueSummary.json‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"config": {
55
"httpMethod": "get",
66
"expandInnerObjects": true,
7-
"endpointPath": "leagues-classic/{{leagueID}}/standings/",
7+
"endpointPath": "leagues-classic/{{objects[0].leagueId}}/standings/",
88
"pathToData": "standings.results",
99
"getArgs": [],
1010
"headers": []
1111
},
12-
"baseDataSourceName": "httpRequestUnscoped",
12+
"baseDataSourceName": "httpRequestScopedSingle",
1313
"manualConfigApply": true,
1414
"rowPath": [],
1515
"metadata": [
@@ -67,6 +67,12 @@
6767
{
6868
"displayName": "Player Name",
6969
"name": "player_name"
70+
},
71+
{
72+
"name": "sourceId",
73+
"displayName": "Object ID",
74+
"shape": "string",
75+
"visible": false
7076
}
7177
],
7278
"defaultShaping": {
@@ -80,25 +86,6 @@
8086
}
8187
},
8288
"displayName": "League Summary",
83-
"matches": "none",
84-
"tags": ["Leagues"],
85-
"ui": [
86-
{
87-
"name": "leagueID",
88-
"label": "Classic League",
89-
"placeholder": "Select a classic league",
90-
"type": "autocomplete",
91-
"allowCustomValues": false,
92-
"isMulti": false,
93-
"validation": {
94-
"required": true,
95-
"message": "You must select a classic league"
96-
},
97-
"data": {
98-
"source": "dataStream",
99-
"dataStreamName": "classicLeagues",
100-
"dataSourceConfig": {}
101-
}
102-
}
103-
]
89+
"matches": { "sourceType": "fpl-classic-league" },
90+
"tags": ["Leagues"]
10491
}

‎plugins/FantasyPremierLeague/v2/dataStreams/managerInformation.json‎

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"expandInnerObjects": true,
66
"endpointPath": "entry/{{dataSource.userID}}",
77
"pathToData": "",
8+
"postRequestScript": "managerInformation.js",
89
"getArgs": [],
910
"headers": []
1011
},
@@ -17,14 +18,8 @@
1718
"displayName": "Manager ID"
1819
},
1920
{
20-
"shape": [
21-
"date",
22-
{
23-
"timeZone": "Etc/UTC"
24-
}
25-
],
26-
"name": "joined_time",
27-
"displayName": "Joined Date"
21+
"name": "name",
22+
"displayName": "Team Name"
2823
},
2924
{
3025
"name": "player_first_name",
@@ -45,17 +40,18 @@
4540
"decimalPlaces": 0
4641
}
4742
],
48-
"name": "years_active"
43+
"name": "favourite_team",
44+
"displayName": "Favourite Team"
4945
},
5046
{
5147
"shape": [
52-
"number",
48+
"date",
5349
{
54-
"decimalPlaces": 0
50+
"timeZone": "Etc/UTC"
5551
}
5652
],
57-
"name": "summary_overall_points",
58-
"displayName": "Overall Points"
53+
"name": "joined_time",
54+
"displayName": "Joined Date"
5955
},
6056
{
6157
"shape": [
@@ -64,8 +60,8 @@
6460
"decimalPlaces": 0
6561
}
6662
],
67-
"name": "summary_overall_rank",
68-
"displayName": "Overall Rank"
63+
"name": "years_active",
64+
"displayName": "Years Playing"
6965
},
7066
{
7167
"shape": [
@@ -74,8 +70,8 @@
7470
"decimalPlaces": 0
7571
}
7672
],
77-
"name": "summary_event_points",
78-
"displayName": "Current Gameweek Points"
73+
"name": "current_event",
74+
"displayName": "Current Gameweek"
7975
},
8076
{
8177
"shape": [
@@ -84,8 +80,8 @@
8480
"decimalPlaces": 0
8581
}
8682
],
87-
"name": "summary_event_rank",
88-
"displayName": "Current Gameweek Rank"
83+
"name": "summary_overall_points",
84+
"displayName": "Overall Points"
8985
},
9086
{
9187
"shape": [
@@ -94,12 +90,18 @@
9490
"decimalPlaces": 0
9591
}
9692
],
97-
"name": "current_event",
98-
"displayName": "Current Gameweek"
93+
"name": "summary_overall_rank",
94+
"displayName": "Overall Rank"
9995
},
10096
{
101-
"name": "leagues.classic.0.name",
102-
"displayName": "Favourite Team"
97+
"shape": [
98+
"number",
99+
{
100+
"decimalPlaces": 0
101+
}
102+
],
103+
"name": "summary_event_points",
104+
"displayName": "GW Points"
103105
},
104106
{
105107
"shape": [
@@ -108,20 +110,33 @@
108110
"decimalPlaces": 0
109111
}
110112
],
111-
"name": "leagues.classic.0.id",
112-
"displayName": "Classic 0 Id"
113+
"name": "summary_event_rank",
114+
"displayName": "GW Rank"
115+
},
116+
{
117+
"shape": "string",
118+
"name": "bank",
119+
"displayName": "Transfer Budget"
113120
},
114121
{
115-
"name": "leagues.classic.0.short_name",
116-
"displayName": "Classic 0 Short Name"
122+
"shape": "string",
123+
"name": "value",
124+
"displayName": "Squad Value"
117125
},
118126
{
119-
"pattern": ".*"
127+
"shape": [
128+
"number",
129+
{
130+
"decimalPlaces": 0
131+
}
132+
],
133+
"name": "total_transfers",
134+
"displayName": "Total Transfers"
120135
}
121136
],
122137
"timeframes": false,
123138
"displayName": "Manager Information",
124139
"baseDataSourceName": "httpRequestUnscoped",
125140
"matches": "none",
126141
"tags": ["Manager"]
127-
}
142+
}

‎plugins/FantasyPremierLeague/v2/dataStreams/scripts/managerInformation.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
result = [Object.assign({}, data, {
2+
bank: typeof data.bank === 'number' ? '£' + (data.bank / 10).toFixed(1) + 'M' : data.bank,
3+
value: typeof data.value === 'number' ? '£' + (data.value / 10).toFixed(1) + 'M' : data.value
4+
})];

‎plugins/FantasyPremierLeague/v2/metadata.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fantasy-premier-league",
33
"displayName": "Fantasy Premier League",
4-
"version": "1.0.3",
4+
"version": "2.0.1",
55
"author": {
66
"name": "@TimWheeler-SQUP",
77
"type": "community"
@@ -24,7 +24,7 @@
2424
"links": [
2525
{
2626
"category": "source",
27-
"url": "https://github.com/squaredup/plugins/tree/main/plugins/FantasyPremierLeague/v1",
27+
"url": "https://github.com/squaredup/plugins/tree/main/plugins/FantasyPremierLeague/v2",
2828
"label": "Repository"
2929
}
3030
]

0 commit comments

Comments
 (0)