Merge pull request #16 from alekszivko/revert-14-cicd/13-add-to-githu…

…b-actions-coverage-tests-on-pull-request Revert "Cicd/13 add to GitHub actions coverage tests on pull request"
alekszivko · Dec 23, 2024 · 6500aa0 · 6500aa0
2 parents 90ddf51 + df79729
commit 6500aa0
Show file tree

Hide file tree

Showing 40 changed files with 644 additions and 243 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,45 +5,6 @@
   <artifactId>sj2324-seed</artifactId>
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.12</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>report</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>jacoco-check</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <rule>
-                  <element>PACKAGE</element>
-                  <limits>
-                    <limit>
-                      <counter>LINE</counter>
-                      <value>COVEREDRATIO</value>
-                      <minimum>0.0</minimum>
-                    </limit>
-                  </limits>
-                </rule>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>springdoc-openapi-maven-plugin</artifactId>
         <executions>
@@ -116,6 +77,10 @@
       <artifactId>spring-boot-starter-thymeleaf</artifactId>
       <groupId>org.springframework.boot</groupId>
     </dependency>
+    <dependency>
+      <artifactId>spring-boot-starter-thymeleaf</artifactId>
+      <groupId>org.springframework.boot</groupId>
+    </dependency>
     <dependency>
       <artifactId>spring-boot-starter-web</artifactId>
       <groupId>org.springframework.boot</groupId>
@@ -166,7 +131,7 @@
     <dependency>
       <artifactId>postgresql</artifactId>
       <groupId>org.testcontainers</groupId>
-      <scope>runtime</scope>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <artifactId>spring-boot-devtools</artifactId>
@@ -187,7 +152,7 @@
     <artifactId>spring-boot-starter-parent</artifactId>
     <groupId>org.springframework.boot</groupId>
     <relativePath/>
-    <version>3.2.4</version> <!-- lookup parent from repository -->
+    <version>3.2.3</version> <!-- lookup parent from repository -->
   </parent>
   <properties>
     <java.version>22</java.version>

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/Address.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/Address.java
@@ -15,9 +15,9 @@
 
 // implemented by MM
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 
 
 @Embeddable

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/Customer.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/Customer.java
@@ -1,13 +1,9 @@
 package at.spengergasse.sj2324seedproject.domain;
 
 import jakarta.persistence.Embeddable;
-import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.NoArgsConstructor;
 
 @Builder
-
-
 @Embeddable
 public record Customer(String connectionNo) {
 

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/Producer.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/Producer.java
@@ -6,33 +6,38 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 import java.util.List;
 
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-
-
-@Entity
+@Builder
 @Table(name = "producers")
+@Entity
 public class Producer extends AbstractPersistable<Long>{
 
+    /*
+    Relations
+     */
+
     @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE})
     private List<StorageObjectMeta> storageObjectMeta;
 
+
+    /*
+     Attributes
+      */
+
     @Column(name = "shortname", length = ConstantsDomain.DEFAULT_LENGTH)
     @NotBlank
-    private String shortname;
+    private String shortname = ConstantsDomain.DEFAULT_VALUE;
 
     @NotBlank
     @Column(name = "producer_name", length =  ConstantsDomain.DEFAULT_LENGTH)
-    private String name;
+    private String name = ConstantsDomain.DEFAULT_VALUE;
 
 
 

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/Profile.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/Profile.java
@@ -11,11 +11,9 @@
 
 @Data
 @Builder
+@Embeddable
 @NoArgsConstructor
 @AllArgsConstructor
