Skip to content

Commit f6c5284

Browse files
nevio18324nevio18324
committed
feat: upgrade all angular dependencies to version 20 #1639 
1 parent edb166a commit f6c5284

File tree

119 files changed

+4021
-7139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+4021
-7139
lines changed

‎.github/workflows/auto-deploy-main.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
name: 'Auto Deploy Main'
22

3-
# TODO: Enable me in ticket #1587- Connection pooling
4-
#on:
5-
# pull_request_target:
6-
# types:
7-
# - closed
8-
# branches: [ main ]
3+
on:
4+
pull_request_target:
5+
types:
6+
- closed
7+
branches: [ main ]
98

109
jobs:
1110
versioning:

‎backend/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>ch.puzzle.okr</groupId>
88
<artifactId>parent</artifactId>
9-
<version>3.2.77</version>
9+
<version>3.2.83</version>
1010
</parent>
1111

1212
<artifactId>backend</artifactId>
13-
<version>3.2.77</version>
13+
<version>3.2.83</version>
1414
<name>backend</name>
1515
<description>Puzzle OKR Tool</description>
1616

@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>org.hibernate.orm</groupId>
7676
<artifactId>hibernate-hikaricp</artifactId>
77-
<version>6.6.15.Final</version>
77+
<version>6.6.26.Final</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>com.h2database</groupId>

‎backend/src/main/java/ch/puzzle/okr/OkrApplicationContextInitializer.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ch.puzzle.okr;
22

33
import ch.puzzle.okr.multitenancy.HibernateContext;
4+
import ch.puzzle.okr.multitenancy.HikariContext;
45
import org.slf4j.Logger;
56
import org.slf4j.LoggerFactory;
67
import org.springframework.context.ApplicationContextInitializer;
@@ -16,6 +17,7 @@ public class OkrApplicationContextInitializer implements ApplicationContextIniti
1617
public void initialize(ConfigurableApplicationContext applicationContext) {
1718
logger.info("Loading hibernate configuration from application properties");
1819
HibernateContext.extractAndSetHibernateConfig(applicationContext.getEnvironment());
20+
HikariContext.extractAndSetHikariConfig(applicationContext.getEnvironment());
1921
}
2022

2123
}

‎backend/src/main/java/ch/puzzle/okr/dto/keyresult/KeyResultMetricDto.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88

