Skip to content

Commit bcc6043

Browse files
committed
use last_modifed - modified wasn't serializing(?), avoid committing to gitlab when no changes were made. change default message
1 parent d06560a commit bcc6043

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

src/main/java/com/redhat/labs/lodestar/model/Artifact.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.List;
44
import java.util.Optional;
55

6+
import javax.json.bind.annotation.JsonbProperty;
67
import javax.json.bind.annotation.JsonbTransient;
78
import javax.validation.constraints.NotBlank;
89

@@ -42,6 +43,7 @@ public class Artifact extends PanacheMongoEntityBase {
4243
@DiffIgnore
4344
private String created;
4445
@DiffIgnore
46+
@JsonbProperty(value = "last_modified")
4547
private String modified;
4648

4749
@NotBlank

src/main/java/com/redhat/labs/lodestar/service/ArtifactService.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,16 @@ public void process(List<Artifact> artifacts, Optional<String> authorEmail, Opti
140140

141141
// modify artifacts in db
142142
String changeLog = modifyArtifactsByEngagementUuid(e.getKey(), e.getValue());
143-
// create commit message
144-
String commitMessage = new StringBuilder("Changed Engagement Artifacts\n").append(changeLog).toString();
145-
146-
// pull latest artifacts from db
147-
List<Artifact> latest = Artifact.findAllByEngagementUuid(e.getKey());
148-
// send to git to update file
149-
updateArtifactsFile(e.getKey(), latest, authorEmail, authorName, Optional.ofNullable(commitMessage));
150-
143+
144+
if(changeLog.length() > 0) { //Empty string == no changes
145+
// create commit message
146+
String commitMessage = new StringBuilder(defaultCommitMessage).append(changeLog).toString();
147+
148+
// pull latest artifacts from db
149+
List<Artifact> latest = Artifact.findAllByEngagementUuid(e.getKey());
150+
// send to git to update file
151+
updateArtifactsFile(e.getKey(), latest, authorEmail, authorName, Optional.ofNullable(commitMessage));
152+
}
151153
});
152154

153155
}

src/main/resources/application.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,16 @@ gitlab.api/mp-rest/url=${GITLAB_API_URL:https://acmegit.com}
3030
engagement.api/mp-rest/scope=javax.inject.Singleton
3131
engagement.api/mp-rest/url=${ENGAGEMENT_API_URL:http://git-api:8080}
3232

33+
mp.openapi.extensions.smallrye.info.title=LodeStar Artifacts API
34+
quarkus.swagger-ui.theme=muted
35+
3336

3437
gitlab.personal.access.token=${GITLAB_TOKEN:t}
3538

3639
# Application
3740
artifacts.file=${ARTIFACTS_FILE:artifacts.json}
3841
default.branch=${DEFAULT_BRANCH:master}
39-
default.commit.message=${DEFAULT_COMMIT_MESSAGE:updated artifacts list}
42+
default.commit.message=${DEFAULT_COMMIT_MESSAGE:Artifacts updated:\n}
4043
default.author.name=lodestar-artifacts-bot
4144
default.author.email=[email protected]
4245
default.page.size=${DEFAULT_PAGE_SIZE:20}

0 commit comments

Comments
 (0)