-
-
-@Embeddable
 public class Profile {
 
     private static final int USERNAME_LENGTH = 10;

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/Reservation.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/Reservation.java
@@ -15,18 +15,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 @Data
+@Entity
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-
-
-@Entity
 @Table(name = "reservations")
 public class Reservation extends AbstractPersistable<Long> {
 

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/Storage.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/Storage.java
@@ -10,16 +10,14 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 //    Implementend by MM
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+@Builder
 
 @Entity
 @Table(name="storages")

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObject.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObject.java
@@ -6,26 +6,29 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
+@Entity
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-
-
-@Entity
 @Table(name = "storage_objects")
 public class StorageObject extends AbstractPersistable<Long>{
 
+    /*
+    Relations
+     */
+
+
+    //    @JoinColumn(name = "fk_stored_at_user", foreignKey = @ForeignKey(name = "fk_storageObject_2_user"))
+    //    @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
     @OneToMany
-    private List<User> storedAtUsers;
+    private List<User> storedAtUser = new ArrayList<>();
 
     @ManyToOne(fetch = FetchType.LAZY,
                cascade = {CascadeType.MERGE, CascadeType.PERSIST})
@@ -53,6 +56,9 @@ public class StorageObject extends AbstractPersistable<Long>{
               cascade = {CascadeType.MERGE, CascadeType.PERSIST})
     private Reservation reservation;
 
+    /*
+    Attributes
+     */
     @Column(name = "serial_number")
     private String serialNumber;
 
@@ -62,7 +68,7 @@ public class StorageObject extends AbstractPersistable<Long>{
 
     @Column(name = "remark")
     @NotBlank
-    private String remark;
+    private String remark = ConstantsDomain.DEFAULT_VALUE;
 
     @Column(name = "project_device")
     private Boolean projectDevice;

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObjectHistory.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObjectHistory.java
@@ -7,21 +7,19 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 import java.time.LocalDateTime;
 
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-
+@Builder
 
 @Entity
 @Table(name ="storageObjectHistory")
+
 public class StorageObjectHistory extends AbstractPersistable<Long> {
 
     @ManyToOne(fetch = FetchType.LAZY)

diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObjectMeta.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/StorageObjectMeta.java
@@ -8,7 +8,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
@@ -17,15 +16,18 @@
 
 
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-
+@Builder
 @Entity
 @Table(name = "storage_object_metas")
+
 public class StorageObjectMeta extends AbstractPersistable<Long>{
 
+    /*
+    Relations
+     */
+
     @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST})
     public List<StorageObject> storageobject;
 
@@ -38,13 +40,17 @@ public class StorageObjectMeta extends AbstractPersistable<Long>{
     @Enumerated(EnumType.STRING)
     private Type type;
 
+    /*
+    Attributes
+     */
+
     @NotBlank
     @Column(name = "storage_object_name")
-    private String name;
+    private String name = ConstantsDomain.DEFAULT_VALUE;
 
     @NotBlank
     @Column(name = "os_version")
-    private String osVersion;
+    private String osVersion = ConstantsDomain.DEFAULT_VALUE;
 
     @Min(0)
     @Column(name = "consumables_per_box")
@@ -56,11 +62,11 @@ public class StorageObjectMeta extends AbstractPersistable<Long>{
 
     @NotBlank
     @Column(name = "wave_length")
-    private String wavelength;
+    private String wavelength = ConstantsDomain.DEFAULT_VALUE;
 
     @NotBlank
     @Column(name = "interface_speed")
-    private String interfacespeed;
+    private String interfacespeed = ConstantsDomain.DEFAULT_VALUE;
 
 
 }
diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/Type.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/Type.java
@@ -4,7 +4,8 @@
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
+//@NoArgsConstructor
+@AllArgsConstructor //Error wenn erzeugt  -> java: Konstruktor Type() ist bereits in Enumeration at.spengergasse.sj23247abcif.domain.Type definiert
 public enum Type{
 
     IP_PHONE("IP Phone", "IPP"),
@@ -13,6 +14,17 @@ public enum Type{
     SFP("Sfp", "Sfp"),
     CONSUMABLES("Consumables", "Cs");
 
-    final private String longVersion;
-    final private String shortVersion;
+
+
+    private String longVersion;
+    private String shortVersion;
+
+//public enum Type {
+//
+//    IP_PHONE,
+//    ROUTER,
+//    SWITCH,
+//    SFP,
+//    CONSUMABLES
+//
 }
diff --git a/src/main/java/at/spengergasse/sj2324seedproject/domain/User.java b/src/main/java/at/spengergasse/sj2324seedproject/domain/User.java
@@ -11,20 +11,16 @@
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 import org.springframework.format.annotation.DateTimeFormat;
 
 @Data
+@Entity
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-
-
-@Entity
 @Table(name = "app_user")
 public class User extends AbstractPersistable<Long> {