Skip to content

Commit dc49f7d

Browse files
authored
[feat]: [PIE-3794]: Changes in DTO and Input Set Entity for Git Simplification (#33504)
* [feat]: [PIE-3794]: Changes in DTO and Input Set Entity for Git Simplification * add hidden schema messages
1 parent 6c3984c commit dc49f7d

File tree

7 files changed

+37
-3
lines changed

7 files changed

+37
-3
lines changed

800-pipeline-service/src/main/java/io/harness/pms/ngpipeline/inputset/beans/entity/InputSetEntity.java

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.harness.annotations.dev.OwnedBy;
1515
import io.harness.data.validator.EntityName;
1616
import io.harness.data.validator.Trimmed;
17+
import io.harness.gitsync.beans.StoreType;
1718
import io.harness.gitsync.persistance.GitSyncableEntity;
1819
import io.harness.mongo.index.CompoundMongoIndex;
1920
import io.harness.mongo.index.FdIndex;
@@ -26,6 +27,7 @@
2627
import io.harness.persistence.PersistentEntity;
2728
import io.harness.persistence.UpdatedAtAware;
2829
import io.harness.persistence.UuidAware;
30+
import io.harness.persistence.gitaware.GitAware;
2931

3032
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
3133
import com.github.reinert.jjschema.SchemaIgnore;
@@ -63,7 +65,7 @@
6365
@HarnessEntity(exportable = true)
6466
@StoreIn(DbAliases.PMS)
6567
public class InputSetEntity
66-
implements GitSyncableEntity, PersistentEntity, AccountAccess, UuidAware, CreatedAtAware, UpdatedAtAware {
68+
implements GitAware, GitSyncableEntity, PersistentEntity, AccountAccess, UuidAware, CreatedAtAware, UpdatedAtAware {
6769
public static List<MongoIndex> mongoIndexes() {
6870
return ImmutableList.<MongoIndex>builder()
6971
.add(CompoundMongoIndex.builder()
@@ -91,7 +93,7 @@ public static List<MongoIndex> mongoIndexes() {
9193
}
9294
@Setter @NonFinal @Id @org.mongodb.morphia.annotations.Id String uuid;
9395

94-
@Wither @NotEmpty String yaml;
96+
@Wither @NotEmpty @NonFinal @Setter String yaml;
9597

9698
@NotEmpty String accountId;
9799
@NotEmpty String orgIdentifier;
@@ -107,7 +109,7 @@ public static List<MongoIndex> mongoIndexes() {
107109
@Wither List<String> inputSetReferences;
108110

109111
@Setter @NonFinal @SchemaIgnore @FdIndex @CreatedDate long createdAt;
110-
@Setter @NonFinal @SchemaIgnore @NotNull @LastModifiedDate long lastUpdatedAt;
112+
@Wither @Setter @NonFinal @SchemaIgnore @NotNull @LastModifiedDate long lastUpdatedAt;
111113
@Wither @Builder.Default Boolean deleted = Boolean.FALSE;
112114
@Wither @Version Long version;
113115

@@ -119,8 +121,22 @@ public static List<MongoIndex> mongoIndexes() {
119121
@Setter @NonFinal String rootFolder;
120122
@Getter(AccessLevel.NONE) @Wither @NonFinal Boolean isEntityInvalid;
121123

124+
// git experience parameters after simplification
125+
@Wither @Setter @NonFinal StoreType storeType;
126+
@Setter @NonFinal String repo;
127+
@Setter @NonFinal String connectorRef;
128+
122129
@Wither @Builder.Default Boolean isInvalid = Boolean.FALSE;
123130

131+
public String getData() {
132+
return yaml;
133+
}
134+
135+
@Override
136+
public void setData(String data) {
137+
yaml = data;
138+
}
139+
124140
@Override
125141
public String getAccountIdentifier() {
126142
return accountId;

800-pipeline-service/src/main/java/io/harness/pms/ngpipeline/inputset/beans/resource/InputSetResponseDTOPMS.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
import static io.harness.annotations.dev.HarnessTeam.PIPELINE;
1111

1212
import io.harness.annotations.dev.OwnedBy;
13+
import io.harness.gitsync.beans.StoreType;
1314
import io.harness.gitsync.sdk.EntityGitDetails;
1415
import io.harness.gitsync.sdk.EntityValidityDetails;
16+
import io.harness.gitsync.sdk.GitSyncApiConstants;
1517
import io.harness.pms.inputset.InputSetErrorWrapperDTOPMS;
1618
import io.harness.pms.inputset.InputSetSchemaConstants;
1719
import io.harness.pms.pipeline.PipelineResourceConstants;
@@ -58,4 +60,6 @@ public class InputSetResponseDTOPMS {
5860

5961
@Schema(description = PipelineResourceConstants.GIT_DETAILS_MESSAGE) EntityGitDetails gitDetails;
6062
@Schema(description = PipelineResourceConstants.GIT_VALIDITY_MESSAGE) EntityValidityDetails entityValidityDetails;
63+
@Schema(description = GitSyncApiConstants.STORE_TYPE_RESPONSE_PARAM_MESSAGE, hidden = true) StoreType storeType;
64+
@Schema(description = GitSyncApiConstants.GIT_CONNECTOR_REF_PARAM_MESSAGE, hidden = true) String connectorRef;
6165
}

800-pipeline-service/src/main/java/io/harness/pms/ngpipeline/inputset/beans/resource/InputSetSummaryResponseDTOPMS.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
import static io.harness.annotations.dev.HarnessTeam.PIPELINE;
1111

1212
import io.harness.annotations.dev.OwnedBy;
13+
import io.harness.gitsync.beans.StoreType;
1314
import io.harness.gitsync.sdk.EntityGitDetails;
1415
import io.harness.gitsync.sdk.EntityValidityDetails;
16+
import io.harness.gitsync.sdk.GitSyncApiConstants;
1517
import io.harness.pms.inputset.InputSetErrorWrapperDTOPMS;
1618
import io.harness.pms.inputset.InputSetSchemaConstants;
1719
import io.harness.pms.ngpipeline.inputset.beans.entity.InputSetEntityType;
@@ -52,4 +54,6 @@ public class InputSetSummaryResponseDTOPMS {
5254
Map<String, String> overlaySetErrorDetails;
5355
@Schema(description = PipelineResourceConstants.GIT_VALIDITY_MESSAGE) EntityValidityDetails entityValidityDetails;
5456
@Schema(description = InputSetSchemaConstants.INPUT_SET_MODULES_MESSAGE) Set<String> modules;
57+
@Schema(description = GitSyncApiConstants.STORE_TYPE_RESPONSE_PARAM_MESSAGE, hidden = true) StoreType storeType;
58+
@Schema(description = GitSyncApiConstants.GIT_CONNECTOR_REF_PARAM_MESSAGE, hidden = true) String connectorRef;
5559
}

800-pipeline-service/src/main/java/io/harness/pms/ngpipeline/overlayinputset/beans/resource/OverlayInputSetResponseDTOPMS.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
import static io.harness.annotations.dev.HarnessTeam.PIPELINE;
1111

1212
import io.harness.annotations.dev.OwnedBy;
13+
import io.harness.gitsync.beans.StoreType;
1314
import io.harness.gitsync.sdk.EntityGitDetails;
1415
import io.harness.gitsync.sdk.EntityValidityDetails;
16+
import io.harness.gitsync.sdk.GitSyncApiConstants;
1517
import io.harness.pms.inputset.InputSetSchemaConstants;
1618
import io.harness.pms.pipeline.PipelineResourceConstants;
1719

@@ -60,4 +62,6 @@ public class OverlayInputSetResponseDTOPMS {
6062

6163
@Schema(description = PipelineResourceConstants.GIT_DETAILS_MESSAGE) EntityGitDetails gitDetails;
6264
@Schema(description = PipelineResourceConstants.GIT_VALIDITY_MESSAGE) EntityValidityDetails entityValidityDetails;
65+
@Schema(description = GitSyncApiConstants.STORE_TYPE_RESPONSE_PARAM_MESSAGE, hidden = true) StoreType storeType;
66+
@Schema(description = GitSyncApiConstants.GIT_CONNECTOR_REF_PARAM_MESSAGE, hidden = true) String connectorRef;
6367
}

954-pms-contracts/src/main/java/io/harness/pms/pipeline/PMSPipelineSummaryResponseDTO.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import static io.harness.annotations.dev.HarnessTeam.PIPELINE;
1111

1212
import io.harness.annotations.dev.OwnedBy;
13+
import io.harness.gitsync.beans.StoreType;
1314
import io.harness.gitsync.sdk.EntityGitDetails;
1415
import io.harness.gitsync.sdk.EntityValidityDetails;
1516

@@ -48,4 +49,6 @@ public class PMSPipelineSummaryResponseDTO {
4849
List<String> stageNames;
4950
EntityGitDetails gitDetails;
5051
EntityValidityDetails entityValidityDetails;
52+
StoreType storeType;
53+
String connectorRef;
5154
}

954-pms-contracts/src/main/java/io/harness/pms/pipeline/PipelineImportRequestDTO.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
import io.swagger.annotations.ApiModel;
1717
import io.swagger.v3.oas.annotations.media.Schema;
1818
import lombok.AccessLevel;
19+
import lombok.Builder;
1920
import lombok.Value;
2021
import lombok.experimental.FieldDefaults;
2122

2223
@OwnedBy(PIPELINE)
2324
@Value
25+
@Builder
2426
@FieldDefaults(level = AccessLevel.PRIVATE)
2527
@JsonIgnoreProperties(ignoreUnknown = true)
2628
@JsonInclude(JsonInclude.Include.NON_NULL)

970-ng-commons/src/main/java/io/harness/gitsync/sdk/GitSyncApiConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,5 @@ public class GitSyncApiConstants {
5353
public static final String GIT_CONNECTOR_REF_PARAM_MESSAGE =
5454
"Identifier of Connector needed for CRUD operations on the respective Entity";
5555
public static final String STORE_TYPE_PARAM_MESSAGE = "Tells whether the Entity is to be saved on Git or not";
56+
public static final String STORE_TYPE_RESPONSE_PARAM_MESSAGE = "Tells whether the Entity is saved on Git or not";
5657
}

0 commit comments

Comments
 (0)