Details

Reviewers

dfaure
kfunk
mlaurent

Commits

R865:d31ae8ea3c8d: Add user ID of other user for direct channel rooms

Diff Detail

Repository

R865 Ruqola

Branch

master

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 26172
Build 26190: arc lint + arc unit

alessandro requested review of this revision.Apr 29 2020, 5:25 PM

alessandro created this revision.

Harbormaster completed remote builds in B26098: Diff 81535.Apr 29 2020, 5:25 PM

Commit message update

Harbormaster completed remote builds in B26103: Diff 81541.Apr 29 2020, 6:58 PM

Commit message update (again)

Harbormaster completed remote builds in B26104: Diff 81542.Apr 29 2020, 6:59 PM

hi,
Please update autotest too
Regards

This revision now requires changes to proceed.Apr 29 2020, 7:27 PM

You missed to update "bool Room::isEqual(const Room &other) const" too
Same for QDebug operator <<(QDebug d, const Room &t)
Room *Room::fromJSon(const QJsonObject &o) needs to be update too and QByteArray Room::serialize(Room *r, bool toBinary) too

RoomWrapper too for using this new attribute.

Regards

Forward directChannelUserId to RoomWrapper and test
Fix autotest helper on Windows
Update roomtest to test Room::directChannelUserId

Harbormaster completed remote builds in B26124: Diff 81571.Apr 30 2020, 9:26 AM

Still missing
"
You missed to update "bool Room::isEqual(const Room &other) const" too
Same for QDebug operator <<(QDebug d, const Room &t)
Room *Room::fromJSon(const QJsonObject &o) needs to be update too and QByteArray Room::serialize(Room *r, bool toBinary) too
"

Fix Room::serialize, operator<<(QDebug, Room), Room::isEqual

Harbormaster completed remote builds in B26131: Diff 81581.Apr 30 2020, 1:27 PM

mlaurent requested changes to this revision.Apr 30 2020, 2:34 PM

mlaurent added inline comments.

src/core/room.cpp
1053	Still missing loading it from Room::fromJSon(const QJsonObject &o)

This revision now requires changes to proceed.Apr 30 2020, 2:34 PM

Fix Room::serialize, operator<<(QDebug, Room), Room::isEqual, Room::fromJson

Harbormaster completed remote builds in B26140: Diff 81595.Apr 30 2020, 3:10 PM

alessandro marked an inline comment as done.Apr 30 2020, 3:14 PM

125 - roommodeltest (Failed)
154 - roomfilterproxymodeltest (Failed)

This revision now requires changes to proceed.Apr 30 2020, 6:29 PM

Fix more tests

Harbormaster completed remote builds in B26163: Diff 81630.Apr 30 2020, 8:10 PM

Thanks :)

This revision is now accepted and ready to land.May 1 2020, 7:15 AM

Fix merge conflicts

Harbormaster completed remote builds in B26171: Diff 81649.May 1 2020, 9:11 AM

Minor fixes: add missing newlines at end of files

Harbormaster completed remote builds in B26172: Diff 81650.May 1 2020, 9:14 AM

mlaurent accepted this revision.May 1 2020, 10:51 AM

alessandro closed this revision.May 1 2020, 11:08 AM

		Path
