Skip to content

Commit 87d10a5

Browse files
skadefroskadefro
committed
add support of opresult
1 parent 68467ef commit 87d10a5

16 files changed

Lines changed: 199 additions & 271 deletions

‎OpenFlow/src/DatabaseConnection.ts‎

Lines changed: 128 additions & 122 deletions
Large diffs are not rendered by default.

‎OpenFlow/src/Messages/AggregateMessage.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ export class AggregateMessage<T extends Base> implements IReplyMessage {
44
public error: string;
55
public jwt: string;
66

7-
public aggregates:object[];
8-
public collectionname:string;
9-
public result:T[];
10-
static assign<T extends Base>(o:any):AggregateMessage<T> {
7+
public aggregates: object[];
8+
public collectionname: string;
9+
public result: T[];
10+
public opresult: any;
11+
static assign<T extends Base>(o: any): AggregateMessage<T> {
1112
if (typeof o === "string" || o instanceof String) {
1213
return Object.assign(new AggregateMessage(), JSON.parse(o.toString()));
1314
}

‎OpenFlow/src/Messages/InsertOneMessage.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export class InsertOneMessage<T extends Base> implements IReplyMessage {
1414
public item: T;
1515
public collectionname: string;
1616
public result: T;
17+
public opresult: any;
1718
static assign<T extends Base>(o: any): InsertOneMessage<T> {
1819
if (typeof o === "string" || o instanceof String) {
1920
return Object.assign(new InsertOneMessage(), JSON.parse(o.toString()));

‎OpenFlow/src/Messages/InsertOrUpdateOneMessage.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export class InsertOrUpdateOneMessage<T extends Base> implements IReplyMessage {
1515
public item: T;
1616
public collectionname: string;
1717
public result: T;
18+
public opresult: any;
1819
static assign<T extends Base>(o: any): InsertOrUpdateOneMessage<T> {
1920
if (typeof o === "string" || o instanceof String) {
2021
return Object.assign(new InsertOrUpdateOneMessage(), JSON.parse(o.toString()));

‎OpenFlow/src/Messages/MapReduceMessage.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ export class MapReduceMessage<T> implements IReplyMessage {
55
public error: string;
66
public jwt: string;
77

8-
public scope:any;
9-
public collectionname:string;
10-
public result:T[];
8+
public scope: any;
9+
public collectionname: string;
10+
public result: T[];
11+
public opresult: any;
1112

1213
constructor(public map: mapFunc, public reduce: reduceFunc, public finalize: finalizeFunc, public query: any, public out: string) {
1314
}
14-
static assign<T>(o:any):MapReduceMessage<T> {
15+
static assign<T>(o: any): MapReduceMessage<T> {
1516
if (typeof o === "string" || o instanceof String) {
1617
return Object.assign(new MapReduceMessage(null, null, null, null, null), JSON.parse(o.toString()));
1718
}

‎OpenFlow/src/Messages/Message.ts‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,10 @@ export class Message {
275275
this.Reply();
276276
var msg: UpdateOneMessage<Base> = UpdateOneMessage.assign(this.data);
277277
try {
278-
var jwt = cli.jwt;
279-
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
280-
var w: number = 0;
281-
var j: boolean = false;
282-
if ((msg.w as any) !== undefined && (msg.w as any) !== null) w = msg.w;
283-
if ((msg.j as any) !== undefined && (msg.j as any) !== null) j = msg.j;
284-
msg.result = await Config.db.UpdateOne(msg.query, msg.item, msg.collectionname, w, j, jwt);
278+
if (msg.jwt === null || msg.jwt === undefined) { msg.jwt = cli.jwt; }
279+
if ((msg.w as any) === undefined || (msg.w as any) === null) msg.w = 0;
280+
if ((msg.j as any) === undefined || (msg.j as any) === null) msg.j = false;
281+
msg = await Config.db.UpdateOne(msg);
285282
} catch (error) {
286283
msg.error = error.toString();
287284
cli._logger.error(error);
@@ -298,15 +295,10 @@ export class Message {
298295
this.Reply();
299296
var msg: UpdateManyMessage<Base> = UpdateManyMessage.assign(this.data);
300297
try {
301-
var jwt = cli.jwt;
302-
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
303-
var w: number = 0;
304-
var j: boolean = false;
305-
if ((msg.w as any) !== undefined && (msg.w as any) !== null) w = msg.w;
306-
if ((msg.j as any) !== undefined && (msg.j as any) !== null) j = msg.j;
307-
// msg.result = await Config.db.UpdateMany(msg.query, msg.item, msg.collectionname, w, j, jwt);
308-
var res = await Config.db.UpdateMany(msg.query, msg.item, msg.collectionname, w, j, jwt);
309-
msg.result = res;
298+
if (msg.jwt === null || msg.jwt === undefined) { msg.jwt = cli.jwt; }
299+
if ((msg.w as any) === undefined || (msg.w as any) === null) msg.w = 0;
300+
if ((msg.j as any) === undefined || (msg.j as any) === null) msg.j = false;
301+
msg = await Config.db.UpdateMany(msg);
310302
} catch (error) {
311303
msg.error = error.toString();
312304
cli._logger.error(error);
@@ -324,14 +316,10 @@ export class Message {
324316
this.Reply();
325317
var msg: InsertOrUpdateOneMessage<Base> = InsertOrUpdateOneMessage.assign(this.data);
326318
try {
327-
var jwt = cli.jwt;
328-
if (msg.jwt != null && msg.jwt != undefined) { jwt = msg.jwt; }
329-
var w: number = 0;
330-
var j: boolean = false;
331-
if ((msg.w as any) !== undefined && (msg.w as any) !== null) w = msg.w;
332-
if ((msg.j as any) !== undefined && (msg.j as any) !== null) j = msg.j;
333-
334-
msg.result = await Config.db.InsertOrUpdateOne(msg.item, msg.collectionname, msg.uniqeness, w, j, jwt);
319+
if (msg.jwt === null || msg.jwt === undefined) { msg.jwt = cli.jwt; }
320+
if ((msg.w as any) === undefined || (msg.w as any) === null) msg.w = 0;
321+
if ((msg.j as any) === undefined || (msg.j as any) === null) msg.j = false;
322+
msg = await Config.db.InsertOrUpdateOne(msg);
335323
} catch (error) {
336324
msg.error = error.toString();
337325
cli._logger.error(error);

‎OpenFlow/src/Messages/UpdateManyMessage.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Base } from "../base";
2+
import { UpdateWriteOpResult } from "mongodb";
23

34
export class UpdateManyMessage<T extends Base> implements IReplyMessage {
45
public error: string;
@@ -15,6 +16,7 @@ export class UpdateManyMessage<T extends Base> implements IReplyMessage {
1516
public item: T;
1617
public collectionname: string;
1718
public result: T[];
19+
public opresult: UpdateWriteOpResult;
1820
static assign<T extends Base>(o: any): UpdateManyMessage<T> {
1921
if (typeof o === "string" || o instanceof String) {
2022
return Object.assign(new UpdateManyMessage(), JSON.parse(o.toString()));

‎OpenFlow/src/Messages/UpdateOneMessage.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Base } from "../base";
2+
import { UpdateWriteOpResult } from "mongodb";
23

34
export class UpdateOneMessage<T extends Base> implements IReplyMessage {
45
public error: string;
@@ -15,6 +16,7 @@ export class UpdateOneMessage<T extends Base> implements IReplyMessage {
1516
public query: any;
1617
public collectionname: string;
1718
public result: T;
19+
public opresult: UpdateWriteOpResult;
1820
static assign<T extends Base>(o: any): UpdateOneMessage<T> {
1921
if (typeof o === "string" || o instanceof String) {
2022
return Object.assign(new UpdateOneMessage(), JSON.parse(o.toString()));

‎OpenFlow/src/Role.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ export class Role extends Base {
5050
return result;
5151
}
5252
public async Save(jwt: string): Promise<void> {
53-
await Config.db.UpdateOne(null, this, "users", 0, false, jwt);
53+
await Config.db._UpdateOne(null, this, "users", 0, false, jwt);
5454
}
5555
}

‎OpenFlow/src/User.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class User extends Base {
4242
var temp: User = await Config.db.InsertOne(this, "users", 0, false, jwt);
4343
this._id = temp._id;
4444
} else {
45-
await Config.db.UpdateOne(null, this, "users", 0, false, jwt);
45+
await Config.db._UpdateOne(null, this, "users", 0, false, jwt);
4646
}
4747
}
4848

0 commit comments

Comments
 (0)