Sun, 26 Sep 2021 14:59:36 +0200
fix assignee not respected in hasChanged()
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
180 | 2 | * Copyright 2021 Mike Becker. All rights reserved. |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
4 | * Redistribution and use in source and binary forms, with or without |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * modification, are permitted provided that the following conditions are met: |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * 1. Redistributions of source code must retain the above copyright |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * notice, this list of conditions and the following disclaimer. |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * 2. Redistributions in binary form must reproduce the above copyright |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * notice, this list of conditions and the following disclaimer in the |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * documentation and/or other materials provided with the distribution. |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | */ |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | |
184
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
26 | package de.uapcore.lightpit.util |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | import de.uapcore.lightpit.entities.Component |
184
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
29 | import de.uapcore.lightpit.entities.Issue |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | import de.uapcore.lightpit.entities.Project |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | import de.uapcore.lightpit.entities.Version |
184
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
32 | import de.uapcore.lightpit.types.IssueStatusPhase |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
33 | |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
34 | data class IssueFilter( |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
35 | val project: Filter<Project> = AllFilter(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
36 | val version: Filter<Version> = AllFilter(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
37 | val component: Filter<Component> = AllFilter() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
38 | ) |
184
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
39 | |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
40 | data class IssueSorter(val criteria: List<Criteria>) : Comparator<Issue> { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
41 | enum class Field { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
42 | DONE, ETA, UPDATED |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
43 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
44 | |
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
45 | data class Criteria(val field: Field, val asc: Boolean = true) |
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
46 | |
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
47 | companion object { |
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
48 | val DEFAULT_ISSUE_SORTER = IssueSorter(listOf( |
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
49 | Criteria(Field.DONE), |
228
d68b08c8f6d0
fixes default issue sorter field order
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
50 | Criteria(Field.ETA), |
d68b08c8f6d0
fixes default issue sorter field order
Mike Becker <universe@uap-core.de>
parents:
193
diff
changeset
|
51 | Criteria(Field.UPDATED, false) |
193
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
52 | )) |
1e4044d29b1c
fixes missing issue sorting
Mike Becker <universe@uap-core.de>
parents:
184
diff
changeset
|
53 | } |
184
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
54 | |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
55 | override fun compare(left: Issue, right: Issue): Int { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
56 | if (left == right) { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
57 | return 0; |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
58 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
59 | for (c in criteria) { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
60 | val result = when (c.field) { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
61 | Field.DONE -> (left.status.phase == IssueStatusPhase.Done).compareTo(right.status.phase == IssueStatusPhase.Done) |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
62 | Field.ETA -> { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
63 | val l = left.eta |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
64 | val r = right.eta |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
65 | if (l == null && r == null) 0 |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
66 | else if (l == null) 1 |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
67 | else if (r == null) -1 |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
68 | else l.compareTo(r) |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
69 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
70 | Field.UPDATED -> left.updated.compareTo(right.updated) |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
71 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
72 | if (result != 0) { |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
73 | return if (c.asc) result else -result |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
74 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
75 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
76 | return 0 |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
77 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
78 | } |
e8eecee6aadf
completes kotlin migration
Mike Becker <universe@uap-core.de>
parents:
180
diff
changeset
|
79 |