tmp #11
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -60,15 +60,19 @@
|
|||
"express-mongo-sanitize": "^2.0.0",
|
||||
"express-rate-limit": "^5.0.0",
|
||||
"form-data": "^4.0.1",
|
||||
"formdata-node": "^6.0.3",
|
||||
"helmet": "^4.1.0",
|
||||
"http-status": "^1.4.0",
|
||||
"install": "^0.13.0",
|
||||
"joi": "^17.3.0",
|
||||
"jsonwebtoken": "^8.5.1",
|
||||
"moment": "^2.24.0",
|
||||
"mongoose": "^8.7.1",
|
||||
"morgan": "^1.9.1",
|
||||
"mysql2": "^3.11.0",
|
||||
"node-fetch": "^3.3.2",
|
||||
"nodemailer": "^6.3.1",
|
||||
"npm": "^11.0.0",
|
||||
"passport": "^0.4.0",
|
||||
"passport-jwt": "^4.0.0",
|
||||
"pm2": "^5.1.0",
|
||||
|
|
|
@ -5,9 +5,9 @@ const gameSchema = new mongoose.Schema({
|
|||
userId: { type: String, required: true },
|
||||
gameID: { type: String, required: true },
|
||||
gameTime: { type: String, required: false },
|
||||
score: { type: String},
|
||||
gameStar: { type: Number},
|
||||
screenshotUrl: { type: String }, // Store the S3 URL of the screenshot
|
||||
});
|
||||
score: { type: String },
|
||||
gameStar: { type: Number },
|
||||
screenshotUrl: { type: String },
|
||||
}, { collection: "gameData" });
|
||||
|
||||
module.exports = mongoose.model("Game", gameSchema);
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
const mongoose = require('mongoose');
|
||||
|
||||
// Define the GalleryImage schema
|
||||
const galleryImageSchema = new mongoose.Schema({
|
||||
userId: { type: mongoose.Schema.Types.ObjectId, ref: 'User', required: true }, // Assuming you have a User model
|
||||
gameName: { type: String, required: true },
|
||||
gameID: { type: String, required: true },
|
||||
screenshotUrl: { type: String, required: true },
|
||||
message: { type: String, default: 'Image received' },
|
||||
}, { timestamps: true });
|
||||
|
||||
// Check if the model already exists in mongoose.models
|
||||
const GalleryImage = mongoose.models.GalleryImage || mongoose.model('GalleryImage', galleryImageSchema);
|
||||
|
||||
module.exports = GalleryImage;
|
|
@ -0,0 +1,10 @@
|
|||
const mongoose = require("mongoose");
|
||||
|
||||
const galleryImageScema = new mongoose.Schema({
|
||||
gameName: { type: String, required: true },
|
||||
userId: { type: String, required: true },
|
||||
gameID: { type: String, required: true },
|
||||
screenshotUrl: { type: String },
|
||||
});
|
||||
|
||||
module.exports = mongoose.model("GalleryImage", galleryImageScema);
|
|
@ -0,0 +1,21 @@
|
|||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
function base64ToImageFile(base64, fileName) {
|
||||
const matches = base64.match(/^data:(.+);base64,(.+)$/);
|
||||
if (!matches) {
|
||||
throw new Error("Invalid Base64 string");
|
||||
}
|
||||
|
||||
const mimeType = matches[1]; // e.g., image/png
|
||||
const base64Data = matches[2]; // Actual base64 string
|
||||
|
||||
const buffer = Buffer.from(base64Data, 'base64');
|
||||
const filePath = path.join(__dirname, fileName);
|
||||
|
||||
fs.writeFileSync(filePath, buffer);
|
||||
|
||||
return filePath;
|
||||
}
|
||||
|
||||
module.exports = { base64ToImageFile };
|
|
@ -0,0 +1,36 @@
|
|||
const GalleryImage = require('../../models/getGalleyImage');
|
||||
|
||||
const getGalleryImage = async (req, res) => {
|
||||
try {
|
||||
// Extract query parameters for filtering (if provided)
|
||||
const { gameName, userId, gameID} = req.query;
|
||||
|
||||
// Build a filter object based on the query parameters
|
||||
const filter = {};
|
||||
|
||||
if (gameName) {
|
||||
filter.gameName = gameName;
|
||||
}
|
||||
|
||||
if (userId) {
|
||||
filter.userId = userId;
|
||||
}
|
||||
if (gameID) {
|
||||
filter.gameID = gameID;
|
||||
}
|
||||
|
||||
// Fetch gallery images with filters and selected fields
|
||||
const galleryImages = await GalleryImage.find(filter).select('gameName userId gameID screenshotUrl'); // Select only these fields
|
||||
|
||||
if (!galleryImages.length) {
|
||||
return res.status(404).json({ message: 'No images found' });
|
||||
}
|
||||
|
||||
return res.status(200).json(galleryImages); // Return the filtered gallery images with selected fields
|
||||
} catch (error) {
|
||||
console.error('Error fetching images:', error.message);
|
||||
return res.status(500).json({ error: 'Something went wrong' });
|
||||
}
|
||||
};
|
||||
|
||||
module.exports = getGalleryImage;
|
|
@ -0,0 +1,78 @@
|
|||
const GalleryImage = require('../../models/imageGallery');
|
||||
const axios = require('axios');
|
||||
const FormData = require('form-data'); // Import form-data for Node.js
|
||||
|
||||
const saveGalleryImage = async (req, res) => {
|
||||
try {
|
||||
const { userId, gameName, gameID, screenShot } = req.body;
|
||||
|
||||
// Validate base64 format
|
||||
const isValidBase64 = validateBase64(screenShot);
|
||||
if (!isValidBase64) {
|
||||
return res.status(400).json({ error: 'Invalid base64 image data' });
|
||||
}
|
||||
|
||||
// Extract image details
|
||||
const imageData = extractImageDataFromBase64(screenShot);
|
||||
const contentType = imageData.contentType || 'image/jpeg'; // Default to JPEG
|
||||
|
||||
// Convert base64 to buffer
|
||||
const buffer = Buffer.from(screenShot.replace(/^data:image\/(png|jpg|jpeg);base64,/, ''), 'base64');
|
||||
|
||||
// Create FormData
|
||||
const formData = new FormData();
|
||||
formData.append('file1', buffer, { filename: 'screenshot.jpg', contentType });
|
||||
formData.append('folder', 'gameGallery');
|
||||
formData.append('bucket', 'polly-bs');
|
||||
|
||||
// Upload image to external API using axios
|
||||
const uploadResponse = await axios.post(
|
||||
'https://preschool-curriculum.in/api/one/v1/file/upload',
|
||||
formData,
|
||||
{
|
||||
headers: {
|
||||
...formData.getHeaders(), // Add form-data headers like Content-Type boundary
|
||||
// Add any necessary authentication headers if required
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
if (uploadResponse.status !== 200) {
|
||||
throw new Error('Image upload failed: ' + uploadResponse.statusText);
|
||||
}
|
||||
|
||||
// Extract and store the uploaded image URL from the response
|
||||
const screenshotUrl = uploadResponse.data.urls[0];
|
||||
|
||||
// Create and save gallery image data
|
||||
const galleryImageData = new GalleryImage({
|
||||
userId,
|
||||
gameName,
|
||||
gameID,
|
||||
screenshotUrl,
|
||||
message: 'Image received',
|
||||
});
|
||||
await galleryImageData.save();
|
||||
|
||||
return res.status(200).json(galleryImageData);
|
||||
} catch (error) {
|
||||
console.error('Error:', error.message);
|
||||
return res.status(500).json({ error: 'Something went wrong' });
|
||||
}
|
||||
};
|
||||
|
||||
// Validate base64 image
|
||||
function validateBase64(base64String) {
|
||||
const regex = /^data:image\/(png|jpg|jpeg);base64,/;
|
||||
return regex.test(base64String);
|
||||
}
|
||||
|
||||
// Extract image data (like content type) from base64 string
|
||||
function extractImageDataFromBase64(base64String) {
|
||||
const matches = base64String.match(/^data:image\/(png|jpg|jpeg);base64,/);
|
||||
return {
|
||||
contentType: matches ? `image/${matches[1]}` : 'image/jpeg',
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = saveGalleryImage;
|
|
@ -1,4 +1,5 @@
|
|||
const AWS = require("aws-sdk");
|
||||
const mongoose = require("mongoose");
|
||||
const Game = require("../../models/gameModel");
|
||||
|
||||
const s3 = new AWS.S3({
|
||||
|
@ -7,12 +8,27 @@ const s3 = new AWS.S3({
|
|||
region: process.env.AWS_REGION,
|
||||
});
|
||||
|
||||
// MongoDB Connection
|
||||
const mongoURI = process.env.MONGODB_URL;
|
||||
const dbName = process.env.MONGO_DB_NAME;
|
||||
|
||||
mongoose.connect(mongoURI, {
|
||||
dbName: dbName,
|
||||
useNewUrlParser: true,
|
||||
useUnifiedTopology: true,
|
||||
})
|
||||
.then(() =>
|
||||
console.log("Connected to MongoDB"))
|
||||
.catch((err) => console.error("MongoDB connection error:", err));
|
||||
|
||||
const saveGameScore2 = async (req, res) => {
|
||||
const { userId, gameName, gameID, gameTime, score, gameStar, screenShot } = req.body;
|
||||
|
||||
try {
|
||||
if (!gameName || !userId || !gameID) {
|
||||
return res.status(400).json({ error: "Missing required fields" });
|
||||
}
|
||||
|
||||
const newGame = new Game({
|
||||
gameName,
|
||||
userId,
|
||||
|
@ -21,21 +37,26 @@ const saveGameScore2 = async (req, res) => {
|
|||
score,
|
||||
gameStar,
|
||||
});
|
||||
|
||||
// Save to MongoDB
|
||||
const result = await newGame.save();
|
||||
// Upload screenshot to S3 if provided
|
||||
if (screenShot) {
|
||||
let base64Image = screenShot.split(";base64,").pop();
|
||||
const buffer = Buffer.from(base64Image, 'base64');
|
||||
// const buffer = Buffer.from(screenShot, "base64");
|
||||
let base64Image = screenShot.split(";base64,").pop();
|
||||
const buffer = Buffer.from(base64Image, "base64");
|
||||
|
||||
const uploadParams = {
|
||||
Bucket: process.env.S3_BUCKET_NAME,
|
||||
Key: `images/${result._id}.png`,
|
||||
Body: buffer,
|
||||
ContentType: "image/png",
|
||||
};
|
||||
|
||||
const s3Response = await s3.upload(uploadParams).promise();
|
||||
newGame.screenshotUrl = s3Response.Location;
|
||||
await newGame.save();
|
||||
}
|
||||
|
||||
res.status(200).json({
|
||||
message: "Game data saved successfully",
|
||||
data: newGame,
|
||||
|
|
|
@ -31,7 +31,10 @@ const aiMarkDrawing = require("../api/aiMarkDrawing");
|
|||
const aiFeedbackOnReportWithFollowup = require("../api/aiFeedbackOnReportWithFollowup");
|
||||
const aiTextToSpeech = require("../api/aiTextToSpeech");
|
||||
const aiEvaluateImageToStar = require("../api/aiEvaluateImageToStar");
|
||||
|
||||
const getGameInfo = require("../api/getGameInfo");
|
||||
const saveGalleryImage = require("../api/saveGalleryImage");
|
||||
const getGalleryImage = require("../api/getGalleryImage");
|
||||
const aiTest = require("../api/aiTest");
|
||||
|
||||
|
||||
const router = express.Router();
|
||||
|
@ -190,8 +193,26 @@ router.get("/ping", (req, res) => {
|
|||
router.post("/aiEvaluateImageToStar", (req, res) => {
|
||||
aiEvaluateImageToStar(req, res);
|
||||
});
|
||||
|
||||
|
||||
// getGameInfo.
|
||||
router.get("/getGameInfo", (req, res) => {
|
||||
getGameInfo(req, res);
|
||||
});
|
||||
|
||||
// Save Drawing Game Gallery Image
|
||||
router.post("/saveGalleryImage", (req, res) => {
|
||||
saveGalleryImage(req, res);
|
||||
});
|
||||
|
||||
// Get Drawing Game Gallery Image
|
||||
router.get("/getGalleryImage", (req, res) => {
|
||||
getGalleryImage(req, res);
|
||||
});
|
||||
|
||||
// Get Drawing Game Gallery Image
|
||||
router.post("/aiTest", (req, res) => {
|
||||
aiTest(req, res);
|
||||
});
|
||||
|
||||
|
||||
module.exports = router;
|
||||
|
|
Loading…
Reference in New Issue