fin tune change log

Author: zspitzer

apps/download/changelog.cfc

@@ -137,6 +137,26 @@ component {
 			// Determine previous version for changelog range
 			if ( idx lt arrayLen( arguments.arrVersions ) ) {
 				prevVersion = arguments.versions[ arguments.arrVersions[ idx + 1 ] ].version;
+
+				// If current version is a stable release, check if there's an RC/Beta/Alpha with same base version
+				if ( arguments.versions[ _version ].type eq "releases" ) {
+					var baseVersion = listFirst( version, "-" );
+					//systemOutput( "Stable release #version#: looking for RC/Beta/Alpha with base version #baseVersion#, current prevVersion=#prevVersion#", true );
+					// Look through all versions to find RC/Beta/Alpha with matching base
+					loop array=arguments.arrVersions index="local.checkIdx" item="local.checkKey" {
+						var checkVersion = arguments.versions[ checkKey ].version;
+						var checkType = arguments.versions[ checkKey ].type;
+						var checkBase = listFirst( checkVersion, "-" );
+						// If we find an RC/Beta/Alpha with the same base version, use it as prevVersion
+						if ( ( checkType eq "rc" || checkType eq "beta" || checkType eq "alpha" )
+							&& checkBase eq baseVersion ) {
+							//systemOutput( "Found match: #checkVersion# (type=#checkType#, base=#checkBase#), setting as prevVersion", true );
+							prevVersion = checkVersion;
+							break;
+						}
+					}
+					//systemOutput( "Final prevVersion for stable #version# is #prevVersion#", true );
+				}
 			} else {
 				// Last version - use the oldest version from the sorted array (last item)
 				var lastKey = arguments.arrVersions[ arrayLen( arguments.arrVersions ) ];
@@ -157,7 +177,12 @@ component {
 			var changelog = {};
 			var versionReleaseDate = "";
 			if ( left( version, len( arguments.majorVersionFilter ) ) eq arguments.majorVersionFilter ) {
-				changelog = variables.download.getChangelog( prevVersion, version, false, true );
+				// For RC/Beta/Alpha, use the base version (without suffix) as upper bound to include tickets tagged without suffix
+				var changelogVersion = version;
+				if ( arguments.versions[ _version ].type eq "rc" || arguments.versions[ _version ].type eq "beta" || arguments.versions[ _version ].type eq "alpha" ) {
+					changelogVersion = listFirst( version, "-" );
+				}
+				changelog = variables.download.getChangelog( prevVersion, changelogVersion, false, true );
 				versionReleaseDate = variables.download.getReleaseDate( version );
 			}
 
@@ -180,6 +205,61 @@ component {
 		return arrChangeLogs;
 	}
 
+	/**
+	 * Remove duplicate tickets from stable releases that also appear in their RC/Beta/Alpha
+	 * Handles two cases:
+	 * 1. Same base version (e.g., 6.2.3.35 stable and 6.2.3.35-RC)
+	 * 2. Different base version where stable's prevVersion is RC/Beta/Alpha (e.g., 6.2.2.91 stable with prevVersion 6.2.2.90-RC)
+	 * @arrChangeLogs The changelog data array from buildChangelogData
+	 * @returns The deduplicated changelog data array
+	 */
+	function deduplicateStableReleaseTickets( required array arrChangeLogs ) localmode=true {
+		// Build a lookup map by version for quick access
+		versionLookup = {};
+		loop array=arguments.arrChangeLogs index="changelog" {
+			versionLookup[ changelog.version ] = changelog;
+		}
+
+		// Process each stable release
+		loop array=arguments.arrChangeLogs index="changelog" {
+			if ( changelog.type eq "releases" && structCount( changelog.changelog ) > 0 ) {
+				stableRelease = changelog;
+				prevVersion = stableRelease.prevVersion;
+
+				// Check if prevVersion is an RC/Beta/Alpha
+				isPrevRC = ( findNoCase( "-rc", prevVersion ) || findNoCase( "-beta", prevVersion ) || findNoCase( "-alpha", prevVersion ) );
+
+				// If prevVersion is RC/Beta/Alpha and exists in our data, deduplicate
+				if ( isPrevRC && structKeyExists( versionLookup, prevVersion ) ) {
+					rcRelease = versionLookup[ prevVersion ];
+
+					if ( structCount( rcRelease.changelog ) > 0 ) {
+						// Build a list of all ticket IDs in the RC changelog
+						rcTicketIds = {};
+						loop collection=rcRelease.changelog index="ver" item="tickets" {
+							loop collection=tickets index="ticketId" item="ticketData" {
+								rcTicketIds[ ticketId ] = true;
+							}
+						}
+
+						// Remove those tickets from the stable changelog
+						loop collection=stableRelease.changelog index="ver" item="tickets" {
+							ticketsToKeep = {};
+							loop collection=tickets index="ticketId" item="ticketData" {
+								if ( !structKeyExists( rcTicketIds, ticketId ) ) {
+									ticketsToKeep[ ticketId ] = ticketData;
+								}
+							}
+							stableRelease.changelog[ ver ] = ticketsToKeep;
+						}
+					}
+				}
+			}
+		}
+
+		return arguments.arrChangeLogs;
+	}
+
 	/**
 	 * Convert a version string to sortable format (from VersionUtils.cfc logic)
 	 * @version Version string like "7.0.1.44-SNAPSHOT"

apps/download/changelog/index.cfm

@@ -73,6 +73,9 @@
 		// Build changelog data array using the new method
 		arrChangeLogs = changelogService.buildChangelogData( major, arrVersions, url.version );
 
+		// Remove duplicate tickets from stable releases that also appear in their RC/Beta/Alpha
+		arrChangeLogs = changelogService.deduplicateStableReleaseTickets( arrChangeLogs );
+
 		function getBadgeForType( type ) {
 			switch(arguments.type){
 				case "bug":
@@ -227,10 +230,12 @@
 												</div>
 											</cfif>
 											</td>
-											<td style="max-width:250px;" data-fix-versions="#encodeForHtmlAttribute(arrayToList(ticket.fixVersions, ', '))#"
-												title="Fixed in versions: #arrayToList(ticket.fixVersions, ', ')#">
-												<cfloop array="#ticket.fixVersions#" item="fixVersion" index="i">
-													<span data-git-tag="https://github.com/lucee/Lucee/tree/#listFirst(fixVersion, '-')#">#fixVersion#</span><cfif i lt arrayLen(ticket.fixVersions)>, </cfif>
+											<cfset sortedFixVersions = duplicate(ticket.fixVersions)>
+											<cfset sortedFixVersions.sort("text")>
+											<td style="max-width:250px;" data-fix-versions="#encodeForHtmlAttribute(arrayToList(sortedFixVersions, ', '))#"
+												title="Fixed in versions: #arrayToList(sortedFixVersions, ', ')#">
+												<cfloop array="#sortedFixVersions#" item="fixVersion" index="i">
+													<a href="https://github.com/lucee/Lucee/commits/#listFirst(fixVersion, '-')#/" target="_blank" title="View commits for #fixVersion# on GitHub">#fixVersion#</a><cfif i lt arrayLen(sortedFixVersions)>, </cfif>
 												</cfloop>
 											</td>
 										</tr>

tests/testChangelog.cfc

@@ -199,6 +199,62 @@ component extends="org.lucee.cfml.test.LuceeTestCase" labels="data-provider" {
 				expect( result[ 3 ].prevVersion ).toBe( "7.0.0.388-RC" );
 			});
 
+			it( "should use RC as prevVersion for stable release with same base version", function() {
+				var versions = {
+					"06.002.003.0035.100": {
+						"version": "6.2.3.35",
+						"type": "releases"
+					},
+					"06.002.003.0035.075": {
+						"version": "6.2.3.35-RC",
+						"type": "rc"
+					},
+					"06.002.003.0034.100": {
+						"version": "6.2.3.34",
+						"type": "releases"
+					}
+				};
+
+				var arrVersions = [ "06.002.003.0035.100", "06.002.003.0035.075", "06.002.003.0034.100" ];
+
+				var result = changelog.buildChangelogData( versions, arrVersions, "6.2" );
+
+				// Stable 6.2.3.35 should use RC 6.2.3.35-RC as prevVersion, not 6.2.3.34
+				expect( result[ 1 ].version ).toBe( "6.2.3.35" );
+				expect( result[ 1 ].type ).toBe( "releases" );
+				expect( result[ 1 ].prevVersion ).toBe( "6.2.3.35-RC" );
+
+				// RC should use stable 6.2.3.34 as prevVersion
+				expect( result[ 2 ].version ).toBe( "6.2.3.35-RC" );
+				expect( result[ 2 ].type ).toBe( "rc" );
+				expect( result[ 2 ].prevVersion ).toBe( "6.2.3.34" );
+			});
+
+			it( "should use beta as prevVersion for stable release when no RC exists", function() {
+				var versions = {
+					"06.002.003.0035.100": {
+						"version": "6.2.3.35",
+						"type": "releases"
+					},
+					"06.002.003.0035.050": {
+						"version": "6.2.3.35-BETA",
+						"type": "beta"
+					},
+					"06.002.003.0034.100": {
+						"version": "6.2.3.34",
+						"type": "releases"
+					}
+				};
+
+				var arrVersions = [ "06.002.003.0035.100", "06.002.003.0035.050", "06.002.003.0034.100" ];
+
+				var result = changelog.buildChangelogData( versions, arrVersions, "6.2" );
+
+				// Stable 6.2.3.35 should use BETA 6.2.3.35-BETA as prevVersion
+				expect( result[ 1 ].version ).toBe( "6.2.3.35" );
+				expect( result[ 1 ].prevVersion ).toBe( "6.2.3.35-BETA" );
+			});
+
 		});
 	}