Skip to content

Add original object to LiveQuery Events #5265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions spec/ParseLiveQueryServer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,56 @@ describe('ParseLiveQueryServer', function() {
}, jasmine.ASYNC_TEST_WAIT_TIME);
});

it('can handle update command with original object', function(done) {
jasmine.restoreLibrary('../lib/LiveQuery/Client', 'Client');
const Client = require('../lib/LiveQuery/Client').Client;
const parseLiveQueryServer = new ParseLiveQueryServer({});
// Make mock request message
const message = generateMockMessage(true);

const clientId = 1;
const parseWebSocket = {
clientId,
send: jasmine.createSpy('send'),
};
const client = new Client(clientId, parseWebSocket);
spyOn(client, 'pushUpdate').and.callThrough();
parseLiveQueryServer.clients.set(clientId, client);

// Add mock subscription
const requestId = 2;

addMockSubscription(
parseLiveQueryServer,
clientId,
requestId,
parseWebSocket
);
// Mock _matchesSubscription to return matching
parseLiveQueryServer._matchesSubscription = function(parseObject) {
if (!parseObject) {
return false;
}
return true;
};
parseLiveQueryServer._matchesACL = function() {
return Promise.resolve(true);
};

parseLiveQueryServer._onAfterSave(message);

// Make sure we send update command to client
setTimeout(function() {
expect(client.pushUpdate).toHaveBeenCalled();
const args = parseWebSocket.send.calls.mostRecent().args;
const toSend = JSON.parse(args[0]);

expect(toSend.object).toBeDefined();
expect(toSend.original).toBeDefined();
done();
}, jasmine.ASYNC_TEST_WAIT_TIME);
});

it('can handle object create command which matches some subscriptions', function(done) {
const parseLiveQueryServer = new ParseLiveQueryServer({});
// Make mock request message
Expand Down
12 changes: 11 additions & 1 deletion src/LiveQuery/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ class Client {
}

_pushEvent(type: string): Function {
return function(subscriptionId: number, parseObjectJSON: any): void {
return function(
subscriptionId: number,
parseObjectJSON: any,
parseOriginalObjectJSON: any
): void {
const response: Message = {
op: type,
clientId: this.id,
Expand All @@ -92,6 +96,12 @@ class Client {
fields = this.subscriptionInfos.get(subscriptionId).fields;
}
response['object'] = this._toJSONWithFields(parseObjectJSON, fields);
if (typeof parseOriginalObjectJSON !== 'undefined') {
response['original'] = this._toJSONWithFields(
parseOriginalObjectJSON,
fields
);
}
}
Client.pushResponse(this.parseWebSocket, JSON.stringify(response));
};
Expand Down
6 changes: 5 additions & 1 deletion src/LiveQuery/ParseLiveQueryServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,11 @@ class ParseLiveQueryServer {
return null;
}
const functionName = 'push' + type;
client[functionName](requestId, currentParseObject);
client[functionName](
requestId,
currentParseObject,
originalParseObject
);
},
error => {
logger.error('Matching ACL error : ', error);
Expand Down