Skip to content

Commit 17dcf11

Browse files
kristijan-ujevickristijan-ujevic
committed
Use LootLockerResponse.Serialize when serializing responses in all Request classes
1 parent c19d4a6 commit 17dcf11

18 files changed

+283
-1360
lines changed

‎Runtime/Game/Requests/AssetInstanceRequest.cs

Lines changed: 17 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public class LootLockerStorage
3737

3838
public class LootLockerAssetDefaultResponse : LootLockerResponse
3939
{
40-
4140
public LootLockerStorage[] storage { get; set; }
4241
}
4342

@@ -56,7 +55,6 @@ public class LootLockerUpdateOneOrMoreKeyValuePairRequest
5655

5756
public class LootLockerInspectALootBoxResponse : LootLockerResponse
5857
{
59-
6058
public LootLockerContent[] contents { get; set; }
6159
}
6260

@@ -70,10 +68,8 @@ public class LootLockerContent
7068

7169
public class LootLockerOpenLootBoxResponse : LootLockerResponse
7270
{
73-
7471
public bool check_grant_notifications { get; set; }
7572
}
76-
7773
}
7874

7975
namespace LootLocker
@@ -85,20 +81,7 @@ public static void GetAllKeyValuePairs(Action<LootLockerGetAllKeyValuePairsRespo
8581
EndPointClass endPoint = LootLockerEndPoints.getAllKeyValuePairs;
8682
string getVariable = endPoint.endPoint;
8783

88-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) =>
89-
{
90-
LootLockerGetAllKeyValuePairsResponse response = new LootLockerGetAllKeyValuePairsResponse();
91-
if (string.IsNullOrEmpty(serverResponse.Error))
92-
response = JsonConvert.DeserializeObject<LootLockerGetAllKeyValuePairsResponse>(serverResponse.text);
93-
94-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
95-
response.text = serverResponse.text;
96-
response.success = serverResponse.success;
97-
response.statusCode = serverResponse.statusCode;
98-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
99-
onComplete?.Invoke(response);
100-
101-
}, true);
84+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
10285
}
10386

10487
public static void GetAllKeyValuePairsToAnInstance(LootLockerGetRequest data, Action<LootLockerAssetDefaultResponse> onComplete)
@@ -107,113 +90,59 @@ public static void GetAllKeyValuePairsToAnInstance(LootLockerGetRequest data, Ac
10790

10891
string getVariable = string.Format(endPoint.endPoint, data.getRequests[0]);
10992

110-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) =>
111-
{
112-
LootLockerAssetDefaultResponse response = new LootLockerAssetDefaultResponse();
113-
if (string.IsNullOrEmpty(serverResponse.Error))
114-
response = JsonConvert.DeserializeObject<LootLockerAssetDefaultResponse>(serverResponse.text);
115-
116-
//LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
117-
response.text = serverResponse.text;
118-
response.success = serverResponse.success;
119-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
120-
onComplete?.Invoke(response);
121-
}, true);
93+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
12294
}
12395

12496
public static void GetAKeyValuePairById(LootLockerGetRequest data, Action<LootLockerGetSingleKeyValuePairsResponse> onComplete)
12597
{
126-
EndPointClass endPoint = LootLockerEndPoints.getAKeyValuePairById;
12798
string json = "";
12899
if (data == null) return;
129100
else json = JsonConvert.SerializeObject(data);
130101

102+
EndPointClass endPoint = LootLockerEndPoints.getAKeyValuePairById;
103+
131104
string getVariable = string.Format(endPoint.endPoint, data.getRequests[0], data.getRequests[1]);
132105

133-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) =>
134-
{
135-
LootLockerGetSingleKeyValuePairsResponse response = new LootLockerGetSingleKeyValuePairsResponse();
136-
if (string.IsNullOrEmpty(serverResponse.Error))
137-
response = JsonConvert.DeserializeObject<LootLockerGetSingleKeyValuePairsResponse>(serverResponse.text);
138-
139-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
140-
response.text = serverResponse.text;
141-
response.success = serverResponse.success;
142-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
143-
onComplete?.Invoke(response);
144-
}, true);
106+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
145107
}
146108

147109
public static void CreateKeyValuePair(LootLockerGetRequest lootLockerGetRequest, LootLockerCreateKeyValuePairRequest data, Action<LootLockerAssetDefaultResponse> onComplete)
148110
{
149-
EndPointClass endPoint = LootLockerEndPoints.createKeyValuePair;
150111
string json = "";
151112
if (data == null) return;
152113
else json = JsonConvert.SerializeObject(data);
153114

115+
EndPointClass endPoint = LootLockerEndPoints.createKeyValuePair;
116+
154117
string getVariable = string.Format(endPoint.endPoint, lootLockerGetRequest.getRequests[0]);
155118

156-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) =>
157-
{
158-
LootLockerAssetDefaultResponse response = new LootLockerAssetDefaultResponse();
159-
if (string.IsNullOrEmpty(serverResponse.Error))
160-
{
161-
if (string.IsNullOrEmpty(serverResponse.Error))
162-
response = JsonConvert.DeserializeObject<LootLockerAssetDefaultResponse>(serverResponse.text);
163-
164-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
165-
response.text = serverResponse.text;
166-
response.success = serverResponse.success;
167-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
168-
onComplete?.Invoke(response);
169-
}
170-
}, true);
119+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
171120
}
172121

