diff --git a/pkg/db/fixtures/buckets.yml b/pkg/db/fixtures/buckets.yml index 64d3b037e..c70e10042 100644 --- a/pkg/db/fixtures/buckets.yml +++ b/pkg/db/fixtures/buckets.yml @@ -1,6 +1,6 @@ - id: 1 title: testbucket1 - list_id: 1 + project_id: 1 created_by_id: 1 limit: 9999999 # This bucket has a limit we will never exceed in the tests to make sure the logic allows for buckets with limits position: 1 @@ -8,7 +8,7 @@ updated: 2020-04-18 21:13:52 - id: 2 title: testbucket2 - list_id: 1 + project_id: 1 created_by_id: 1 limit: 3 position: 2 @@ -16,15 +16,15 @@ updated: 2020-04-18 21:13:52 - id: 3 title: testbucket3 - list_id: 1 + project_id: 1 created_by_id: 1 is_done_bucket: 1 position: 3 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 4 - title: testbucket4 - other list - list_id: 2 + title: testbucket4 - other project + project_id: 2 created_by_id: 1 is_done_bucket: 1 created: 2020-04-18 21:13:52 @@ -32,189 +32,189 @@ # The following are not or only partly owned by user 1 - id: 5 title: testbucket5 - list_id: 20 + project_id: 20 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 6 title: testbucket6 - list_id: 6 + project_id: 6 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 7 title: testbucket7 - list_id: 7 + project_id: 7 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 8 title: testbucket8 - list_id: 8 + project_id: 8 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 9 title: testbucket9 - list_id: 9 + project_id: 9 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 10 title: testbucket10 - list_id: 10 + project_id: 10 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 11 title: testbucket11 - list_id: 11 + project_id: 11 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 12 title: testbucket13 - list_id: 12 + project_id: 12 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 13 title: testbucket13 - list_id: 13 + project_id: 13 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 14 title: testbucket14 - list_id: 14 + project_id: 14 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 15 title: testbucket15 - list_id: 15 + project_id: 15 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 16 title: testbucket16 - list_id: 16 + project_id: 16 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 17 title: testbucket17 - list_id: 17 + project_id: 17 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 18 title: testbucket18 - list_id: 5 + project_id: 5 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 19 title: testbucket19 - list_id: 21 + project_id: 21 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 20 title: testbucket20 - list_id: 22 + project_id: 22 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 21 title: testbucket21 - list_id: 3 + project_id: 3 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 # Duplicate buckets to make deletion of one of them possible - id: 22 title: testbucket22 - list_id: 6 + project_id: 6 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 23 title: testbucket23 - list_id: 7 + project_id: 7 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 24 title: testbucket24 - list_id: 8 + project_id: 8 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 25 title: testbucket25 - list_id: 9 + project_id: 9 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 26 title: testbucket26 - list_id: 10 + project_id: 10 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 27 title: testbucket27 - list_id: 11 + project_id: 11 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 28 title: testbucket28 - list_id: 12 + project_id: 12 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 29 title: testbucket29 - list_id: 13 + project_id: 13 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 30 title: testbucket30 - list_id: 14 + project_id: 14 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 31 title: testbucket31 - list_id: 15 + project_id: 15 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 32 title: testbucket32 - list_id: 16 + project_id: 16 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 33 title: testbucket33 - list_id: 17 + project_id: 17 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 -# This bucket is the last one in its list +# This bucket is the last one in its project - id: 34 title: testbucket34 - list_id: 18 + project_id: 18 created_by_id: 1 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 - id: 35 title: testbucket35 - list_id: 23 + project_id: 23 created_by_id: -2 created: 2020-04-18 21:13:52 updated: 2020-04-18 21:13:52 diff --git a/pkg/db/fixtures/link_shares.yml b/pkg/db/fixtures/link_shares.yml index e0d19984d..90f33ca35 100644 --- a/pkg/db/fixtures/link_shares.yml +++ b/pkg/db/fixtures/link_shares.yml @@ -1,6 +1,6 @@ - id: 1 hash: test - list_id: 1 + project_id: 1 right: 0 sharing_type: 1 shared_by_id: 1 @@ -8,7 +8,7 @@ updated: 2018-12-02 15:13:12 - id: 2 hash: test2 - list_id: 2 + project_id: 2 right: 1 sharing_type: 1 shared_by_id: 1 @@ -16,7 +16,7 @@ updated: 2018-12-02 15:13:12 - id: 3 hash: test3 - list_id: 3 + project_id: 3 right: 2 sharing_type: 1 shared_by_id: 1 @@ -24,7 +24,7 @@ updated: 2018-12-02 15:13:12 - id: 4 hash: testWithPassword - list_id: 1 + project_id: 1 right: 0 password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234 sharing_type: 2 diff --git a/pkg/db/fixtures/projects.yml b/pkg/db/fixtures/projects.yml index a1d5e84ee..7629f6404 100644 --- a/pkg/db/fixtures/projects.yml +++ b/pkg/db/fixtures/projects.yml @@ -168,8 +168,8 @@ position: 17 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# This list is owned by user 7, and several other users have access to it via different methods. -# It is used to test the listUsers method. +# This project is owned by user 7, and several other users have access to it via different methods. +# It is used to test the projectUsers method. - id: 18 title: Test18 @@ -190,7 +190,7 @@ position: 19 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# User 1 does not have access to this list +# User 1 does not have access to this project - id: 20 title: Test20 diff --git a/pkg/db/fixtures/subscriptions.yml b/pkg/db/fixtures/subscriptions.yml index aa4c42f4f..301bfbf5b 100644 --- a/pkg/db/fixtures/subscriptions.yml +++ b/pkg/db/fixtures/subscriptions.yml @@ -9,13 +9,13 @@ user_id: 6 created: 2021-02-01 15:13:12 - id: 3 - entity_type: 2 # List + entity_type: 2 # project entity_id: 12 # belongs to namespace 7 user_id: 6 created: 2021-02-01 15:13:12 - id: 4 entity_type: 3 # Task - entity_id: 22 # belongs to list 13 which belongs to namespace 8 + entity_id: 22 # belongs to project 13 which belongs to namespace 8 user_id: 6 created: 2021-02-01 15:13:12 - id: 5 @@ -24,7 +24,7 @@ user_id: 6 created: 2021-02-01 15:13:12 - id: 6 - entity_type: 2 # List + entity_type: 2 # project entity_id: 13 user_id: 6 created: 2021-02-01 15:13:12 diff --git a/pkg/db/fixtures/tasks.yml b/pkg/db/fixtures/tasks.yml index b6dc09e31..4f287b989 100644 --- a/pkg/db/fixtures/tasks.yml +++ b/pkg/db/fixtures/tasks.yml @@ -3,7 +3,7 @@ description: 'Lorem Ipsum' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 1 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -13,7 +13,7 @@ title: 'task #2 done' done: true created_by_id: 1 - list_id: 1 + project_id: 1 index: 2 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -23,7 +23,7 @@ title: 'task #3 high prio' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 3 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -33,7 +33,7 @@ title: 'task #4 low prio' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 4 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -43,7 +43,7 @@ title: 'task #5 higher due date' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 5 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -53,7 +53,7 @@ title: 'task #6 lower due date' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 6 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -63,7 +63,7 @@ title: 'task #7 with start date' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 7 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -73,7 +73,7 @@ title: 'task #8 with end date' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 8 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -83,7 +83,7 @@ title: 'task #9 with start and end date' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 9 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -94,7 +94,7 @@ title: 'task #10 basic' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 10 bucket_id: 1 created: 2018-12-01 01:12:04 @@ -103,7 +103,7 @@ title: 'task #11 basic' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 11 bucket_id: 1 created: 2018-12-01 01:12:04 @@ -112,25 +112,25 @@ title: 'task #12 basic' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 12 bucket_id: 1 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 - id: 13 - title: 'task #13 basic other list' + title: 'task #13 basic other project' done: false created_by_id: 1 - list_id: 2 + project_id: 2 index: 1 bucket_id: 4 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 - id: 14 - title: 'task #14 basic other list' + title: 'task #14 basic other project' done: false created_by_id: 5 - list_id: 5 + project_id: 5 index: 1 bucket_id: 18 created: 2018-12-01 01:12:04 @@ -139,7 +139,7 @@ title: 'task #15' done: false created_by_id: 6 - list_id: 6 + project_id: 6 index: 1 bucket_id: 6 created: 2018-12-01 01:12:04 @@ -148,7 +148,7 @@ title: 'task #16' done: false created_by_id: 6 - list_id: 7 + project_id: 7 index: 1 bucket_id: 7 created: 2018-12-01 01:12:04 @@ -157,7 +157,7 @@ title: 'task #17' done: false created_by_id: 6 - list_id: 8 + project_id: 8 index: 1 bucket_id: 8 created: 2018-12-01 01:12:04 @@ -166,7 +166,7 @@ title: 'task #18' done: false created_by_id: 6 - list_id: 9 + project_id: 9 index: 1 bucket_id: 9 created: 2018-12-01 01:12:04 @@ -175,7 +175,7 @@ title: 'task #19' done: false created_by_id: 6 - list_id: 10 + project_id: 10 index: 1 bucket_id: 10 created: 2018-12-01 01:12:04 @@ -184,7 +184,7 @@ title: 'task #20' done: false created_by_id: 6 - list_id: 11 + project_id: 11 index: 1 bucket_id: 11 created: 2018-12-01 01:12:04 @@ -193,7 +193,7 @@ title: 'task #21' done: false created_by_id: 6 - list_id: 12 + project_id: 12 index: 1 bucket_id: 12 created: 2018-12-01 01:12:04 @@ -202,7 +202,7 @@ title: 'task #22' done: false created_by_id: 6 - list_id: 13 + project_id: 13 index: 1 bucket_id: 13 created: 2018-12-01 01:12:04 @@ -211,7 +211,7 @@ title: 'task #23' done: false created_by_id: 6 - list_id: 14 + project_id: 14 index: 1 bucket_id: 14 created: 2018-12-01 01:12:04 @@ -220,7 +220,7 @@ title: 'task #24' done: false created_by_id: 6 - list_id: 15 + project_id: 15 index: 1 bucket_id: 15 created: 2018-12-01 01:12:04 @@ -229,7 +229,7 @@ title: 'task #25' done: false created_by_id: 6 - list_id: 16 + project_id: 16 index: 1 bucket_id: 16 created: 2018-12-01 01:12:04 @@ -238,7 +238,7 @@ title: 'task #26' done: false created_by_id: 6 - list_id: 17 + project_id: 17 index: 1 bucket_id: 17 created: 2018-12-01 01:12:04 @@ -247,7 +247,7 @@ title: 'task #27 with reminders' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 12 bucket_id: 1 created: 2018-12-01 01:12:04 @@ -257,7 +257,7 @@ done: false created_by_id: 1 repeat_after: 3600 - list_id: 1 + project_id: 1 index: 13 bucket_id: 1 created: 2018-12-01 01:12:04 @@ -266,7 +266,7 @@ title: 'task #29 with parent task (1)' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 14 bucket_id: 1 created: 2018-12-01 01:12:04 @@ -275,7 +275,7 @@ title: 'task #30 with assignees' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 15 bucket_id: 1 created: 2018-12-01 01:12:04 @@ -284,7 +284,7 @@ title: 'task #31 with color' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 16 hex_color: f0f0f0 bucket_id: 1 @@ -294,7 +294,7 @@ title: 'task #32' done: false created_by_id: 1 - list_id: 3 + project_id: 3 index: 1 bucket_id: 21 created: 2018-12-01 01:12:04 @@ -303,7 +303,7 @@ title: 'task #33 with percent done' done: false created_by_id: 1 - list_id: 1 + project_id: 1 index: 17 percent_done: 0.5 bucket_id: 1 @@ -314,7 +314,7 @@ title: 'task #34' done: false created_by_id: 13 - list_id: 20 + project_id: 20 index: 20 bucket_id: 5 created: 2018-12-01 01:12:04 @@ -323,7 +323,7 @@ title: 'task #35' done: false created_by_id: 1 - list_id: 21 + project_id: 21 index: 1 bucket_id: 19 created: 2018-12-01 01:12:04 @@ -332,7 +332,7 @@ title: 'task #36' done: false created_by_id: 1 - list_id: 22 + project_id: 22 index: 1 bucket_id: 20 created: 2018-12-01 01:12:04 @@ -342,7 +342,7 @@ title: 'task #37' done: false created_by_id: -2 - list_id: 2 + project_id: 2 index: 2 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 @@ -350,7 +350,7 @@ title: 'task #37 done with due date' done: true created_by_id: 1 - list_id: 22 + project_id: 22 index: 2 created: 2018-12-01 01:12:04 updated: 2018-12-01 01:12:04 diff --git a/pkg/db/fixtures/team_projects.yml b/pkg/db/fixtures/team_projects.yml index 55699d65b..98a9ed13b 100644 --- a/pkg/db/fixtures/team_projects.yml +++ b/pkg/db/fixtures/team_projects.yml @@ -1,54 +1,54 @@ - id: 1 team_id: 1 - list_id: 3 + project_id: 3 right: 0 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# This team has read only access on list 6 +# This team has read only access on project 6 - id: 2 team_id: 2 - list_id: 6 + project_id: 6 right: 0 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# This team has write access on list 7 +# This team has write access on project 7 - id: 3 team_id: 3 - list_id: 7 + project_id: 7 right: 1 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# This team has admin access on list 8 +# This team has admin access on project 8 - id: 4 team_id: 4 - list_id: 8 + project_id: 8 right: 2 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# Readonly acces on list 19 +# Readonly acces on project 19 - id: 5 team_id: 8 - list_id: 19 + project_id: 19 right: 2 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# Write acces on list 19 +# Write acces on project 19 - id: 6 team_id: 9 - list_id: 19 + project_id: 19 right: 1 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# Admin acces on list 19 +# Admin acces on project 19 - id: 7 team_id: 10 - list_id: 19 + project_id: 19 right: 2 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 8 team_id: 1 - list_id: 21 + project_id: 21 right: 0 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 diff --git a/pkg/db/fixtures/teams.yml b/pkg/db/fixtures/teams.yml index a6c8649f7..64ba4aaa9 100644 --- a/pkg/db/fixtures/teams.yml +++ b/pkg/db/fixtures/teams.yml @@ -3,13 +3,13 @@ description: Lorem Ipsum created_by_id: 1 - id: 2 - name: testteam2_read_only_on_list6 + name: testteam2_read_only_on_project6 created_by_id: 1 - id: 3 - name: testteam3_write_on_list7 + name: testteam3_write_on_project7 created_by_id: 1 - id: 4 - name: testteam4_admin_on_list8 + name: testteam4_admin_on_project8 created_by_id: 1 - id: 5 name: testteam2_read_only_on_namespace7 diff --git a/pkg/db/fixtures/users.yml b/pkg/db/fixtures/users.yml index 7ad372811..40cd4d035 100644 --- a/pkg/db/fixtures/users.yml +++ b/pkg/db/fixtures/users.yml @@ -40,7 +40,7 @@ issuer: local updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 -# This use is used to create a whole bunch of lists which are then shared directly with a user +# This use is used to create a whole bunch of projects which are then shared directly with a user - id: 6 username: 'user6' password: '$2a$14$dcadBoMBL9jQoOcZK8Fju.cy0Ptx2oZECkKLnaa8ekRoTFe1w7To.' # 1234 diff --git a/pkg/db/fixtures/users_projects.yml b/pkg/db/fixtures/users_projects.yml index eb1e62354..caf8851d4 100644 --- a/pkg/db/fixtures/users_projects.yml +++ b/pkg/db/fixtures/users_projects.yml @@ -1,48 +1,48 @@ - id: 1 user_id: 1 - list_id: 3 + project_id: 3 right: 0 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 2 user_id: 2 - list_id: 3 + project_id: 3 right: 0 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 3 user_id: 1 - list_id: 9 + project_id: 9 right: 0 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 4 user_id: 1 - list_id: 10 + project_id: 10 right: 1 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 5 user_id: 1 - list_id: 11 + project_id: 11 right: 2 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 6 user_id: 4 - list_id: 19 + project_id: 19 right: 0 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 7 user_id: 5 - list_id: 19 + project_id: 19 right: 1 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12 - id: 8 user_id: 6 - list_id: 19 + project_id: 19 right: 2 updated: 2018-12-02 15:13:12 created: 2018-12-01 15:13:12