Skip to content

Add changelog for group member add #163

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
yma955 merged 1 commit into from
Sep 9, 2025
Merged

Add changelog for group member add #163

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
23 changes: 19 additions & 4 deletions src/main/java/org/commonjava/indy/service/repository/data/cassandra/CassandraStoreQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,18 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import static org.commonjava.indy.service.repository.data.cassandra.CassandraStoreUtil.CONSTITUENTS;
import static org.commonjava.indy.service.repository.data.cassandra.CassandraStoreUtil.KOJI_PREFIX;
import static org.commonjava.indy.service.repository.data.cassandra.CassandraStoreUtil.TABLE_AFFECTED_STORE;
import static org.commonjava.indy.service.repository.data.cassandra.CassandraStoreUtil.TABLE_STORE;
import static org.commonjava.indy.service.repository.model.ArtifactStore.METADATA_CHANGELOG;

@ApplicationScoped
//@Startup
Expand Down Expand Up @@ -164,13 +167,19 @@ public boolean addConstituentToGroup( StoreKey key, StoreKey member )
dtxArtifactStore.setTypeKey( CassandraStoreUtil.getTypeKey( key.getPackageType(), key.getType().name() ) );
Map<String, String> extras = dtxArtifactStore.getExtras();
String members = extras.get( CONSTITUENTS );
String changelog = String.format( "%s%s, %s", "Adding repository: ", member.getName(), new Date() );
if ( member.getName().startsWith( KOJI_PREFIX ) )
{
changelog = String.format( "%s%s, %s", "Adding remote repository for Koji build: ",
member.getName().substring( 5 ), new Date() );
}
if ( members == null || members.isEmpty() )
{
return saveExtraValue( member, extras, dtxArtifactStore );
return saveExtraValue( member, extras, dtxArtifactStore, changelog );
}

List<String> memberStrList = readListValue( members );
if ( memberStrList == null )
if ( memberStrList == null )
{
return false;
}
Expand All @@ -184,7 +193,7 @@ public boolean addConstituentToGroup( StoreKey key, StoreKey member )
else
{
memberList.add( member );
return saveExtraValue( memberList, extras, dtxArtifactStore );
return saveExtraValue( memberList, extras, dtxArtifactStore, changelog );
}
}

Expand All @@ -201,12 +210,18 @@ private List<String> readListValue( String value )
}
}

private boolean saveExtraValue( Object value, Map<String, String> extras, DtxArtifactStore dtxArtifactStore )
private boolean saveExtraValue( Object value, Map<String, String> extras, DtxArtifactStore dtxArtifactStore,
String changelog )
{
try
{
extras.put( CONSTITUENTS, objectMapper.writeValueAsString( value ) );
dtxArtifactStore.setExtras( extras );

Map<String, String> metas = dtxArtifactStore.getMetadata();
metas.put( METADATA_CHANGELOG, changelog );
dtxArtifactStore.setMetadata( metas );

storeMapper.save( dtxArtifactStore );
return true;
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/commonjava/indy/service/repository/data/cassandra/CassandraStoreUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ public class CassandraStoreUtil
public static final String KEY = "key";
public static final String AFFECTED_STORES = "affectedStores";

public static final String KOJI_PREFIX = "koji-";

public static final int MODULO_VALUE = 10;

public static String getSchemaCreateTableStore( String keySpace )
Expand Down