Skip to content

GitLab

Commit e03d9e2b authored by Theis's avatar Theis
Browse files

Minor code adjustments

parent 364d370d
Pipeline #100677 passed with stage
in 4 minutes and 2 seconds
Hide whitespace changes
Inline Side-by-side
web/api/server.js
View file @ e03d9e2b
......@@ -10,23 +10,23 @@ const app = express();
app.use(express.static(path));
const prisma = new PrismaClient()
const prisma = new PrismaClient();
app.use(cors(corsOptions));
app.use(express.json());
app.use(express.urlencoded({ extended: true }));
var corsOptions = {
origin: "http://localhost:8081"
origin: "http://localhost:8081";
};
/*var corsOptions = {
origin: "https://air-app.azurewebsites.net"
origin: "https://air-app.azurewebsites.net";
};*/
const log = bunyan.createLogger({ name: "AIR_UI_Backend: " });
const predictionURL_training = 'https://air-fastapi.azurewebsites.net/predict_training'
const predictionURL_alarm = 'https://air-fastapi.azurewebsites.net/predict_alarm'
const predictionURL_training = 'https://air-fastapi.azurewebsites.net/predict_training';
const predictionURL_alarm = 'https://air-fastapi.azurewebsites.net/predict_alarm';
async function deleteVariable(variablesMarkedForDeletion) {
variablesMarkedForDeletion.forEach(element => {
......@@ -36,15 +36,15 @@ async function deleteVariable(variablesMarkedForDeletion) {
}
function convertDataSizeToKb(logMessage, data) {
const datasizeInKb = (new TextEncoder().encode(JSON.stringify(data)).length) / 1024
console.log(logMessage, datasizeInKb)
const datasizeInKb = (new TextEncoder().encode(JSON.stringify(data)).length) / 1024;
console.log(logMessage, datasizeInKb);
}
function dataPreparationForML(age, gender, assistiveAids, loanPeriod) {
const Gender = gender == 'Mand' ? 1 : 0
const BirthYear = (new Date().getFullYear() - age)
const LoanPeriod = loanPeriod
const Ats = assistiveAids
const Gender = gender == 'Mand' ? 1 : 0;
const BirthYear = (new Date().getFullYear() - age);
const LoanPeriod = loanPeriod;
const Ats = assistiveAids;
return {
"Gender": Gender,
......@@ -58,18 +58,18 @@ async function getCompleteTrainingPrediction(inputForCompleteTrainingPrediction)
predictionResult = axios.post(predictionURL_training, inputForCompleteTrainingPrediction).then(result => {
return result.data;
}).catch(error => {
log.error("getCompleteTrainingPrediction() threw an exception: ", error)
log.error("getCompleteTrainingPrediction() threw an exception: ", error);
})
return predictionResult
return predictionResult;
}
async function getAlarmPrediction(inputForAlarmPrediction) {
predictionResult = axios.post(predictionURL_alarm, inputForAlarmPrediction).then(result => {
return result.data;
}).catch(error => {
log.error("getAlarmPrediction() threw an exception: ", error)
log.error("getAlarmPrediction() threw an exception: ", error);
})
return predictionResult
return predictionResult;
}
async function getCitizenInformation(citizenSSN) {
......@@ -121,13 +121,13 @@ app.get('/', function (req, res) {
app.post("/home/:ssn", async (req, res) => {
var citizenData = await getCitizenInformation(req.body.citizenSSN);
if (!citizenData || citizenData.Assistive_Aids.length == 0) {
await deleteVariable([citizenData])
res.send(false)
await deleteVariable([citizenData]);
res.send(false);
} else {
//Format and Sort Assistive Aids Data from Database
var assistiveAidsWithCorrectDateFormat = changeLendDateFormat(citizenData.Assistive_Aids)
var sortedAssistiveAids = sortAssistiveAidsByDate(assistiveAidsWithCorrectDateFormat)
var assistiveAidsWithCorrectDateFormat = changeLendDateFormat(citizenData.Assistive_Aids);
var sortedAssistiveAids = sortAssistiveAidsByDate(assistiveAidsWithCorrectDateFormat);
//Case Complete Training
var assistiveAidsTraining = appendAssistiveAidsISO(sortedAssistiveAids);
......@@ -145,8 +145,10 @@ app.post("/home/:ssn", async (req, res) => {
var citizenCompleteTrainingPrediction = await getCompleteTrainingPrediction(inputForCompleteTrainingPrediction);
var citizenAlarmPrediction = await getAlarmPrediction(inputForAlarmPrediction);
convertDataSizeToKb("Combined datasize from both the ML Model and Database in Kb: ", { citizenData, citizenCompleteTrainingPrediction, citizenAlarmPrediction })
res.json({ citizenData, citizenCompleteTrainingPrediction, citizenAlarmPrediction })
convertDataSizeToKb("Combined datasize from both the ML Model and Database in Kb: ", { citizenData, citizenCompleteTrainingPrediction, citizenAlarmPrediction });
res.json({ citizenData, citizenCompleteTrainingPrediction, citizenAlarmPrediction });
await deleteVariable([
citizenData,
assistiveAidsWithCorrectDateFormat,
......@@ -157,32 +159,32 @@ app.post("/home/:ssn", async (req, res) => {
inputForAlarmPrediction,
citizenCompleteTrainingPrediction,
citizenAlarmPrediction
])
]);
}
});
function changeLendDateFormat(assistiveAids) {
assistiveAids.forEach(function(assistiveAid) {
assistiveAid.lend_date = rearrangeDateFormat(assistiveAid.lend_date)
assistiveAid.lend_date = rearrangeDateFormat(assistiveAid.lend_date);
});
return assistiveAids
return assistiveAids;
}
function rearrangeDateFormat(date) {
var dateInArray = date.split('/');
var day = dateInArray[0]
var month = dateInArray[1]
var year = dateInArray[2]
var rearrangedDateFormat = month + '/' + day + '/' + '20' + year
return rearrangedDateFormat
var day = dateInArray[0];
var month = dateInArray[1];
var year = dateInArray[2];
var rearrangedDateFormat = month + '/' + day + '/' + '20' + year;
return rearrangedDateFormat;
}
function sortAssistiveAidsByDate(assistiveAids){
if(assistiveAids.length == 1) {
return sortedAssistiveAids;
} else {
var sortedAssistiveAids = assistiveAids.sort((a, b) => new Date(b.lend_date) - new Date(a.lend_date))
sortedAssistiveAids.reverse()
var sortedAssistiveAids = assistiveAids.sort((a, b) => new Date(b.lend_date) - new Date(a.lend_date));
sortedAssistiveAids.reverse();
return sortedAssistiveAids;
}
}
......@@ -193,7 +195,7 @@ function removeAlarmFromAssistiveAidsList(assistiveAids) {
assistiveAids.splice(i, 1);
}
}
return assistiveAids
return assistiveAids;
}
function appendAssistiveAidsISO(assistiveAids) {
......@@ -213,17 +215,17 @@ function appendAssistiveAidsISO(assistiveAids) {
function calculateMeanLoanPeriod(assistiveAids){
var assistiveAidsLoanPeriod = 0;
assistiveAids.forEach(function(assistiveAid) {
assistiveAidsLoanPeriod += dateDifferenceInDays(assistiveAid.lend_date)
assistiveAidsLoanPeriod += dateDifferenceInDays(assistiveAid.lend_date);
});
var assistiveAidsMeanLoanPeriod = (assistiveAidsLoanPeriod / assistiveAids.length)
var assistiveAidsMeanLoanPeriod = (assistiveAidsLoanPeriod / assistiveAids.length);
return Math.round(assistiveAidsMeanLoanPeriod);
}
function dateDifferenceInDays(assistiveAidLendDate) {
var nowDate = new Date();
var lendDate = new Date(assistiveAidLendDate);
var differenceInTime = nowDate.getTime() - lendDate.getTime()
var oneDayInMilliseconds = 1000*3600*24
var differenceInTime = nowDate.getTime() - lendDate.getTime();
var oneDayInMilliseconds = 1000*3600*24;
return Math.round(((differenceInTime))/(oneDayInMilliseconds) - 1);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment