Battlesnake/microservices
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added complete api functionality

Browse source
This commit is contained in:
JBB0807 2025-04-29 12:01:10 -07:00
parent 956ede5619
commit 24bd570795
13 changed files with 205 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assignment-db-service/DockerfileDEV
View file

@ -20,7 +20,7 @@ COPY package*.json ./
RUN npm install && npx prisma generate
# Rebuild bcrypt specifically (optional if clean install is guaranteed)
RUN npm rebuild bcrypt --build-from-source
# RUN npm rebuild bcrypt --build-from-source
# Expose the application port
EXPOSE 3200

137
assignment-db-service/app.js
View file

@ -1,6 +1,6 @@
const express = require('express');
const { PrismaClient } = require('@prisma/client');
const bcrypt = require('bcrypt');
const express = require("express");
const { PrismaClient } = require("@prisma/client");
const bcrypt = require("bcrypt");
const app = express();
const prisma = new PrismaClient();
@ -10,117 +10,150 @@ const port = process.env.NODE_PORT || 3000;
app.use(express.json());
app.use(express.urlencoded({ extended: true }));
//function to conver req.body to assignment
function convertToAssignment(req) {
const {
campid,
programid,
studentname,
snakegameid,
originalfile,
editablefile,
assignmenturl,
password,
instructorid
} = req.body;
// const hashedPassword = await bcrypt.hash(Password, 10);
return {
campid: campid,
programid: programid,
studentname: studentname,
snakegameid: snakegameid,
originalfile: originalfile,
editablefile: editablefile,
assignmenturl: assignmenturl,
// passwordhash: hashedpassword,
passwordhash: password,
instructorid: instructorid,
};
}
// Create Assignment
app.post('/assignments', async (req, res) => {
app.post("/assignments", async (req, res) => {
try {
const {
CampID,
ProgramID,
StudentName,
SnakeGameId,
OriginalFile,
EditableFile,
AssignmentUrl,
Password,
InstructorID,
} = req.body;
console.log("Request body:", req.body);
const hashedPassword = await bcrypt.hash(Password, 10);
// const {
// campid,
// programid,
// studentname,
// snakegameid,
// originalfile,
// editablefile,
// assignmenturl,
// password,
// instructorid
// } = req.body;
const newAssignment = await prisma.assignment.create({
// const hashedPassword = await bcrypt.hash(Password, 10);
const newAssignment = await prisma.assignments.create({
data: {
CampID,
ProgramID,
StudentName,
SnakeGameId,
OriginalFile,
EditableFile,
AssignmentUrl,
PasswordHash: hashedPassword,
InstructorID,
...convertToAssignment(req)
},
});
res.json({ message: 'Assignment created successfully', assignment: newAssignment });
console.log("Assignment created successfully:", newAssignment);
res.json({
message: "Assignment created successfully",
assignment: newAssignment,
});
} catch (err) {
console.error('Error creating assignment:', err.message);
console.error("Error creating assignment:", err.message);
res.status(500).json({ error: err.message });
}
});
// Get Assignments by InstructorID
app.get('/assignments/instructor/:instructorId', async (req, res) => {
app.get("/assignments/instructor/:instructorId", async (req, res) => {
try {
const { instructorId } = req.params;
const assignments = await prisma.assignment.findMany({
where: { InstructorID: parseInt(instructorId) },
console.log("InstructorID:", instructorId);
const assignments = await prisma.assignments.findMany({
where: { instructorid: parseInt(instructorId) },
});
if (assignments.length === 0) {
return res.status(404).json({ message: 'No assignments found for this instructor' });
return res
.status(404)
.json({ message: "No assignments found for this instructor" });
}
res.json(assignments);
} catch (err) {
console.error('Error fetching assignments:', err.message);
console.error("Error fetching assignments:", err.message);
res.status(500).json({ error: err.message });
}
});
// Read Assignment
app.get('/assignments/:id', async (req, res) => {
app.get("/assignments/:id", async (req, res) => {
try {
const assignment = await prisma.assignment.findUnique({
where: { AssignmentID: parseInt(req.params.id) },
const assignment = await prisma.assignments.findUnique({
where: { assignmentid: parseInt(req.params.id) },
});
if (!assignment) {
return res.status(404).json({ message: 'Assignment not found' });
return res.status(404).json({ message: "Assignment not found" });
}
res.json(assignment);
} catch (err) {
console.error('Error fetching assignment:', err.message);
console.error("Error fetching assignment:", err.message);
res.status(500).json({ error: err.message });
}
});
// Update Assignment
app.put('/assignments/:id', async (req, res) => {
app.put("/assignments/:id", async (req, res) => {
try {
const { id } = req.params;
const data = req.body;
if (data.Password) {
data.PasswordHash = await bcrypt.hash(data.Password, 10);
delete data.Password;
if (data.password) {
// data.passwordhash = await bcrypt.hash(data.Password, 10);
data.passwordhash = data.password;
delete data.password;
}
const updatedAssignment = await prisma.assignment.update({
where: { AssignmentID: parseInt(id) },
const updatedAssignment = await prisma.assignments.update({
where: { assignmentid: parseInt(id) },
data,
});
res.json({ message: 'Assignment updated successfully', assignment: updatedAssignment });
res.json({
message: "Assignment updated successfully",
assignment: updatedAssignment,
});
} catch (err) {
console.error('Error updating assignment:', err.message);
console.error("Error updating assignment:", err.message);
res.status(500).json({ error: err.message });
}
});
// Delete Assignment
app.delete('/assignments/:id', async (req, res) => {
app.delete("/assignments/:id", async (req, res) => {
try {
const { id } = req.params;
await prisma.assignment.delete({
where: { AssignmentID: parseInt(id) },
await prisma.assignments.delete({
where: { assignmentid: parseInt(id) },
});
res.json({ message: 'Assignment deleted successfully' });
res.json({ message: "Assignment deleted successfully" });
} catch (err) {
console.error('Error deleting assignment:', err.message);
console.error("Error deleting assignment:", err.message);
res.status(500).json({ error: err.message });
}
});

4
assignment-db-service/dev.env
View file

@ -5,8 +5,8 @@
# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
#use this when testing local, remmber to run the proxy command
DATABASE_URL="postgresql://postgres:wly9H8gjjmxYfg1@localhost:15432/postgres?schema=public"
DATABASE_URL="postgresql://postgres:wly9H8gjjmxYfg1@host.docker.internal:15432/postgres?schema=public"
# DATABASE_URL="postgres://postgres:wly9H8gjjmxYfg1@bytecamp-db.flycast:5432?sslmode=disable"
# DATABASE_URL=postgres://snakebyte:zVB7lgOiKr89dq6@localhost:5432/snakebyte?sslmode=disable
NODE_PORT=3000
NODE_PORT=3200

22
assignment-db-service/prisma/schema.prisma
View file

@ -8,15 +8,15 @@ datasource db {
url = env("DATABASE_URL")
}
model Assignment {
AssignmentID Int @id @default(autoincrement())
CampID Int?
ProgramID Int?
StudentName String
SnakeGameId String?
OriginalFile String?
EditableFile String?
AssignmentUrl String?
PasswordHash String // store bcrypt hash
InstructorID Int?
model assignments {
assignmentid Int @id @default(autoincrement())
campid Int?
programid Int?
studentname String?
snakegameid String?
originalfile String?
editablefile String?
assignmenturl String?
passwordhash String? // store bcrypt hash
instructorid Int?
}