Skip to content
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.

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

Store user feedback in db #798

Merged
merged 8 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
8 changes: 8 additions & 0 deletions TestResultSummaryService/Database.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,13 @@ class UserDB extends Database {
}
}

class FeedbackDB extends Database {
constructor() {
super();
this.col = db.collection('feedback');
}
}

module.exports = {
TestResultsDB,
OutputDB,
Expand All @@ -343,4 +350,5 @@ module.exports = {
AuditLogsDB,
UserDB,
ObjectID,
FeedbackDB,
};
1 change: 1 addition & 0 deletions TestResultSummaryService/routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@ app.post('/getParentSpecificData', wrap(require('./getParentSpecificData')));
app.post('/getSpecificData', wrap(require('./getSpecificData')));
app.post('/upsertBuildList', wrap(require('./upsertBuildList')));
app.post('/postTapFiles', wrap(require('./postTapFiles')));
app.post('/postIssueFeedback', wrap(require('./postIssueFeedback')));

module.exports = app;
92 changes: 92 additions & 0 deletions TestResultSummaryService/routes/postIssueFeedback.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
const fs = require('fs').promises;
const {
FeedbackDB,
OutputDB,
ObjectID,
TestResultsDB,
} = require('../Database');

async function getTestResultData(testId) {
try {
const testResultsDB = new TestResultsDB();
const result = await testResultsDB.getTestById(testId);
const data = result[0];
return {
testOutputId: data.tests.testOutputId,
buildUrl: data.buildUrl,
buildNum: data.buildNum,
};
} catch (error) {
throw error;
}
}

function generateOutputFilename(testName, buildName, buildUrl, buildNum) {
const domain = new URL(buildUrl).hostname;
const fileName = `${testName}_${buildName}_${buildNum}_${domain}.txt`;

return fileName;
}

async function getTestOutput(testId) {
try {
const outputDB = new OutputDB();
const testResultData = await getTestResultData(testId);
const result = await outputDB
.getData({ _id: new ObjectID(testResultData.testOutputId) })
.toArray();
return {
...testResultData,
testOutput: result[0].output,
};
} catch (error) {
throw error;
}
}

async function writeTestOutputToFile(testOutput, fileName) {
try {
const outputPath = `${__dirname}/../../MachineLearningPrototype/data/JenkinsDataWithFeedback/${fileName}`;
await fs.writeFile(outputPath, testOutput);
Fixed Show fixed Hide fixed
} catch (error) {
throw error;
}
}

module.exports = async (req, res) => {
try {
const db = new FeedbackDB();
const {
repoName,
issueName,
issueCreator,
testId,
testName,
buildName,
issueNumber,
accuracy,
} = req.body;
const { testOutput, buildUrl, buildNum } = await getTestOutput(testId);
const outputFileName = generateOutputFilename(
testName,
buildName,
buildUrl,
buildNum
);
await writeTestOutputToFile(testOutput, outputFileName);
await db.populateDB({
repoName,
issueName,
issueCreator,
issueNumber,
testName,
testId,
testOutput: outputFileName,
accuracy,
});

res.send({ result: 'Feedback recorded' });
} catch (error) {
res.status(500).send({ error: "Couldn't record feedback" });
}
};
63 changes: 49 additions & 14 deletions test-result-summary-client/src/Build/PossibleIssues.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { getParams } from '../utils/query';
import { fetchData } from '../utils/Utils';
import { SmileOutlined, FrownOutlined } from '@ant-design/icons';
import { useLocation } from 'react-router-dom';
import { notification } from 'antd';

import './table.css';

Expand All @@ -18,21 +19,48 @@ const PossibleIssues = () => {
fetchIssues();
}, []);

const getUserFeedback = async (
const storeIssueFeedback = async (
repoName,
buildName,
issueName,
issueNumber,
issueCreator,
testName,
testId,
accuracy
) => {
const feedback = await fetchData(
`/api/getFeedbackUrl?repoName=${repoName}&buildName=${buildName}&issueName=${issueName}&issueCreator=${issueCreator}&accuracy=${accuracy}`
);
try {
const postData = {
method: 'POST',
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
body: JSON.stringify({
repoName,
buildName,
issueName,
issueNumber,
issueCreator,
accuracy,
testName,
testId,
}),
};

if (feedback.error) {
console.log(feedback.error);
} else {
console.log(feedback.output.result);
const response = await fetch(`/api/postIssueFeedback`, postData);

if (response.status === 200) {
notification.success({
message: 'Feedback collected',
});
} else {
throw new Error('Write error');
}
} catch (error) {
notification.error({
message: 'Unable to collect feedback',
});
}
};

Expand Down Expand Up @@ -125,17 +153,21 @@ const PossibleIssues = () => {
);
const issueState = relatedIssues.items[index].state;
const issueFullName = relatedIssues.items[index].title;
const issueNumber = relatedIssues.items[index].number;
const creatorName = relatedIssues.items[index].user.login;
const userFeedback = (
<>
<Button
onClick={() =>
getUserFeedback(
onClick={async () =>
await storeIssueFeedback(
repoName,
buildName,
issueFullName,
issueNumber,
creatorName,
true
testName,
testId,
1
)
}
>
Expand All @@ -145,13 +177,16 @@ const PossibleIssues = () => {
</Button>
&nbsp;
<Button
onClick={() =>
getUserFeedback(
onClick={async () =>
await storeIssueFeedback(
repoName,
buildName,
issueFullName,
issueNumber,
creatorName,
false
testName,
testId,
0
)
}
>
Expand Down