Rearranged field definition

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 1817145714cba9f40fd1101721e87969f91d548b..3002f6ac4c299082554d93e7ebe5d5663e34b204 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -1204,6 +1204,29 @@ return [
                        "changed" => ["changed"]
                ]
        ],
+       "post-user" => [
+               "comment" => "User specific post data",
+               "fields" => [
+                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
+                       "uri-id" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
+                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
+                       "protocol" => ["type" => "tinyint unsigned", "comment" => "Protocol used to deliver the item for this user"],
+                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id"],
+                       "unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "post has not been seen"],
+                       "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide the post from the user"],
+                       "notification-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
+                       "origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"],
+                       "psid" => ["type" => "int unsigned", "foreign" => ["permissionset" => "id", "on delete" => "restrict"], "comment" => "ID of the permission set of this post"],
+               ],
+               "indexes" => [
+                       "PRIMARY" => ["id"],
+                       "uid_uri-id" => ["UNIQUE", "uid", "uri-id"],
+                       "uri-id" => ["uri-id"],
+                       "contact-id" => ["contact-id"],
+                       "psid" => ["psid"],
+                       "uid_hidden" => ["uid", "hidden"],
+               ],
+       ],
        "post-thread-user" => [
                "comment" => "Thread related data per user",
                "fields" => [
@@ -1233,29 +1256,6 @@ return [
                        "post-user-id" => ["post-user-id"],
                ]
        ],
-       "post-user" => [
-               "comment" => "User specific post data",
-               "fields" => [
-                       "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"],
-                       "uri-id" => ["type" => "int unsigned", "not null" => "1", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the item uri"],
-                       "uid" => ["type" => "mediumint unsigned", "not null" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner id which owns this copy of the item"],
-                       "protocol" => ["type" => "tinyint unsigned", "comment" => "Protocol used to deliver the item for this user"],
-                       "contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id"],
-                       "unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "post has not been seen"],
-                       "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide the post from the user"],
-                       "notification-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-                       "origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "item originated at this site"],
-                       "psid" => ["type" => "int unsigned", "foreign" => ["permissionset" => "id", "on delete" => "restrict"], "comment" => "ID of the permission set of this post"],
-               ],
-               "indexes" => [
-                       "PRIMARY" => ["id"],
-                       "uid_uri-id" => ["UNIQUE", "uid", "uri-id"],
-                       "uri-id" => ["uri-id"],
-                       "contact-id" => ["contact-id"],
-                       "psid" => ["psid"],
-                       "uid_hidden" => ["uid", "hidden"],
-               ],
-       ],
        "post-user-notification" => [
                "comment" => "User post notifications",
                "fields" => [

diff --git a/tests/datasets/api.fixture.php b/tests/datasets/api.fixture.php
index 7a7e2194fd28bc4759ed94f680fdce65faaa09e3..175f2667acdefd64c80f825916ba16890bae95ed 100644 (file)
--- a/tests/datasets/api.fixture.php
+++ b/tests/datasets/api.fixture.php
@@ -237,38 +237,6 @@ return [
                        'network'    => Protocol::DFRN,
                ],
        ],
-       'post-thread-user'  => [
-               [
-                       'uri-id'     => 1,
-                       'uid'        => 42,
-                       'wall'       => 1,
-               ],
-               [
-                       'uri-id'     => 3,
-                       'uid'        => 42,
-                       'wall'       => 1,
-               ],
-               [
-                       'uri-id'     => 6,
-                       'uid'        => 42,
-                       'wall'       => 1,
-               ],
-               [
-                       'uri-id'     => 1,
-                       'uid'        => 0,
-                       'wall'       => 0,
-               ],
-               [
-                       'uri-id'     => 3,
-                       'uid'        => 0,
-                       'wall'       => 0,
-               ],
-               [
-                       'uri-id'     => 6,
-                       'uid'        => 0,
-                       'wall'       => 0,
-               ],
-       ],
        'post-user' => [
                [
                        'id'          => 1,
@@ -366,7 +334,44 @@ return [
                        'unseen'      => 0,
                        'origin'      => 0,
                ],
-
+       ],
+       'post-thread-user'  => [
+               [
+                       'uri-id'     => 1,
+                       'uid'        => 42,
+                       'wall'       => 1,
+                       'post-user-id' => 1,
+               ],
+               [
+                       'uri-id'     => 3,
+                       'uid'        => 42,
+                       'wall'       => 1,
+                       'post-user-id' => 3,
+               ],
+               [
+                       'uri-id'     => 6,
+                       'uid'        => 42,
+                       'wall'       => 1,
+                       'post-user-id' => 6,
+               ],
+               [
+                       'uri-id'     => 1,
+                       'uid'        => 0,
+                       'wall'       => 0,
+                       'post-user-id' => 7,
+               ],
+               [
+                       'uri-id'     => 3,
+                       'uid'        => 0,
+                       'wall'       => 0,
+                       'post-user-id' => 9,
+               ],
+               [
+                       'uri-id'     => 6,
+                       'uid'        => 0,
+                       'wall'       => 0,
+                       'post-user-id' => 12,
+               ],
        ],
        'item'    => [
                [