Skip to content

Commit

Permalink
add CREATED_TIME and UPDATED_TIME to ServiceChangeRequestEntity (#2456)
Browse files Browse the repository at this point in the history
  • Loading branch information
WangLiNaruto authored Feb 25, 2025
1 parent 11e4747 commit 3a75a10
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Map;
import java.util.UUID;
import lombok.Data;
import org.eclipse.xpanse.modules.database.common.CreatedModifiedTime;
import org.eclipse.xpanse.modules.database.common.ObjectJsonConverter;
import org.eclipse.xpanse.modules.database.service.ServiceDeploymentEntity;
import org.eclipse.xpanse.modules.database.serviceorder.ServiceOrderEntity;
Expand All @@ -37,7 +38,7 @@
@Table(name = "SERVICE_CHANGE_REQUEST")
@Entity
@Data
public class ServiceChangeRequestEntity implements Serializable {
public class ServiceChangeRequestEntity extends CreatedModifiedTime implements Serializable {

@Serial private static final long serialVersionUID = 8759112725757851274L;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import static org.assertj.core.api.Assertions.assertThat;

import java.time.OffsetDateTime;
import java.util.List;
import java.util.Map;
import java.util.UUID;
Expand All @@ -31,6 +32,8 @@ public class ServiceChangeRequestEntityTest {
final Map<String, Object> properties = Map.of("k1", "v1", "k2", "v2");
final ServiceChangeStatus status = ServiceChangeStatus.PENDING;
final List<AnsibleTaskResult> tasks = List.of();
final OffsetDateTime createdTime = OffsetDateTime.now();
final OffsetDateTime lastModifiedTime = OffsetDateTime.now();
@Mock private ServiceDeploymentEntity serviceDeploymentEntity;
@Mock private ServiceOrderEntity serviceOrderEntity;

Expand All @@ -48,6 +51,8 @@ void setUp() {
test.setStatus(status);
test.setProperties(properties);
test.setTasks(tasks);
test.setCreatedTime(createdTime);
test.setLastModifiedTime(lastModifiedTime);
}

@Test
Expand All @@ -61,6 +66,8 @@ void testGetters() {
assertThat(test.getStatus()).isEqualTo(status);
assertThat(test.getProperties()).isEqualTo(properties);
assertThat(test.getTasks()).isEqualTo(tasks);
assertThat(test.getCreatedTime()).isEqualTo(createdTime);
assertThat(test.getLastModifiedTime()).isEqualTo(lastModifiedTime);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import jakarta.annotation.Resource;
import jakarta.transaction.Transactional;
import java.time.OffsetDateTime;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -125,6 +126,7 @@ private ServiceChangeRequestEntity updateServiceChangeRequestState(
request.setResourceName(resourceName);
}
request.setStatus(ServiceChangeStatus.PROCESSING);
request.setLastModifiedTime(OffsetDateTime.now());
return serviceChangeRequestStorage.storeAndFlush(request);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
package org.eclipse.xpanse.modules.deployment;

import jakarta.annotation.Resource;
import java.time.OffsetDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -163,6 +164,7 @@ private ServiceChangeRequestEntity createServiceChangeRequestEntity(
request.setProperties(properties);
request.setOriginalRequestProperties(originalPropertiesReceived);
request.setStatus(ServiceChangeStatus.PENDING);
request.setCreatedTime(OffsetDateTime.now());
return request;
}
}

0 comments on commit 3a75a10

Please sign in to comment.