create SERVICE_OBJECTS and SERVICE_DEPENDENT_OBJECT table

Author: WangLiNaruto

Diff for: modules/database/src/main/java/org/eclipse/xpanse/modules/database/serviceobject/DatabaseServiceObjectStorage.java

@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Huawei Inc.
+ *
+ */
+
+package org.eclipse.xpanse.modules.database.serviceobject;
+
+import java.util.UUID;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/** Implementation of the sStorage. */
+@Component
+@Transactional
+public class DatabaseServiceObjectStorage implements ServiceObjectStorage {
+
+    private final ServiceObjectRepository repository;
+
+    @Autowired
+    public DatabaseServiceObjectStorage(ServiceObjectRepository repository) {
+        this.repository = repository;
+    }
+
+    @Override
+    public ServiceObjectEntity storeAndFlush(ServiceObjectEntity entity) {
+        return repository.saveAndFlush(entity);
+    }
+
+    @Override
+    public void delete(ServiceObjectEntity entity) {
+        repository.delete(entity);
+    }
+
+    @Override
+    public ServiceObjectEntity getEntityById(UUID objectId) {
+        return repository.findById(objectId).orElse(null);
+    }
+}

Diff for: modules/database/src/main/java/org/eclipse/xpanse/modules/database/serviceobject/ServiceObjectEntity.java

@@ -0,0 +1,68 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Huawei Inc.
+ *
+ */
+
+package org.eclipse.xpanse.modules.database.serviceobject;
+
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import lombok.Data;
+import org.eclipse.xpanse.modules.database.common.ObjectJsonConverter;
+import org.eclipse.xpanse.modules.database.service.ServiceDeploymentEntity;
+import org.eclipse.xpanse.modules.models.servicetemplate.ObjectIdentifier;
+import org.hibernate.annotations.Type;
+
+/** ServiceObjectEntity for persistence. */
+@Table(name = "SERVICE_OBJECT")
+@Entity
+@Data
+public class ServiceObjectEntity implements Serializable {
+
+    @Serial private static final long serialVersionUID = 8759122775257853274L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    @Column(name = "OBJECT_ID", nullable = false)
+    private UUID objectId;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "SERVICE_ID", nullable = false)
+    private ServiceDeploymentEntity serviceDeploymentEntity;
+
+    @JoinColumn(name = "OBJECT_TYPE", nullable = false)
+    private String objectType;
+
+    @JoinColumn(name = "OBJECT_IDENTIFIER", nullable = false)
+    private ObjectIdentifier objectIdentifier;
+
+    @Column(name = "PROPERTIES", columnDefinition = "json", length = Integer.MAX_VALUE)
+    @Type(value = JsonType.class)
+    @Convert(converter = ObjectJsonConverter.class)
+    private Map<String, Object> properties;
+
+    @ElementCollection
+    @CollectionTable(
+            name = "SERVICE_DEPENDENT_OBJECT",
+            joinColumns = @JoinColumn(name = "OBJECT_ID", nullable = false) // 当前对象ID
+            )
+    @Column(name = "DEPENDENT_OBJECT_ID")
+    private Set<UUID> dependentObjectIds;
+}

Diff for: modules/database/src/main/java/org/eclipse/xpanse/modules/database/serviceobject/ServiceObjectRepository.java

@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Huawei Inc.
+ *
+ */
+
+package org.eclipse.xpanse.modules.database.serviceobject;
+
+import java.util.UUID;
+import org.eclipse.xpanse.modules.database.CustomJpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/** Interface to access default JPA methods. */
+@Repository
+public interface ServiceObjectRepository
+        extends CustomJpaRepository<ServiceObjectEntity, UUID>,
+                JpaSpecificationExecutor<ServiceObjectEntity> {}

Diff for: modules/database/src/main/java/org/eclipse/xpanse/modules/database/serviceobject/ServiceObjectStorage.java

@@ -0,0 +1,19 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Huawei Inc.
+ *
+ */
+
+package org.eclipse.xpanse.modules.database.serviceobject;
+
+import java.util.UUID;
+
+/** Interface for persist of ServiceObjectEntity. */
+public interface ServiceObjectStorage {
+
+    ServiceObjectEntity storeAndFlush(ServiceObjectEntity entity);
+
+    void delete(ServiceObjectEntity entity);
+
+    ServiceObjectEntity getEntityById(UUID objectId);
+}

Diff for: modules/database/src/main/java/org/eclipse/xpanse/modules/database/serviceorder/ServiceOrderEntity.java

@@ -28,6 +28,7 @@
 import lombok.Data;
 import org.eclipse.xpanse.modules.database.common.ObjectJsonConverter;
 import org.eclipse.xpanse.modules.database.service.ServiceDeploymentEntity;
+import org.eclipse.xpanse.modules.database.serviceobject.ServiceObjectEntity;
 import org.eclipse.xpanse.modules.models.response.ErrorResponse;
 import org.eclipse.xpanse.modules.models.service.enums.Handler;
 import org.eclipse.xpanse.modules.models.service.enums.OrderStatus;
@@ -56,6 +57,10 @@ public class ServiceOrderEntity implements Serializable {
     @OnDelete(action = OnDeleteAction.CASCADE)
     private ServiceDeploymentEntity serviceDeploymentEntity;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "OBJECT_ID")
+    private ServiceObjectEntity serviceObjectEntity;
+
     @Column(name = "PARENT_ORDER_ID")
     private UUID parentOrderId;
 

Diff for: modules/deployment/src/main/java/org/eclipse/xpanse/modules/deployment/ServiceOrderManager.java

@@ -121,6 +121,7 @@ public ServiceOrderEntity createAndStoreGenericServiceOrderEntity(
         serviceOrderEntity.setOrderStatus(OrderStatus.CREATED);
         serviceOrderEntity.setStartedTime(OffsetDateTime.now());
         serviceOrderEntity.setRequestBody(getRequestBody(originalRequest));
+        serviceOrderEntity.setHandler(Handler.AGENT);
         return serviceOrderStorage.storeAndFlush(serviceOrderEntity);
     }