Skip to content

Feat/params dialog starter scenario #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2025
Merged

Feat/params dialog starter scenario #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...ator-spring-boot/src/main/java/org/citrusframework/simulator/model/ScenarioParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,5 +185,10 @@ public ScenarioParameterBuilder addOption(String key, String value) {
scenarioParameter.options.add(new ScenarioParameterOption(key, value));
return this;
}

public ScenarioParameterBuilder scenarioExecution(ScenarioExecution scenarioExecution) {
scenarioParameter.scenarioExecution = scenarioExecution;
return this;
}
}
}
5 changes: 3 additions & 2 deletions ...-boot/src/main/java/org/citrusframework/simulator/web/rest/ScenarioParameterResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.citrusframework.simulator.web.rest.dto.ScenarioParameterDTO;
import org.citrusframework.simulator.web.rest.dto.mapper.ScenarioParameterMapper;
import org.citrusframework.simulator.web.util.PaginationUtil;
import org.citrusframework.simulator.web.util.ResponseUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springdoc.core.annotations.ParameterObject;
Expand All @@ -40,6 +39,8 @@
import java.util.List;
import java.util.Optional;

import static org.citrusframework.simulator.web.util.ResponseUtil.wrapOrNotFound;

/**
* REST controller for managing {@link ScenarioParameter}.
*/
Expand Down Expand Up @@ -101,6 +102,6 @@ public ResponseEntity<Long> countScenarioParameters(ScenarioParameterCriteria cr
public ResponseEntity<ScenarioParameterDTO> getScenarioParameter(@PathVariable("id") Long id) {
logger.debug("REST request to get ScenarioParameter : {}", id);
Optional<ScenarioParameter> scenarioParameter = scenarioParameterService.findOne(id);
return ResponseUtil.wrapOrNotFound(scenarioParameter.map(scenarioParameterMapper::toDto));
return wrapOrNotFound(scenarioParameter.map(scenarioParameterMapper::toDto));
}
}
1 change: 1 addition & 0 deletions ...g-boot/src/main/java/org/citrusframework/simulator/web/rest/dto/ScenarioParameterDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public record ScenarioParameterDTO(
String controlType,
String value,
List<ScenarioParameterOptionDTO> options,
ScenarioExecutionDTO scenarioExecution,
Instant createdDate,
Instant lastModifiedDate) {
}
2 changes: 1 addition & 1 deletion .../main/java/org/citrusframework/simulator/web/rest/dto/mapper/ScenarioExecutionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import static org.mapstruct.MappingConstants.ComponentModel.SPRING;

