refactor project structure, adding Long id as a reusable field of IdentifierLong

Csaba79-coder · Csaba79-coder · commit 37fe787b3e77 · 2023-03-17T11:08:01.000+01:00
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/controller/GovernmentController.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/controller/GovernmentController.java
@@ -2,7 +2,7 @@
 
 import com.csaba79coder.bestprotocol.api.GovernmentApi;
 import com.csaba79coder.bestprotocol.model.GovernmentAdminModel;
-import com.csaba79coder.bestprotocol.model.representative.service.GovernmentService;
+import com.csaba79coder.bestprotocol.model.government.service.GovernmentService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/model/base/entity/IdentifierLong.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/model/base/entity/IdentifierLong.java
@@ -0,0 +1,18 @@
+package com.csaba79coder.bestprotocol.model.base.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+
+@MappedSuperclass
+@Getter
+public class IdentifierLong {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+}
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/model/government/entity/Government.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/model/government/entity/Government.java
@@ -1,11 +1,10 @@
-package com.csaba79coder.bestprotocol.model.representative.entity;
+package com.csaba79coder.bestprotocol.model.government.entity;
 
+import com.csaba79coder.bestprotocol.model.base.entity.IdentifierLong;
+import com.csaba79coder.bestprotocol.model.representative.entity.Representative;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OrderBy;
 import jakarta.persistence.Table;
@@ -23,12 +22,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Table(name = "government")
-public class Government {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", nullable = false)
-    private Long id;
+public class Government extends IdentifierLong {
 
     @Column(name = "name")
     @OrderBy
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/model/government/persistence/GovernmentRepository.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/model/government/persistence/GovernmentRepository.java
@@ -1,6 +1,6 @@
-package com.csaba79coder.bestprotocol.model.representative.persistence;
+package com.csaba79coder.bestprotocol.model.government.persistence;
 
-import com.csaba79coder.bestprotocol.model.representative.entity.Government;
+import com.csaba79coder.bestprotocol.model.government.entity.Government;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/model/government/service/GovernmentService.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/model/government/service/GovernmentService.java
@@ -1,7 +1,7 @@
-package com.csaba79coder.bestprotocol.model.representative.service;
+package com.csaba79coder.bestprotocol.model.government.service;
 
 import com.csaba79coder.bestprotocol.model.GovernmentAdminModel;
-import com.csaba79coder.bestprotocol.model.representative.persistence.GovernmentRepository;
+import com.csaba79coder.bestprotocol.model.government.persistence.GovernmentRepository;
 import com.csaba79coder.bestprotocol.util.mapper.Mapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/model/representative/entity/Representative.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/model/representative/entity/Representative.java
@@ -1,6 +1,7 @@
 package com.csaba79coder.bestprotocol.model.representative.entity;
 
 import com.csaba79coder.bestprotocol.model.base.entity.Auditable;
+import com.csaba79coder.bestprotocol.model.government.entity.Government;
 import com.csaba79coder.bestprotocol.model.value.Availability;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/model/representative/service/RepresentativeService.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/model/representative/service/RepresentativeService.java
@@ -1,8 +1,8 @@
 package com.csaba79coder.bestprotocol.model.representative.service;
 
 import com.csaba79coder.bestprotocol.model.RepresentativeAdminModel;
-import com.csaba79coder.bestprotocol.model.representative.entity.Government;
-import com.csaba79coder.bestprotocol.model.representative.persistence.GovernmentRepository;
+import com.csaba79coder.bestprotocol.model.government.entity.Government;
+import com.csaba79coder.bestprotocol.model.government.persistence.GovernmentRepository;
 import com.csaba79coder.bestprotocol.model.representative.persistence.RepresentativeRepository;
 import com.csaba79coder.bestprotocol.util.mapper.Mapper;
 import lombok.RequiredArgsConstructor;
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/util/mapper/Mapper.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/util/mapper/Mapper.java
@@ -4,7 +4,7 @@
 import com.csaba79coder.bestprotocol.model.GovernmentAdminModel;
 import com.csaba79coder.bestprotocol.model.NewRepresentativeAdminModel;
 import com.csaba79coder.bestprotocol.model.RepresentativeAdminModel;
-import com.csaba79coder.bestprotocol.model.representative.entity.Government;
+import com.csaba79coder.bestprotocol.model.government.entity.Government;
 import com.csaba79coder.bestprotocol.model.representative.entity.Representative;
 import com.csaba79coder.bestprotocol.util.ImageUtil;
 import org.modelmapper.ModelMapper;