A	M	src/core/autotests/data/room-updated/direct-room-update.json (16 lines)
A	M	src/core/autotests/data/room-updated/direct-room.json (28 lines)
A	M	src/core/autotests/data/room-updated/direct-room.ref (36 lines)
A	M	src/core/autotests/data/room/direct-room.json (28 lines)
A	M	src/core/autotests/data/room/direct-room.ref (35 lines)
M		src/core/autotests/roomfilterproxymodeltest.cpp (1 line)
M		src/core/autotests/roommodeltest.cpp (1 line)
M		src/core/autotests/roomtest.cpp (12 lines)
M		src/core/autotests/roomwrappertest.cpp (34 lines)
M		src/core/autotests/ruqola_autotest_helper.h (23 lines)
M		src/core/model/roommodel.h (1 line)
M		src/core/model/roommodel.cpp (3 lines)
M		src/core/rocketchatbackend.cpp (4 lines)
M		src/core/room.h (7 lines)
M		src/core/room.cpp (29 lines)
M		src/core/roomwrapper.h (4 lines)
M		src/core/roomwrapper.cpp (6 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	81535	58c44da		Apr 29 2020, 5:25 PM	★	★
Diff 2	81541	58c44da	Commit message update	Apr 29 2020, 6:58 PM	★	★
Diff 3	81542	58c44da	Commit message update (again)	Apr 29 2020, 6:59 PM	★	★
Diff 4	81571	58c44da	- Forward directChannelUserId to RoomWrapper and test	Apr 30 2020, 9:26 AM	★	★
Diff 5	81581	58c44da	- Fix Room::serialize, operator<<(QDebug, Room), Room::isEqual	Apr 30 2020, 1:27 PM	★	★
Diff 6	81595	58c44da	- Fix Room::serialize, operator<<(QDebug, Room), Room::isEqual, Room::fromJson	Apr 30 2020, 3:10 PM	★	★
Diff 7	81630	58c44da	- Fix more tests	Apr 30 2020, 8:10 PM	★	★
Diff 8	81649	0b91db5	- Forward directChannelUserId to RoomWrapper and test	May 1 2020, 9:11 AM	★	★
Diff 9	81650	0b91db5	- Minor fixes: add missing newlines at end of files	May 1 2020, 9:14 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
8acb51ddbf1a	8cea2286b07f	709969444fbb	Alessandro Ambrosano	Minor fixes: add missing newlines at end of files	May 1 2020, 9:14 AM
709969444fbb	13643a66fda5	21479d9e29f5	Alessandro Ambrosano	Fix more tests	Apr 30 2020, 8:08 PM
21479d9e29f5	9352247a6e9e	d17a1a0cc619	Alessandro Ambrosano	Fix Room::serialize, operator<<(QDebug, Room), Room::isEqual, Room::fromJson	Apr 30 2020, 1:25 PM
d17a1a0cc619	fe2fce1f29ca	214a372df3ec	Alessandro Ambrosano	Update roomtest to test Room::directChannelUserId	Apr 30 2020, 9:25 AM
214a372df3ec	e40a05ec8f39	d0cf6899e92c	Alessandro Ambrosano	Fix autotest helper on Windows	Apr 30 2020, 9:06 AM
d0cf6899e92c	27a51c8474dd	2c703dcd1f4e	Alessandro Ambrosano	Forward directChannelUserId to RoomWrapper and test	Apr 30 2020, 9:04 AM
2c703dcd1f4e	4739111612e7	0b91db540ba9	Alessandro Ambrosano	Add user ID of other user for direct channel rooms (Show More…)	Apr 29 2020, 5:24 PM

Add user ID of other user for direct channel rooms
ClosedPublic
Actions

Details

Diff Detail

Revision Contents
Changeset List

Diff 81650

src/core/autotests/data/room-updated/direct-room-update.json

src/core/autotests/data/room-updated/direct-room.json

src/core/autotests/data/room-updated/direct-room.ref

src/core/autotests/data/room/direct-room.json

src/core/autotests/data/room/direct-room.ref

src/core/autotests/roomfilterproxymodeltest.cpp

src/core/autotests/roommodeltest.cpp

src/core/autotests/roomtest.cpp

src/core/autotests/roomwrappertest.cpp

src/core/autotests/ruqola_autotest_helper.h

src/core/model/roommodel.h

src/core/model/roommodel.cpp

src/core/rocketchatbackend.cpp

src/core/room.h

src/core/room.cpp

src/core/roomwrapper.h

src/core/roomwrapper.cpp

Add user ID of other user for direct channel roomsClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 81650

src/core/autotests/data/room-updated/direct-room-update.json

src/core/autotests/data/room-updated/direct-room.json

src/core/autotests/data/room-updated/direct-room.ref

src/core/autotests/data/room/direct-room.json

src/core/autotests/data/room/direct-room.ref

src/core/autotests/roomfilterproxymodeltest.cpp

src/core/autotests/roommodeltest.cpp

src/core/autotests/roomtest.cpp

src/core/autotests/roomwrappertest.cpp

src/core/autotests/ruqola_autotest_helper.h

src/core/model/roommodel.h

src/core/model/roommodel.cpp

src/core/rocketchatbackend.cpp

src/core/room.h

src/core/room.cpp

src/core/roomwrapper.h

src/core/roomwrapper.cpp

Add user ID of other user for direct channel rooms
ClosedPublic
Actions

Revision Contents
Changeset List