@Mapper(componentModel = SPRING, uses = {HibernateCollectionUtils.class})
@Mapper(componentModel = SPRING, uses = {HibernateCollectionUtils.class, ScenarioParameterMapper.class})
public interface ScenarioExecutionMapper {

ScenarioExecutionDTO toDto(ScenarioExecution scenarioExecution);
Expand Down
10 changes: 9 additions & 1 deletion .../main/java/org/citrusframework/simulator/web/rest/dto/mapper/ScenarioParameterMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,24 @@

package org.citrusframework.simulator.web.rest.dto.mapper;

import org.citrusframework.simulator.model.ScenarioExecution;
import org.citrusframework.simulator.model.ScenarioParameter;
import org.citrusframework.simulator.web.rest.dto.ScenarioExecutionDTO;
import org.citrusframework.simulator.web.rest.dto.ScenarioParameterDTO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;

import static org.mapstruct.MappingConstants.ComponentModel.SPRING;

@Mapper(componentModel = SPRING, uses = {HibernateCollectionUtils.class})
@Mapper(componentModel = SPRING, uses = {HibernateCollectionUtils.class, TestParameterMapper.class})
public interface ScenarioParameterMapper {

ScenarioParameterDTO toDto(ScenarioParameter scenarioParameter);

@Mapping(target = "scenarioParameters", ignore = true)
@Mapping(target = "scenarioActions", ignore = true)
@Mapping(target = "scenarioMessages", ignore = true)
ScenarioExecutionDTO toScenarioExecutionDto(ScenarioExecution scenarioParameter);

ScenarioParameter toEntity(ScenarioParameterDTO scenarioParameterDTO);
}
2 changes: 2 additions & 0 deletions .../src/main/java/org/citrusframework/simulator/web/rest/dto/mapper/TestParameterMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
import org.citrusframework.simulator.model.TestParameter;
import org.citrusframework.simulator.web.rest.dto.TestParameterDTO;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;

import static org.mapstruct.MappingConstants.ComponentModel.SPRING;

@Mapper(componentModel = SPRING, uses = {HibernateCollectionUtils.class})
public interface TestParameterMapper {

@Mapping(target = "testResultId", expression = "java(testParameter.getTestResult().getId())")
TestParameterDTO toDto(TestParameter testParameter);
}
2 changes: 1 addition & 1 deletion ...oot/src/main/java/org/citrusframework/simulator/web/rest/dto/mapper/TestResultMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import static org.mapstruct.MappingConstants.ComponentModel.SPRING;

@Mapper(componentModel = SPRING, uses = {AuditingEntityMapper.class, HibernateCollectionUtils.class})
@Mapper(componentModel = SPRING, uses = {AuditingEntityMapper.class, HibernateCollectionUtils.class, TestParameterMapper.class})
public interface TestResultMapper {

TestResultDTO toDto(TestResult testResult);
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/org/citrusframework/simulator/service/ScenarioExecutionQueryServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void beforeEachSetup() {
.name(SOURCE)
.value(SOURCE_VALUE)
.build());
scenarioParameter = ScenarioParameterResourceIT.createEntityBuilder(entityManager)
scenarioParameter = ScenarioParameterResourceIT.createEntityBuilder(entityManager, null)
.name("John")
.value("Snow")
.build();
Expand Down Expand Up @@ -147,7 +147,7 @@ void beforeEachSetup() {
.addScenarioAction(ScenarioActionResourceIT.createEntity(entityManager))
.addScenarioMessage(message)
.addScenarioParameter(
ScenarioParameterResourceIT.createEntityBuilder(entityManager)
ScenarioParameterResourceIT.createEntityBuilder(entityManager, null)
.name("another")
.value("parameter")
.build()));
Expand Down Expand Up @@ -176,7 +176,7 @@ void beforeEachSetup() {
.value(SOURCE_VALUE)
.build()))
.addScenarioParameter(
ScenarioParameterResourceIT.createEntityBuilder(entityManager)
ScenarioParameterResourceIT.createEntityBuilder(entityManager, null)
.name("foo")
.value("bar")
.build()));
Expand Down
7 changes: 5 additions & 2 deletions ...oot/src/test/java/org/citrusframework/simulator/web/rest/ScenarioExecutionResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,20 @@ public static ScenarioExecution createUpdatedEntity(EntityManager entityManager)
void beforeEachSetup() {
transactionUtils.doWithinTransaction(
() -> {
var scenarioParameter = ScenarioParameterResourceIT.createEntity(entityManager);
var testResult = TestResultResourceIT.createEntity(entityManager);
var scenarioAction = ScenarioActionResourceIT.createEntity(entityManager);
var message = MessageHeaderResourceIT.createEntity(entityManager).getMessage();

scenarioExecution = createEntity(entityManager)
.withTestResult(testResult)
.addScenarioParameter(scenarioParameter)
.addScenarioAction(scenarioAction)
.addScenarioMessage(message);

var scenarioParameter = ScenarioParameterResourceIT.createEntityBuilder(entityManager, scenarioExecution).build();

scenarioExecution
.addScenarioParameter(scenarioParameter);

scenarioExecutionRepository.saveAndFlush(scenarioExecution);
}
);
Expand Down
31 changes: 30 additions & 1 deletion ...oot/src/test/java/org/citrusframework/simulator/web/rest/ScenarioParameterResourceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.citrusframework.simulator.IntegrationTest;
import org.citrusframework.simulator.model.ScenarioExecution;
import org.citrusframework.simulator.model.ScenarioParameter;
import org.citrusframework.simulator.model.TestResult;
import org.citrusframework.simulator.repository.ScenarioParameterRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -35,6 +36,8 @@
import java.time.ZonedDateTime;

import static org.citrusframework.simulator.web.rest.TestUtil.sameInstant;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.everyItem;
import static org.hamcrest.Matchers.hasItem;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
Expand All @@ -57,6 +60,9 @@ public class ScenarioParameterResourceIT {
private static final String DEFAULT_VALUE = "AAAAAAAAAA";
private static final String UPDATED_VALUE = "BBBBBBBBBB";

private static final String DEFAULT_OPTION_KEY = "name";
private static final String DEFAULT_OPTION_VALUE = "bond";

private static final ZonedDateTime DEFAULT_CREATED_DATE = ZonedDateTime.ofInstant(Instant.ofEpochMilli(0L), ZoneOffset.UTC);
private static final ZonedDateTime UPDATED_CREATED_DATE = ZonedDateTime.now(ZoneId.systemDefault()).withNano(0);
private static final ZonedDateTime SMALLER_CREATED_DATE = ZonedDateTime.ofInstant(Instant.ofEpochMilli(-1L), ZoneOffset.UTC);
Expand All @@ -80,10 +86,30 @@ public class ScenarioParameterResourceIT {
private ScenarioParameter scenarioParameter;

public static ScenarioParameter.ScenarioParameterBuilder createEntityBuilder(EntityManager entityManager) {
var scenarioExecution = persistScenarioExecutionIfNotExists(entityManager);
return createEntityBuilder(entityManager, scenarioExecution);
}

private static ScenarioExecution persistScenarioExecutionIfNotExists(EntityManager entityManager) {
ScenarioExecution scenarioExecution;
if (TestUtil.findAll(entityManager, TestResult.class).isEmpty()) {
scenarioExecution = ScenarioExecutionResourceIT.createEntity(entityManager);
entityManager.persist(scenarioExecution);
entityManager.flush();
} else {
scenarioExecution = TestUtil.findAll(entityManager, ScenarioExecution.class).get(0);
}

return scenarioExecution;
}

public static ScenarioParameter.ScenarioParameterBuilder createEntityBuilder(EntityManager entityManager, ScenarioExecution scenarioExecution) {
return ScenarioParameter.builder()
.name(DEFAULT_NAME)
.controlType(DEFAULT_CONTROL_TYPE)
.value(DEFAULT_VALUE)
.addOption(DEFAULT_OPTION_KEY, DEFAULT_OPTION_VALUE)
.scenarioExecution(scenarioExecution)
.createdDate(DEFAULT_CREATED_DATE)
.lastModifiedDate(DEFAULT_LAST_MODIFIED_DATE);
}
Expand Down Expand Up @@ -135,7 +161,10 @@ void getAllScenarioParameters() throws Exception {
.andExpect(jsonPath("$.[*].name").value(hasItem(DEFAULT_NAME)))
.andExpect(jsonPath("$.[*].controlType").value(hasItem(DEFAULT_CONTROL_TYPE.toString())))
.andExpect(jsonPath("$.[*].value").value(hasItem(DEFAULT_VALUE)))
.andExpect(jsonPath("$.[*].createdDate").value(hasItem(sameInstant(DEFAULT_CREATED_DATE))))
.andExpect(jsonPath("$.[*].options[*].key").value(everyItem(equalTo(DEFAULT_OPTION_KEY))))
.andExpect(jsonPath("$.[*].options[*].value").value(everyItem(equalTo(DEFAULT_OPTION_VALUE))))
.andExpect(jsonPath("$.[*].scenarioExecution.executionId").value(everyItem(equalTo(scenarioParameter.getScenarioExecution().getExecutionId().intValue()))))
.andExpect(jsonPath("$.[*].scenarioExecution.scenarioName").value(everyItem(equalTo(scenarioParameter.getScenarioExecution().getScenarioName()))))
.andExpect(jsonPath("$.[*].lastModifiedDate").value(hasItem(sameInstant(DEFAULT_LAST_MODIFIED_DATE))));
}

Expand Down
3 changes: 1 addition & 2 deletions ...rc/main/webapp/app/entities/scenario-execution/detail/scenario-actions-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
import { sort } from 'app/core/util/operators';

import SharedModule from 'app/shared/shared.module';
import { DurationPipe, FormatMediumDatePipe } from 'app/shared/date';
import FormatMediumDatetimePipe from 'app/shared/date/format-medium-datetime.pipe';
import SortDirective from 'app/shared/sort/sort.directive';
import SortByDirective from 'app/shared/sort/sort-by.directive';
Expand All @@ -16,7 +15,7 @@ import { ScenarioActionService } from 'app/entities/scenario-action/service/scen
standalone: true,
selector: 'app-scenario-actions-table',
templateUrl: './scenario-actions-table.component.html',
imports: [RouterModule, SharedModule, DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe, SortDirective, SortByDirective],
imports: [RouterModule, SharedModule, FormatMediumDatetimePipe, SortDirective, SortByDirective],
})
export class ScenarioActionsTableComponent implements OnInit {
@Input()
Expand Down
4 changes: 1 addition & 3 deletions ...main/webapp/app/entities/scenario-execution/detail/scenario-execution-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
import { ActivatedRoute, RouterModule } from '@angular/router';

import SharedModule from 'app/shared/shared.module';
import { DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe } from 'app/shared/date';
import { FormatMediumDatetimePipe } from 'app/shared/date';

import { ScenarioActionsTableComponent } from './scenario-actions-table.component';
import { ScenarioMessagesTableComponent } from './scenario-messages-table.component';
Expand All @@ -17,9 +17,7 @@ import { IScenarioExecution } from '../scenario-execution.model';
imports: [
SharedModule,
RouterModule,
DurationPipe,
FormatMediumDatetimePipe,
FormatMediumDatePipe,
ScenarioActionsTableComponent,
ScenarioMessagesTableComponent,
ScenarioParametersTableComponent,
Expand Down
50 changes: 26 additions & 24 deletions ...in/webapp/app/entities/scenario-execution/detail/scenario-parameters-table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
<div class="table-responsive table-entities" id="entities" *ngIf="sortedParameters && sortedParameters.length > 0; else noParameters">
<table class="table table-striped table-hover" data-test="scenarioParametersEntityTable" aria-describedby="page-heading">
<thead>
<th scope="col" jhiSortBy="parameterId">
<div class="d-flex">
<span jhiTranslate="global.field.id">ID</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
<th scope="col" jhiSortBy="name">
<div class="d-flex">
<span jhiTranslate="citrusSimulatorApp.scenarioParameter.name">Name</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
<th scope="col" jhiSortBy="controlType">
<div class="d-flex">
<span jhiTranslate="citrusSimulatorApp.scenarioParameter.controlType">Control Type</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
<th scope="col" jhiSortBy="value">
<div class="d-flex">
<span jhiTranslate="citrusSimulatorApp.scenarioParameter.value">Value</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
<tr jhiSort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="sortParameters()">
<th scope="col" jhiSortBy="parameterId">
<div class="d-flex">
<span jhiTranslate="global.field.id">ID</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
<th scope="col" jhiSortBy="name">
<div class="d-flex">
<span jhiTranslate="citrusSimulatorApp.scenarioParameter.name">Name</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
<th scope="col" jhiSortBy="controlType">
<div class="d-flex">
<span jhiTranslate="citrusSimulatorApp.scenarioParameter.controlType">Control Type</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
<th scope="col" jhiSortBy="value">
<div class="d-flex">
<span jhiTranslate="citrusSimulatorApp.scenarioParameter.value">Value</span>
<fa-icon class="p-1" icon="sort"></fa-icon>
</div>
</th>
</tr>
</thead>
<tbody>
<tr
Expand Down
6 changes: 2 additions & 4 deletions ...main/webapp/app/entities/scenario-execution/detail/scenario-parameters-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ import { IScenarioParameter } from 'app/entities/scenario-parameter/scenario-par
import { ScenarioParameterService } from 'app/entities/scenario-parameter/service/scenario-parameter.service';

import SharedModule from 'app/shared/shared.module';
import { DurationPipe, FormatMediumDatePipe } from 'app/shared/date';
import FormatMediumDatetimePipe from 'app/shared/date/format-medium-datetime.pipe';
import SortDirective from 'app/shared/sort/sort.directive';
import SortByDirective from 'app/shared/sort/sort-by.directive';
import SortDirective from '../../../shared/sort/sort.directive';

@Component({
standalone: true,
selector: 'app-scenario-parameters-table',
templateUrl: './scenario-parameters-table.component.html',
imports: [RouterModule, SharedModule, DurationPipe, FormatMediumDatetimePipe, FormatMediumDatePipe, SortDirective, SortByDirective],
imports: [RouterModule, SharedModule, SortByDirective, SortDirective],
})
export class ScenarioParametersTableComponent implements OnInit {
@Input()
Expand Down
8 changes: 7 additions & 1 deletion simulator-ui/src/main/webapp/app/entities/scenario-parameter/scenario-parameter.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ export interface IScenarioParameter {
name?: 'UNKNOWN' | 'TEXTBOX' | 'TEXTAREA' | 'DROPDOWN' | null;
controlType?: number | null;
value?: string | null;
options?: IScenarioParameterOption[];
scenarioExecution?: Pick<IScenarioExecution, 'executionId' | 'scenarioName'>;
createdDate?: number | null;
lastModifiedDate?: dayjs.Dayjs | null;
scenarioExecution?: Pick<IScenarioExecution, 'executionId' | 'scenarioName'> | null;
}

export interface IScenarioParameterOption {
key: string;
value: string;
}
Loading