Skip to content

Commit 7ab45df

Browse files
author
DarthButcher
committed
Bring in line with WDR schema
1 parent a29157e commit 7ab45df

File tree

13 files changed

+1167
-1310
lines changed

13 files changed

+1167
-1310
lines changed

‎src/data/default.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ data.style = config.style == 'dark' ? 'dark' : '';
88
data.copyright_footer = config.showFooter;
99
data.servers = config.discord.guilds;
1010
data.genders = [
11-
{ 'id': '*', 'name': 'All' },
12-
{ 'id': 'm', 'name': 'Male' },
13-
{ 'id': 'f', 'name': 'Female', }
11+
{ 'id': '0', 'name': 'All' },
12+
{ 'id': '1', 'name': 'Male' },
13+
{ 'id': '2', 'name': 'Female', }
1414
];
1515
data.leagues = [
1616
{ 'id': 'great', 'name': 'Great' },

‎src/data/subscriptions.js

+41-63
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,9 @@ const locale = require('../services/locale.js');
77

88
// TODO: Move to model classes
99

10-
const getUserSubscriptionId = async (guildId, userId) => {
11-
const sql = `
12-
SELECT id
13-
FROM subscriptions
14-
WHERE guild_id = ? AND user_id = ?
15-
`;
16-
const args = [guildId, userId];
17-
const results = await db.query(sql, args);
18-
if (results && results.length > 0) {
19-
return results[0].id;
20-
}
21-
return createUserSubscription(guildId, userId);
22-
};
23-
2410
const createUserSubscription = async (guildId, userId) => {
2511
const sql = `
26-
INSERT IGNORE INTO subscriptions (guild_id, user_id, enabled, distance, latitude, longitude, icon_style)
12+
INSERT IGNORE INTO wdr_subscriptions (guild_id, user_id, status)
2713
VALUES (?, ?, 1, 0, 0, 0, 'Default')
2814
`;
2915
const args = [guildId, userId];
@@ -39,36 +25,36 @@ const getUserSubscriptionStats = async (guildId, userId) => {
3925
const sql = `
4026
SELECT
4127
(
42-
SELECT COUNT(id)
43-
FROM pokemon
44-
WHERE guild_id = ? AND user_id = ?
28+
SELECT COUNT(*)
29+
FROM wdr_subscriptions
30+
WHERE guild_id = ? AND user_id = ? AND sub_type='pokemon'
4531
) AS pokemon,
4632
(
47-
SELECT COUNT(id)
48-
FROM pvp
49-
WHERE guild_id = ? AND user_id = ?
33+
SELECT COUNT(*)
34+
FROM wdr_subscriptions
35+
WHERE guild_id = ? AND user_id = ? AND sub_type='pvp'
5036
) AS pvp,
5137
(
52-
SELECT COUNT(id)
53-
FROM raids
54-
WHERE guild_id = ? AND user_id = ?
38+
SELECT COUNT(*)
39+
FROM wdr_subscriptions
40+
WHERE guild_id = ? AND user_id = ? AND sub_type='raid'
5541
) AS raids,
5642
(
57-
SELECT COUNT(id)
58-
FROM gyms
59-
WHERE guild_id = ? AND user_id = ?
43+
SELECT COUNT(*)
44+
FROM wdr_subscriptions
45+
WHERE guild_id = ? AND user_id = ? AND sub_type='raid'
6046
) AS gyms,
6147
(
62-
SELECT COUNT(id)
63-
FROM quests
64-
WHERE guild_id = ? AND user_id = ?
48+
SELECT COUNT(*)
49+
FROM wdr_subscriptions
50+
WHERE guild_id = ? AND user_id = ? AND sub_type='quest'
6551
) AS quests,
6652
(
67-
SELECT COUNT(id)
68-
FROM invasions
69-
WHERE guild_id = ? AND user_id = ?
53+
SELECT COUNT(*)
54+
FROM wdr_subscriptions
55+
WHERE guild_id = ? AND user_id = ? AND sub_type='invasion'
7056
) AS invasions
71-
FROM subscriptions
57+
FROM wdr_subscriptions
7258
LIMIT 1;
7359
`;
7460
const args = [
@@ -88,17 +74,16 @@ const getUserSubscriptionStats = async (guildId, userId) => {
8874

8975
const getPokemonSubscriptions = async (guildId, userId) => {
9076
const sql = `
91-
SELECT id, guild_id, user_id, pokemon_id, form, min_cp, min_iv, iv_list, min_lvl, max_lvl, gender, city
92-
FROM pokemon
93-
WHERE guild_id = ? AND user_id = ?
77+
SELECT guild_id, user_id, pokemon_id, form, areas, location, min_cp, min_iv, max_iv, min_lvl, max_lvl, gender, geotype
78+
FROM wdr_subscriptions
79+
WHERE guild_id = ? AND user_id = ? AND sub_type='pokemon'
9480
`;
9581
const args = [guildId, userId];
9682
const results = await db.query(sql, args);
9783
if (results) {
9884
results.forEach(result => {
99-
result.name = locale.getPokemonName(result.pokemon_id);
85+
result.name = locale.getPokemonName(result.pokemon_id) || 'All';
10086
result.cp = `${result.min_cp}-4096`;
101-
result.iv = result.min_iv;
10287
result.iv_list = JSON.parse(result.iv_list || '[]');
10388
result.lvl = `${result.min_lvl}-${result.max_lvl}`;
10489
//result.city = result.city;
@@ -109,9 +94,9 @@ const getPokemonSubscriptions = async (guildId, userId) => {
10994

11095
const getPvpSubscriptions = async (guildId, userId) => {
11196
const sql = `
112-
SELECT id, guild_id, user_id, pokemon_id, form, league, min_rank, min_percent, city
113-
FROM pvp
114-
WHERE guild_id = ? AND user_id = ?
97+
SELECT guild_id, user_id, pokemon_id, form, league, min_rank, geotype
98+
FROM wdr_subscriptions
99+
WHERE guild_id = ? AND user_id = ? AND sub_type='pvp'
115100
`;
116101
const args = [guildId, userId];
117102
const results = await db.query(sql, args);
@@ -128,8 +113,8 @@ const getPvpSubscriptions = async (guildId, userId) => {
128113
const getRaidSubscriptions = async (guildId, userId) => {
129114
const sql = `
130115
SELECT id, guild_id, user_id, pokemon_id, form, city
131-
FROM raids
132-
WHERE guild_id = ? AND user_id = ?
116+
FROM wdr_subscriptions
117+
WHERE guild_id = ? AND user_id = ? AND sub_type='raid'
133118
`;
134119
const args = [guildId, userId];
135120
const results = await db.query(sql, args);
@@ -144,8 +129,8 @@ const getRaidSubscriptions = async (guildId, userId) => {
144129
const getGymSubscriptions = async (guildId, userId) => {
145130
const sql = `
146131
SELECT id, guild_id, user_id, name
147-
FROM gyms
148-
WHERE guild_id = ? AND user_id = ?
132+
FROM wdr_subscriptions
133+
WHERE guild_id = ? AND user_id = ? AND sub_type='gym'
149134
`;
150135
const args = [guildId, userId];
151136
const results = await db.query(sql, args);
@@ -155,8 +140,8 @@ const getGymSubscriptions = async (guildId, userId) => {
155140
const getQuestSubscriptions = async (guildId, userId) => {
156141
const sql = `
157142
SELECT id, guild_id, user_id, reward, city
158-
FROM quests
159-
WHERE guild_id = ? AND user_id = ?
143+
FROM wdr_subscriptions
144+
WHERE guild_id = ? AND user_id = ? AND sub_type='quest'
160145
`;
161146
const args = [guildId, userId];
162147
const results = await db.query(sql, args);
@@ -166,8 +151,8 @@ const getQuestSubscriptions = async (guildId, userId) => {
166151
const getInvasionSubscriptions = async (guildId, userId) => {
167152
const sql = `
168153
SELECT id, guild_id, user_id, reward_pokemon_id, city
169-
FROM invasions
170-
WHERE guild_id = ? AND user_id = ?
154+
FROM wdr_subscriptions
155+
WHERE guild_id = ? AND user_id = ? AND sub_type='invasion'
171156
`;
172157
const args = [guildId, userId];
173158
const results = await db.query(sql, args);
@@ -181,8 +166,8 @@ const getInvasionSubscriptions = async (guildId, userId) => {
181166

182167
const getSubscriptionSettings = async (guildId, userId) => {
183168
const sql = `
184-
SELECT enabled, distance, latitude, longitude, icon_style
185-
FROM subscriptions
169+
SELECT status
170+
FROM wdr_subscriptions
186171
WHERE guild_id = ? AND user_id = ?
187172
`;
188173
const args = [guildId, userId];
@@ -193,27 +178,20 @@ const getSubscriptionSettings = async (guildId, userId) => {
193178
return results;
194179
};
195180

196-
const setSubscriptionSettings = async (guildId, userId, enabled, distance, latitude, longitude, icon_style) => {
181+
const setSubscriptionSettings = async (guildId, userId, status) => {
197182
const sql = `
198-
UPDATE subscriptions
199-
SET enabled = ?, distance = ?, latitude = ?, longitude = ?, icon_style = ?
183+
UPDATE wdr_subscriptions
184+
SET status = ?
200185
WHERE guild_id = ? AND user_id = ?
201186
`;
202187
const args = [
203-
enabled,
204-
distance,
205-
latitude,
206-
longitude,
207-
icon_style,
208-
guildId,
209-
userId
188+
status
210189
];
211190
const results = await db.query(sql, args);
212191
return results.affectedRows > 0;
213192
};
214193

215194
module.exports = {
216-
getUserSubscriptionId,
217195
createUserSubscription,
218196
getUserSubscriptionStats,
219197
getPokemonSubscriptions,

‎src/models/gym.js

+12-17
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,18 @@ const MySQLConnector = require('../services/mysql.js');
55
const db = new MySQLConnector(config.db.brock);
66

77
class Gym {
8-
constructor(subscriptionId, guildId, userId, name) {
9-
this.subscriptionId = subscriptionId;
8+
constructor(guildId, userId, name) {
109
this.guildId = guildId;
1110
this.userId = userId;
1211
this.name = name;
1312
}
1413

1514
async create() {
1615
const sql = `
17-
INSERT INTO gyms (subscription_id, guild_id, user_id, name)
16+
INSERT INTO gyms (guild_id, user_id, name)
1817
VALUES (?, ?, ?, ?)
1918
`;
2019
const args = [
21-
this.subscriptionId,
2220
this.guildId, this.userId,
2321
this.name
2422
];
@@ -28,8 +26,8 @@ class Gym {
2826

2927
static async getAll(guildId, userId) {
3028
const sql = `
31-
SELECT subscription_id, guild_id, user_id, name
32-
FROM gyms
29+
SELECT guild_id, user_id, name
30+
FROM wdr_subscriptions
3331
WHERE guild_id = ? AND user_id = ?
3432
`;
3533
const args = [guildId, userId];
@@ -38,7 +36,6 @@ class Gym {
3836
const list = [];
3937
results.forEach(result => {
4038
list.push(new Gym(
41-
result.subscription_id,
4239
result.guild_id,
4340
result.user_id,
4441
result.name
@@ -51,16 +48,15 @@ class Gym {
5148

5249
static async getByName(guildId, userId, name) {
5350
const sql = `
54-
SELECT subscription_id, guild_id, user_id, name
55-
FROM gyms
51+
SELECT guild_id, user_id, name
52+
FROM wdr_subscriptions
5653
WHERE guild_id = ? AND user_id = ? AND name = ?
5754
`;
5855
const args = [guildId, userId, name];
5956
const results = await db.query(sql, args);
6057
if (results && results.length > 0) {
6158
const result = results[0];
62-
return new Gym(
63-
result.subscription_id,
59+
return new Gym(
6460
result.guild_id,
6561
result.user_id,
6662
result.name
@@ -71,16 +67,15 @@ class Gym {
7167

7268
static async getById(id) {
7369
const sql = `
74-
SELECT subscription_id, guild_id, user_id, name
75-
FROM gyms
70+
SELECT guild_id, user_id, name
71+
FROM wdr_subscriptions
7672
WHERE id = ?
7773
`;
7874
const args = [id];
7975
const results = await db.query(sql, args);
8076
if (results && results.length > 0) {
8177
const result = results[0];
8278
return new Gym(
83-
result.subscription_id,
8479
result.guild_id,
8580
result.user_id,
8681
result.name
@@ -91,7 +86,7 @@ class Gym {
9186

9287
static async delete(guildId, userId, name) {
9388
const sql = `
94-
DELETE FROM gyms
89+
DELETE FROM wdr_subscriptions
9590
WHERE guild_id = ? AND user_id = ? AND name = ?
9691
`;
9792
const args = [guildId, userId, name];
@@ -101,7 +96,7 @@ class Gym {
10196

10297
static async deleteById(id) {
10398
const sql = `
104-
DELETE FROM gyms
99+
DELETE FROM wdr_subscriptions
105100
WHERE id = ?
106101
`;
107102
const args = [id];
@@ -111,7 +106,7 @@ class Gym {
111106

112107
static async deleteAll(guildId, userId) {
113108
const sql = `
114-
DELETE FROM gyms
109+
DELETE FROM wdr_subscriptions
115110
WHERE guild_id = ? AND user_id = ?
116111
`;
117112
const args = [guildId, userId];

0 commit comments

Comments
 (0)