Updating assessment api response object in SQL Migration (#16334)

* Modifying the get assessments  api to match the new specs

* fixing property name

* Updating sts version

extensions/mssql/config.json

@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "3.0.0-release.111",
+	"version": "3.0.0-release.115",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net5.0.zip",
 		"Windows_64": "win-x64-net5.0.zip",

extensions/mssql/src/contracts.ts

@@ -1014,17 +1014,12 @@ export namespace ProfilerSessionCreatedNotification {
 // ------------------------------- < SQL Profiler > ------------------------------------
 
 /// ------------------------------- <Sql Migration> -----------------------------
-
-export interface SqlAssessmentResult extends azdata.ResultStatus {
-	items: mssql.SqlMigrationAssessmentResultItem[];
-}
-
 export interface SqlMigrationAssessmentParams {
 	ownerUri: string;
 }
 
 export namespace GetSqlMigrationAssessmentItemsRequest {
-	export const type = new RequestType<SqlAssessmentParams, SqlAssessmentResult, void, void>('migration/getassessments');
+	export const type = new RequestType<SqlAssessmentParams, mssql.AssessmentResult, void, void>('migration/getassessments');
 }
 
 // ------------------------------- <Sql Migration> -----------------------------

extensions/mssql/src/mssql.d.ts

@@ -542,10 +542,62 @@ export interface SqlMigrationAssessmentResultItem {
 	impactedObjects: SqlMigrationImpactedObjectInfo[];
 }
 
-export interface SqlMigrationAssessmentResult extends azdata.ResultStatus {
+export interface ServerTargetReadiness {
+	numberOfDatabasesReadyForMigration: number;
+	numberOfNonOnlineDatabases: number;
+	totalNumberOfDatabases: number;
+}
+
+export interface ErrorModel {
+	errorId: number;
+	message: string;
+	errorSummary: string;
+	possibleCauses: string;
+	guidance: string;
+}
+
+export interface DatabaseTargetReadiness {
+	noSelectionForMigration: boolean;
+	numOfBlockerIssues: number;
+}
+
+export interface DatabaseAssessmentProperties {
+	compatibilityLevel: string;
+	databaseSize: number;
+	isReplicationEnabled: boolean;
+	assessmentTimeInMilliseconds: number;
 	items: SqlMigrationAssessmentResultItem[];
+	errors: ErrorModel[];
+	sqlManagedInstanceTargetReadiness: DatabaseTargetReadiness;
+	name: string;
+}
+
+export interface ServerAssessmentProperties {
+	cpuCoreCount: number;
+	physicalServerMemory: number;
+	serverHostPlatform: string;
+	serverVersion: string;
+	serverEngineEdition: string;
+	serverEdition: string;
+	isClustered: boolean;
+	numberOfUserDatabases: number;
+	sqlAssessmentStatus: number;
+	assessedDatabaseCount: number;
+	sqlManagedInstanceTargetReadiness: ServerTargetReadiness;
+	items: SqlMigrationAssessmentResultItem[];
+	errors: ErrorModel[];
+	databases: DatabaseAssessmentProperties[];
+	name: string;
+}
+
+export interface AssessmentResult {
+	startedOn: string;
+	endedOn: string;
+	assessmentResult: ServerAssessmentProperties;
+	rawAssessmentResult: any;
+	errors: ErrorModel[];
 }
 
 export interface ISqlMigrationService {
-	getAssessments(ownerUri: string): Promise<SqlMigrationAssessmentResult | undefined>;
+	getAssessments(ownerUri: string): Promise<AssessmentResult | undefined>;
 }

extensions/mssql/src/sqlMigration/sqlMigrationService.ts

@@ -29,7 +29,7 @@ export class SqlMigrationService implements mssql.ISqlMigrationService {
 		context.registerService(constants.SqlMigrationService, this);
 	}
 
-	async getAssessments(ownerUri: string): Promise<mssql.SqlMigrationAssessmentResult | undefined> {
+	async getAssessments(ownerUri: string): Promise<mssql.AssessmentResult | undefined> {
 		let params: contracts.SqlMigrationAssessmentParams = { ownerUri: ownerUri };
 		try {
 			return this.client.sendRequest(contracts.GetSqlMigrationAssessmentItemsRequest.type, params);

extensions/sql-migration/src/models/stateMachine.ts

@@ -176,30 +176,17 @@ export class MigrationStateModel implements Model, vscode.Disposable {
 		const assessmentResults = await this.migrationService.getAssessments(
 			ownerUri
 		);
-
 		this._serverDatabases = await (await azdata.connection.listDatabases(this.sourceConnectionId)).filter((name) => !excludeDbs.includes(name));
-		const serverLevelAssessments: mssql.SqlMigrationAssessmentResultItem[] = [];
+		const dbAssessments = assessmentResults?.assessmentResult.databases.filter(d => !excludeDbs.includes(d.name)).map(d => {
-		const databaseLevelAssessments = this._serverDatabases.map(db => {
 			return {
-				name: db,
+				name: d.name,
-				issues: <mssql.SqlMigrationAssessmentResultItem[]>[]
+				issues: d.items.filter(i => i.appliesToMigrationTargetPlatform === MigrationTargetType.SQLMI) ?? []
 			};
 		});
 
-		assessmentResults?.items.forEach((item) => {
-			if (item.appliesToMigrationTargetPlatform === MigrationTargetType.SQLMI) {
-				const dbIndex = this._serverDatabases.indexOf(item.databaseName);
-				if (dbIndex === -1) {
-					serverLevelAssessments.push(item);
-				} else {
-					databaseLevelAssessments[dbIndex].issues.push(item);
-				}
-			}
-		});
-
 		this._assessmentResults = {
-			issues: serverLevelAssessments,
+			issues: assessmentResults?.assessmentResult.items?.filter(i => i.appliesToMigrationTargetPlatform === MigrationTargetType.SQLMI) ?? [],
-			databaseAssessments: databaseLevelAssessments
+			databaseAssessments: dbAssessments! ?? []
 		};
 
 		return this._assessmentResults;