173122
public static void UpdateOneOrMoreKeyValuePair(LootLockerGetRequest lootLockerGetRequest, LootLockerUpdateOneOrMoreKeyValuePairRequest data, Action<LootLockerAssetDefaultResponse> onComplete)
174123
{
175-
EndPointClass endPoint = LootLockerEndPoints.updateOneOrMoreKeyValuePair;
176124
string json = "";
177125
if (data == null) return;
178126
else json = JsonConvert.SerializeObject(data);
179127

128+
EndPointClass endPoint = LootLockerEndPoints.updateOneOrMoreKeyValuePair;
129+
180130
string getVariable = string.Format(endPoint.endPoint, lootLockerGetRequest.getRequests[0]);
181131

182-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) =>
183-
{
184-
LootLockerAssetDefaultResponse response = new LootLockerAssetDefaultResponse();
185-
if (string.IsNullOrEmpty(serverResponse.Error))
186-
response = JsonConvert.DeserializeObject<LootLockerAssetDefaultResponse>(serverResponse.text);
187-
188-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
189-
response.text = serverResponse.text;
190-
response.success = serverResponse.success;
191-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
192-
onComplete?.Invoke(response);
193-
}, true);
132+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
194133
}
195134

196135
public static void UpdateKeyValuePairById(LootLockerGetRequest lootLockerGetRequest, LootLockerCreateKeyValuePairRequest data, Action<LootLockerAssetDefaultResponse> onComplete)
197136
{
198-
EndPointClass endPoint = LootLockerEndPoints.updateKeyValuePairById;
199137
string json = "";
200138
if (data == null) return;
201139
else json = JsonConvert.SerializeObject(data);
202140

141+
EndPointClass endPoint = LootLockerEndPoints.updateKeyValuePairById;
142+
203143
string getVariable = string.Format(endPoint.endPoint, lootLockerGetRequest.getRequests[0], lootLockerGetRequest.getRequests[1]);
204144

205-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) =>
206-
{
207-
LootLockerAssetDefaultResponse response = new LootLockerAssetDefaultResponse();
208-
if (string.IsNullOrEmpty(serverResponse.Error))
209-
response = JsonConvert.DeserializeObject<LootLockerAssetDefaultResponse>(serverResponse.text);
210-
211-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
212-
response.text = serverResponse.text;
213-
response.success = serverResponse.success;
214-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
215-
onComplete?.Invoke(response);
216-
}, true);
145+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
217146
}
218147

219148
public static void DeleteKeyValuePair(LootLockerGetRequest data, Action<LootLockerAssetDefaultResponse> onComplete)
@@ -222,18 +151,7 @@ public static void DeleteKeyValuePair(LootLockerGetRequest data, Action<LootLock
222151

223152
string getVariable = string.Format(endPoint.endPoint, data.getRequests[0], data.getRequests[1]);
224153

225-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) =>
226-
{
227-
LootLockerAssetDefaultResponse response = new LootLockerAssetDefaultResponse();
228-
if (string.IsNullOrEmpty(serverResponse.Error))
229-
response = JsonConvert.DeserializeObject<LootLockerAssetDefaultResponse>(serverResponse.text);
230-
231-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
232-
response.text = serverResponse.text;
233-
response.success = serverResponse.success;
234-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
235-
onComplete?.Invoke(response);
236-
}, true);
154+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
237155
}
238156

239157
public static void InspectALootBox(LootLockerGetRequest data, Action<LootLockerInspectALootBoxResponse> onComplete)
@@ -242,18 +160,7 @@ public static void InspectALootBox(LootLockerGetRequest data, Action<LootLockerI
242160

243161
string getVariable = string.Format(endPoint.endPoint, data.getRequests[0]);
244162

245-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) =>
246-
{
247-
LootLockerInspectALootBoxResponse response = new LootLockerInspectALootBoxResponse();
248-
if (string.IsNullOrEmpty(serverResponse.Error))
249-
response = JsonConvert.DeserializeObject<LootLockerInspectALootBoxResponse>(serverResponse.text);
250-
251-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
252-
response.text = serverResponse.text;
253-
response.success = serverResponse.success;
254-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
255-
onComplete?.Invoke(response);
256-
}, true);
163+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
257164
}
258165

259166
public static void OpenALootBox(LootLockerGetRequest data, Action<LootLockerOpenLootBoxResponse> onComplete)
@@ -262,18 +169,7 @@ public static void OpenALootBox(LootLockerGetRequest data, Action<LootLockerOpen
262169

263170
string getVariable = string.Format(endPoint.endPoint, data.getRequests[0]);
264171

265-
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) =>
266-
{
267-
LootLockerOpenLootBoxResponse response = new LootLockerOpenLootBoxResponse();
268-
if (string.IsNullOrEmpty(serverResponse.Error))
269-
response = JsonConvert.DeserializeObject<LootLockerOpenLootBoxResponse>(serverResponse.text);
270-
271-
// LootLockerSDKManager.DebugMessage(serverResponse.text, !string.IsNullOrEmpty(serverResponse.Error));
272-
response.text = serverResponse.text;
273-
response.success = serverResponse.success;
274-
response.Error = serverResponse.Error; response.statusCode = serverResponse.statusCode;
275-
onComplete?.Invoke(response);
276-
}, true);
172+
LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, null, onComplete: (serverResponse) => { LootLockerResponse.Serialize(onComplete, serverResponse); });
277173
}
278174
}
279175
}

0 commit comments

Comments
 (0)