Skip to content

Commit d49d539

Browse files
committed
_PushStatus uses proper Parse format (#1580)
* removes mongo style props from _PushStatus * removes log * Update MongoTransform.js Removes _id case
1 parent 6e9529f commit d49d539

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

spec/ParseAPI.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,6 @@ describe('miscellaneous', function() {
13401340
expect(res.key).toBe(1);
13411341
return runIncrement(-1);
13421342
}).then((res) => {
1343-
console.log(res);
13441343
expect(res.key).toBe(0);
13451344
done();
13461345
})

spec/PushController.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ describe('PushController', () => {
293293
expect(results.length).toBe(1);
294294
let result = results[0];
295295
expect(result.createdAt instanceof Date).toBe(true);
296+
expect(result.updatedAt instanceof Date).toBe(true);
296297
expect(result.id.length).toBe(10);
297298
expect(result.get('source')).toEqual('rest');
298299
expect(result.get('query')).toEqual(JSON.stringify({}));

src/Adapters/Storage/Mongo/MongoTransform.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,6 @@ const parseObjectKeyValueToMongoObjectKeyValue = (
214214
let coercedToDate;
215215
switch(restKey) {
216216
case 'objectId': return {key: '_id', value: restValue};
217-
case '_created_at'://TODO: for some reason, _PushStatus is already transformed when it gets here. For now,
218-
// just pass the _created_at through. Later, we should make sure the push status doesn't get transformed inside Parse Server.
219217
case 'createdAt':
220218
transformedValue = transformAtom(restValue, false);
221219
coercedToDate = typeof transformedValue === 'string' ? new Date(transformedValue) : transformedValue
@@ -228,8 +226,6 @@ const parseObjectKeyValueToMongoObjectKeyValue = (
228226
transformedValue = transformAtom(restValue, false);
229227
coercedToDate = typeof transformedValue === 'string' ? new Date(transformedValue) : transformedValue
230228
return {key: 'expiresAt', value: coercedToDate};
231-
case '_id': //TODO: for some reason, _PushStatus is already transformed when it gets here. For now,
232-
// just pass the ID through. Later, we should make sure the push status doesn't get transformed inside Parse Server.
233229
case '_rperm':
234230
case '_wperm':
235231
case '_email_verify_token':

src/pushStatusHandler.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ export default function pushStatusHandler(config) {
2626
let data = body.data || {};
2727
let payloadString = JSON.stringify(data);
2828
let object = {
29-
_id: objectId,
29+
objectId,
30+
createdAt: now,
3031
pushTime: now.toISOString(),
31-
_created_at: now,
3232
query: JSON.stringify(where),
3333
payload: payloadString,
3434
source: options.source,
@@ -38,8 +38,7 @@ export default function pushStatusHandler(config) {
3838
numSent: 0,
3939
pushHash: md5Hash(payloadString),
4040
// lockdown!
41-
_wperm: [],
42-
_rperm: []
41+
ACL: {}
4342
}
4443

4544
return database.create(PUSH_STATUS_COLLECTION, object).then(() => {
@@ -54,12 +53,13 @@ export default function pushStatusHandler(config) {
5453
logger.verbose('sending push to %d installations', installations.length);
5554
return database.update(PUSH_STATUS_COLLECTION,
5655
{status:"pending", objectId: objectId},
57-
{status: "running"});
56+
{status: "running", updatedAt: new Date() });
5857
}
5958

6059
let complete = function(results) {
6160
let update = {
6261
status: 'succeeded',
62+
updatedAt: new Date(),
6363
numSent: 0,
6464
numFailed: 0,
6565
};
@@ -87,16 +87,17 @@ export default function pushStatusHandler(config) {
8787
}, update);
8888
}
8989
logger.verbose('sent push! %d success, %d failures', update.numSent, update.numFailed);
90-
return database.update('_PushStatus', {status:"running", objectId }, update);
90+
return database.update(PUSH_STATUS_COLLECTION, {status:"running", objectId }, update);
9191
}
9292

9393
let fail = function(err) {
9494
let update = {
9595
errorMessage: JSON.stringify(err),
96-
status: 'failed'
96+
status: 'failed',
97+
updatedAt: new Date()
9798
}
9899
logger.error('error while sending push', err);
99-
return database.update('_PushStatus', { objectId }, update);
100+
return database.update(PUSH_STATUS_COLLECTION, { objectId }, update);
100101
}
101102

102103
return Object.freeze({

0 commit comments

Comments
 (0)