99
@JsonDeserialize(as = KeyResultMetricDto.class)
1010
public record KeyResultMetricDto(Long id, int version, String keyResultType, String title, String description,
11-
Double baseline, Double stretchGoal, UnitDto unit, KeyResultUserDto owner, KeyResultObjectiveDto objective,
12-
KeyResultLastCheckInMetricDto lastCheckIn, LocalDateTime createdOn, LocalDateTime modifiedOn,
13-
boolean isWriteable, List<ActionDto> actionList) implements KeyResultDto {
11+
Double baseline, Double commitValue, Double targetValue, Double stretchGoal, UnitDto unit,
12+
KeyResultUserDto owner, KeyResultObjectiveDto objective, KeyResultLastCheckInMetricDto lastCheckIn,
13+
LocalDateTime createdOn, LocalDateTime modifiedOn, boolean isWriteable,
14+
List<ActionDto> actionList) implements KeyResultDto {
1415
@Override
1516
public List<ActionDto> getActionList() {
1617
return actionList;

‎backend/src/main/java/ch/puzzle/okr/dto/overview/OverviewKeyResultMetricDto.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package ch.puzzle.okr.dto.overview;
22

3-
public record OverviewKeyResultMetricDto(Long id, String title, String keyResultType, String unit, Double baseline,
4-
Double stretchGoal, OverviewLastCheckInMetricDto lastCheckIn) implements OverviewKeyResultDto {
3+
public record OverviewKeyResultMetricDto(Long id, String title, String keyResultType, Double baseline,
4+
Double commitValue, Double targetValue, Double stretchGoal,
5+
OverviewLastCheckInMetricDto lastCheckIn) implements OverviewKeyResultDto {
56
}

‎backend/src/main/java/ch/puzzle/okr/exception/HikariContextException.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package ch.puzzle.okr.exception;
2+
3+
public class HikariContextException extends RuntimeException {
4+
public HikariContextException(String message) {
5+
super(message);
6+
}
7+
}

‎backend/src/main/java/ch/puzzle/okr/mapper/OverviewMapper.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ private OverviewKeyResultMetricDto createKeyResultMetricDto(Overview overview) {
103103
return new OverviewKeyResultMetricDto(overview.getOverviewId().getKeyResultId(),
104104
overview.getKeyResultTitle(),
105105
overview.getKeyResultType(),
106-
overview.getUnit(),
107106
overview.getBaseline(),
107+
overview.getCommitValue(),
108+
overview.getTargetValue(),
108109
overview.getStretchGoal(),
109110
lastCheckIn);
110111
}

‎backend/src/main/java/ch/puzzle/okr/mapper/keyresult/KeyResultMetricMapper.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public KeyResultDto toDto(KeyResultMetric keyResult, List<Action> actionList) {
6363
keyResult.getTitle(), //
6464
keyResult.getDescription(), //
6565
keyResult.getBaseline(), //
66+
keyResult.getCommitValue(),
67+
keyResult.getTargetValue(),
6668
keyResult.getStretchGoal(), //
6769
unitMapper.toDto(keyResult.getUnit()), //
6870
ownerDto,
@@ -79,6 +81,8 @@ public KeyResult toKeyResultMetric(KeyResultMetricDto keyResultMetricDto) {
7981
.builder() //
8082
.withBaseline(keyResultMetricDto.baseline()) //
8183
.withStretchGoal(keyResultMetricDto.stretchGoal()) //
84+
.withCommitValue(keyResultMetricDto.commitValue()) //
85+
.withTargetValue(keyResultMetricDto.targetValue()) //
8286
.withUnit(unitBusinessService.findUnitByName(keyResultMetricDto.unit().unitName()))
8387
.withId(keyResultMetricDto.id()) //
8488
.withVersion(keyResultMetricDto.version()) //

‎backend/src/main/java/ch/puzzle/okr/models/keyresult/KeyResultMetric.java‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ public class KeyResultMetric extends KeyResult {
1414
@NotNull(message = MessageKey.ATTRIBUTE_NOT_NULL)
1515
private Double baseline;
1616

17+
private Double commitValue;
18+
19+
private Double targetValue;
20+
1721
@NotNull(message = MessageKey.ATTRIBUTE_NOT_NULL)
1822
private Double stretchGoal;
1923

@@ -33,6 +37,22 @@ public Double getStretchGoal() {
3337
return stretchGoal;
3438
}
3539

40+
public Double getCommitValue() {
41+
return commitValue;
42+
}
43+
44+
public void setCommitValue(Double commitValue) {
45+
this.commitValue = commitValue;
46+
}
47+
48+
public Double getTargetValue() {
49+
return targetValue;
50+
}
51+
52+
public void setTargetValue(Double targetValue) {
53+
this.targetValue = targetValue;
54+
}
55+
3656
public void setStretchGoal(Double stretchGoal) {
3757
this.stretchGoal = stretchGoal;
3858
}
@@ -54,31 +74,37 @@ public boolean equals(Object o) {
5474
if (o instanceof KeyResultMetric keyResultMetric) {
5575
return super.equals(o) && Objects.equals(baseline, keyResultMetric.baseline)
5676
&& Objects.equals(stretchGoal, keyResultMetric.stretchGoal)
77+
&& Objects.equals(commitValue, keyResultMetric.commitValue)
78+
&& Objects.equals(targetValue, keyResultMetric.targetValue)
5779
&& Objects.equals(unit, keyResultMetric.unit);
5880
}
5981
return false;
6082
}
6183

6284
@Override
6385
public int hashCode() {
64-
return Objects.hash(super.hashCode(), baseline, stretchGoal, unit);
86+
return Objects.hash(super.hashCode(), baseline, commitValue, targetValue, stretchGoal, unit);
6587
}
6688

6789
@Override
6890
public String toString() {
69-
return super.toString() + "KeyResultMetric{" + "baseline=" + baseline + ", stretchGoal=" + stretchGoal
70-
+ ", unit='" + unit + '\'' + '}';
91+
return "KeyResultMetric{" + "baseline=" + baseline + ", commitValue=" + commitValue + ", targetValue="
92+
+ targetValue + ", stretchGoal=" + stretchGoal + ", unit=" + unit + '}';
7193
}
7294

7395
private KeyResultMetric(Builder builder) {
7496
super(builder);
7597
setBaseline(builder.baseline);
98+
setCommitValue(builder.commitValue);
99+
setTargetValue(builder.targetValue);
76100
setStretchGoal(builder.stretchGoal);
77101
setUnit(builder.unit);
78102
}
79103

80104
public static class Builder extends KeyResult.Builder<Builder> {
81105
private Double baseline;
106+
private Double commitValue;
107+
private Double targetValue;
82108
private Double stretchGoal;
83109
private Unit unit;
84110

@@ -105,6 +131,16 @@ public Builder withUnit(Unit unit) {
105131
return this;
106132
}
107133

134+
public Builder withCommitValue(Double commitValue) {
135+
this.commitValue = commitValue;
136+
return this;
137+
}
138+
139+
public Builder withTargetValue(Double targetValue) {
140+
this.targetValue = targetValue;
141+
return this;
142+
}
143+
108144
@Override
109145
public KeyResult build() {
110146
return new KeyResultMetric(this);

‎backend/src/main/java/ch/puzzle/okr/models/overview/Overview.java‎

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ public class Overview implements WriteableInterface {
2323
private String keyResultTitle;
2424
private String keyResultType;
2525
private Double baseline;
26+
private Double commitValue;
27+
private Double targetValue;
2628
private Double stretchGoal;
27-
private String unit;
2829
private String commitZone;
2930
private String targetZone;
3031
private String stretchZone;
@@ -54,8 +55,9 @@ private Overview(Builder builder) {
5455
keyResultTitle = builder.keyResultTitle;
5556
keyResultType = builder.keyResultType;
5657
baseline = builder.baseline;
58+
commitValue = builder.commitValue;
59+
targetValue = builder.targetValue;
5760
stretchGoal = builder.stretchGoal;
58-
unit = builder.unit;
5961
commitZone = builder.commitZone;
6062
targetZone = builder.targetZone;
6163
stretchZone = builder.stretchZone;
@@ -113,10 +115,6 @@ public Double getStretchGoal() {
113115
return stretchGoal;
114116
}
115117

116-
public String getUnit() {
117-
return unit;
118-
}
119-
120118
public String getCommitZone() {
121119
return commitZone;
122120
}
@@ -145,6 +143,14 @@ public LocalDateTime getCheckInCreatedOn() {
145143
return checkInCreatedOn;
146144
}
147145

146+
public Double getCommitValue() {
147+
return commitValue;
148+
}
149+
150+
public Double getTargetValue() {
151+
return targetValue;
152+
}
153+
148154
@Override
149155
public boolean isWriteable() {
150156
return writeable;
@@ -165,15 +171,15 @@ public void setBacklogQuarter(boolean backlogQuarter) {
165171

166172
@Override
167173
public String toString() {
168-
return "Overview{" + "overviewId=" + overviewId + ", teamVersion='" + teamVersion + ", teamName='" + teamName
169-
+ '\'' + ", objectiveTitle='" + objectiveTitle + '\'' + ", objectiveState=" + objectiveState
174+
return "Overview{" + "overviewId=" + overviewId + ", teamName='" + teamName + '\'' + ", teamVersion="
175+
+ teamVersion + ", objectiveTitle='" + objectiveTitle + '\'' + ", objectiveState=" + objectiveState
170176
+ ", objectiveCreatedOn=" + objectiveCreatedOn + ", quarterId=" + quarterId + ", quarterLabel='"
171177
+ quarterLabel + '\'' + ", keyResultTitle='" + keyResultTitle + '\'' + ", keyResultType='"
172-
+ keyResultType + '\'' + ", baseline=" + baseline + ", stretchGoal=" + stretchGoal + ", unit='" + unit
173-
+ '\'' + ", commitZone='" + commitZone + '\'' + ", targetZone='" + targetZone + '\'' + ", stretchZone='"
174-
+ stretchZone + '\'' + ", checkInValue=" + checkInValue + ", checkInZone='" + checkInZone + '\''
175-
+ ", confidence=" + confidence + ", createdOn=" + checkInCreatedOn + ", writeable=" + writeable + '\''
176-
+ '}';
178+
+ keyResultType + '\'' + ", baseline=" + baseline + ", commitValue=" + commitValue + ", targetValue="
179+
+ targetValue + ", stretchGoal=" + stretchGoal + ", commitZone='" + commitZone + '\'' + ", targetZone='"
180+
+ targetZone + '\'' + ", stretchZone='" + stretchZone + '\'' + ", checkInValue=" + checkInValue
181+
+ ", checkInZone='" + checkInZone + '\'' + ", confidence=" + confidence + ", checkInCreatedOn="
182+
+ checkInCreatedOn + ", writeable=" + writeable + ", backlogQuarter=" + backlogQuarter + '}';
177183
}
178184

179185
public static final class Builder {
@@ -188,8 +194,9 @@ public static final class Builder {
188194
private String keyResultTitle;
189195
private String keyResultType;
190196
private Double baseline;
197+
private Double commitValue;
198+
private Double targetValue;
191199
private Double stretchGoal;
192-
private String unit;
193200
private String commitZone;
194201
private String targetZone;
195202
private String stretchZone;
@@ -260,13 +267,18 @@ public Builder withBaseline(Double baseline) {
260267
return this;
261268
}
262269

263-
public Builder withStretchGoal(Double stretchGoal) {
264-
this.stretchGoal = stretchGoal;
270+
public Builder withCommitValue(Double commitValue) {
271+
this.commitValue = commitValue;
272+
return this;
273+
}
274+
275+
public Builder withTargetValue(Double targetValue) {
276+
this.targetValue = targetValue;
265277
return this;
266278
}
267279

268-
public Builder withUnit(String unit) {
269-
this.unit = unit;
280+
public Builder withStretchGoal(Double stretchGoal) {
281+
this.stretchGoal = stretchGoal;
270282
return this;
271283
}
272284

0 commit comments

Comments
 (0)