cleaning up server side

Signed-off-by: mo <mcassidy@hchb.com>
This commit is contained in:
mo
2022-05-02 11:40:23 -05:00
parent 5f1a43c854
commit 75b0a51d1a
2 changed files with 9 additions and 31 deletions
@@ -129,18 +129,13 @@ export class AzureDevOpsApi {
public async getGitTags(
projectName: string,
repoName: string,
options: PullRequestOptions,
): Promise<PullRequest[]> {
): Promise<GitTag[]> {
this.logger?.debug(
`Calling Azure DevOps REST API, getting up to ${options.top} Pull Requests for Repository ${repoName} for Project ${projectName}`,
`Calling Azure DevOps REST API, getting Git Tags for Repository ${repoName} for Project ${projectName}`,
);
const gitRepository = await this.getGitRepository(projectName, repoName);
const client = await this.webApi.getGitApi();
const searchCriteria: GitPullRequestSearchCriteria = {
status: options.status,
};
const tagRefs: GitRef[] = await client.getRefs(
gitRepository.id as string,
projectName,
@@ -151,11 +146,9 @@ export class AzureDevOpsApi {
false,
true,
);
this.logger?.warn(JSON.stringify(tagRefs));
const linkBaseUrl = `${this.webApi.serverUrl}/${encodeURIComponent(
projectName,
)}/_git/${encodeURIComponent(repoName)}/pullrequest`;
)}/_git/${encodeURIComponent(repoName)}?version=GT`;
const gitTags: GitTag[] = tagRefs.map(tagRef => {
return mappedGitTag(tagRef, linkBaseUrl);
});
@@ -403,9 +396,11 @@ export function mappedGitTag(gitRef: GitRef, linkBaseUrl: string): GitTag {
return {
objectId: gitRef.objectId,
peeledObjectId: gitRef.peeledObjectId,
name: gitRef.name,
name: gitRef.name?.replace('refs/tags/', ''),
createdBy: gitRef.creator?.displayName ?? 'N/A',
link: `${linkBaseUrl}/5`,
link: `${linkBaseUrl}${encodeURIComponent(
gitRef.name?.replace('refs/tags/', '') ?? '',
)}`,
};
}
@@ -99,25 +99,8 @@ export async function createRouter(
router.get('/git-tags/:projectName/:repoName', async (req, res) => {
const { projectName, repoName } = req.params;
const top = req.query.top ? Number(req.query.top) : DEFAULT_TOP;
const status = req.query.status
? Number(req.query.status)
: PullRequestStatus.Active;
const pullRequestOptions: PullRequestOptions = {
top: top,
status: status,
};
const gitPullRequest = await azureDevOpsApi.getGitTags(
projectName,
repoName,
pullRequestOptions,
);
res.status(200).json(gitPullRequest);
const gitTags = await azureDevOpsApi.getGitTags(projectName, repoName);
res.status(200).json(gitTags);
});
router.get('/pull-requests/:projectName/:repoName', async (req, res) => {