feat(ocp): added in printers get and add
This commit is contained in:
17
database/migrations/0026_daily_the_twelve.sql
Normal file
17
database/migrations/0026_daily_the_twelve.sql
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
CREATE TABLE "printers" (
|
||||||
|
"printer_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||||
|
"humanReadableId" text,
|
||||||
|
"name" text NOT NULL,
|
||||||
|
"ipAddress" text,
|
||||||
|
"port" numeric NOT NULL,
|
||||||
|
"status" text,
|
||||||
|
"statusText" text NOT NULL,
|
||||||
|
"lastTimePrinted" text,
|
||||||
|
"assigned" boolean DEFAULT false NOT NULL,
|
||||||
|
"remark" text,
|
||||||
|
"monitorState" boolean DEFAULT false NOT NULL,
|
||||||
|
"add_Date" timestamp DEFAULT now(),
|
||||||
|
"upd_date" timestamp DEFAULT now()
|
||||||
|
);
|
||||||
|
--> statement-breakpoint
|
||||||
|
CREATE UNIQUE INDEX "humanReadableId" ON "printers" USING btree ("name");
|
||||||
3
database/migrations/0027_needy_sleepwalker.sql
Normal file
3
database/migrations/0027_needy_sleepwalker.sql
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
ALTER TABLE "printers" ALTER COLUMN "statusText" DROP NOT NULL;--> statement-breakpoint
|
||||||
|
ALTER TABLE "printers" ALTER COLUMN "assigned" DROP NOT NULL;--> statement-breakpoint
|
||||||
|
ALTER TABLE "printers" ALTER COLUMN "monitorState" DROP NOT NULL;
|
||||||
1
database/migrations/0028_fast_wong.sql
Normal file
1
database/migrations/0028_fast_wong.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "printers" ALTER COLUMN "port" DROP NOT NULL;
|
||||||
2
database/migrations/0029_giant_blue_blade.sql
Normal file
2
database/migrations/0029_giant_blue_blade.sql
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
DROP INDEX "humanReadableId";--> statement-breakpoint
|
||||||
|
CREATE UNIQUE INDEX "humanReadableId" ON "printers" USING btree ("humanReadableId");
|
||||||
1168
database/migrations/meta/0026_snapshot.json
Normal file
1168
database/migrations/meta/0026_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
1168
database/migrations/meta/0027_snapshot.json
Normal file
1168
database/migrations/meta/0027_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
1168
database/migrations/meta/0028_snapshot.json
Normal file
1168
database/migrations/meta/0028_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
1168
database/migrations/meta/0029_snapshot.json
Normal file
1168
database/migrations/meta/0029_snapshot.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -183,6 +183,34 @@
|
|||||||
"when": 1742655504936,
|
"when": 1742655504936,
|
||||||
"tag": "0025_amusing_sugar_man",
|
"tag": "0025_amusing_sugar_man",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 26,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1742914066219,
|
||||||
|
"tag": "0026_daily_the_twelve",
|
||||||
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 27,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1742917145140,
|
||||||
|
"tag": "0027_needy_sleepwalker",
|
||||||
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 28,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1742917676211,
|
||||||
|
"tag": "0028_fast_wong",
|
||||||
|
"breakpoints": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idx": 29,
|
||||||
|
"version": "7",
|
||||||
|
"when": 1742917978318,
|
||||||
|
"tag": "0029_giant_blue_blade",
|
||||||
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
42
database/schema/printers.ts
Normal file
42
database/schema/printers.ts
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
import {
|
||||||
|
text,
|
||||||
|
pgTable,
|
||||||
|
numeric,
|
||||||
|
index,
|
||||||
|
timestamp,
|
||||||
|
boolean,
|
||||||
|
uuid,
|
||||||
|
uniqueIndex,
|
||||||
|
} from "drizzle-orm/pg-core";
|
||||||
|
import { createInsertSchema, createSelectSchema } from "drizzle-zod";
|
||||||
|
import { z } from "zod";
|
||||||
|
|
||||||
|
export const printers = pgTable(
|
||||||
|
"printers",
|
||||||
|
{
|
||||||
|
printer_id: uuid("printer_id").defaultRandom().primaryKey(),
|
||||||
|
humanReadableId: text("humanReadableId"),
|
||||||
|
name: text("name").notNull(),
|
||||||
|
ipAddress: text("ipAddress"),
|
||||||
|
port: numeric("port"),
|
||||||
|
status: text("status"),
|
||||||
|
statusText: text("statusText"),
|
||||||
|
lastTimePrinted: text("lastTimePrinted"),
|
||||||
|
assigned: boolean("assigned").default(false),
|
||||||
|
remark: text("remark"),
|
||||||
|
monitorState: boolean("monitorState").default(false),
|
||||||
|
add_Date: timestamp("add_Date").defaultNow(),
|
||||||
|
upd_date: timestamp("upd_date").defaultNow(),
|
||||||
|
},
|
||||||
|
(table) => [
|
||||||
|
//uniqueIndex("emailUniqueIndex").on(sql`lower(${table.email})`),
|
||||||
|
uniqueIndex("humanReadableId").on(table.humanReadableId),
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
// Schema for inserting a user - can be used to validate API requests
|
||||||
|
// export const insertRolesSchema = createInsertSchema(roles, {
|
||||||
|
// name: z.string().min(3, {message: "Role name must be more than 3 letters"}),
|
||||||
|
// });
|
||||||
|
// Schema for selecting a Expenses - can be used to validate API responses
|
||||||
|
export const selectRolesSchema = createSelectSchema(printers);
|
||||||
21
server/services/ocp/controller/getPrinters.ts
Normal file
21
server/services/ocp/controller/getPrinters.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { db } from "../../../../database/dbclient.js";
|
||||||
|
import { tryCatch } from "../../../globalUtils/tryCatch.js";
|
||||||
|
import { printers } from "../../../../database/schema/printers.js";
|
||||||
|
|
||||||
|
export const getPrinters = async () => {
|
||||||
|
const currentTime = new Date(Date.now());
|
||||||
|
|
||||||
|
const { data: printerData, error: printerError } = await tryCatch(
|
||||||
|
db.select().from(printers)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (printerError) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message: "there was an error getting the printers",
|
||||||
|
data: printerError,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return { success: true, message: "Printers", data: printerData };
|
||||||
|
};
|
||||||
84
server/services/ocp/controller/updatePrinters.ts
Normal file
84
server/services/ocp/controller/updatePrinters.ts
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
import { db } from "../../../../database/dbclient.js";
|
||||||
|
import { tryCatch } from "../../../globalUtils/tryCatch.js";
|
||||||
|
import { printers } from "../../../../database/schema/printers.js";
|
||||||
|
import { settings } from "../../../../database/schema/settings.js";
|
||||||
|
import axios from "axios";
|
||||||
|
import { lstAuth } from "../../../index.js";
|
||||||
|
import { prodEndpointCreation } from "../../../globalUtils/createUrl.js";
|
||||||
|
import { createLog } from "../../logger/logger.js";
|
||||||
|
import { sql } from "drizzle-orm";
|
||||||
|
|
||||||
|
export const updatePrinters = async () => {
|
||||||
|
const currentTime = new Date(Date.now());
|
||||||
|
|
||||||
|
// get the printers from prod
|
||||||
|
let url = await prodEndpointCreation(
|
||||||
|
"/public/v1.0/Administration/Printers"
|
||||||
|
);
|
||||||
|
|
||||||
|
const { data: prodPrinters, error: prodError } = await tryCatch(
|
||||||
|
axios.get(url, {
|
||||||
|
headers: {
|
||||||
|
Authorization: `Basic ${lstAuth}`,
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
if (prodError) {
|
||||||
|
console.log(prodError);
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
message: "there was an error getting the printers.",
|
||||||
|
data: prodError,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// do the printer update into our db
|
||||||
|
const prodPrinterInfo = prodPrinters.data;
|
||||||
|
|
||||||
|
for (let i = 0; i < prodPrinterInfo.length; i++) {
|
||||||
|
const printerStuff: any = {
|
||||||
|
humanReadableId: prodPrinterInfo[i].humanReadableId,
|
||||||
|
name: prodPrinterInfo[i].name,
|
||||||
|
ipAddress: prodPrinterInfo[i].ipAddress,
|
||||||
|
port: prodPrinterInfo[i].port,
|
||||||
|
remark: prodPrinterInfo[i].remark,
|
||||||
|
};
|
||||||
|
const { data, error } = await tryCatch(
|
||||||
|
db
|
||||||
|
.insert(printers)
|
||||||
|
.values(printerStuff)
|
||||||
|
.onConflictDoUpdate({
|
||||||
|
target: printers.humanReadableId,
|
||||||
|
set: {
|
||||||
|
//humanReadableId: prodPrinterInfo[i].humanReadableId,
|
||||||
|
name: prodPrinterInfo[i].name,
|
||||||
|
ipAddress: prodPrinterInfo[i].ipAddress,
|
||||||
|
port: prodPrinterInfo[i].port,
|
||||||
|
remark: prodPrinterInfo[i].remark,
|
||||||
|
upd_date: sql`NOW()`,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
createLog(
|
||||||
|
"error",
|
||||||
|
"lst",
|
||||||
|
"ocp",
|
||||||
|
`${
|
||||||
|
prodPrinterInfo[i].name
|
||||||
|
} encoutered and error adding/updating ${JSON.stringify(error)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
createLog(
|
||||||
|
"info",
|
||||||
|
"lst",
|
||||||
|
"ocp",
|
||||||
|
`${prodPrinterInfo[i].name} were just added/updated.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return { success: true, message: "Printers were just added or updated." };
|
||||||
|
};
|
||||||
@@ -1,14 +1,21 @@
|
|||||||
import {OpenAPIHono} from "@hono/zod-openapi";
|
import { OpenAPIHono } from "@hono/zod-openapi";
|
||||||
|
|
||||||
// routes
|
// routes
|
||||||
import manualLabelLog from "./routes/manualPrintLog.js";
|
import manualLabelLog from "./routes/manualPrintLog.js";
|
||||||
|
import getPrinters from "./routes/printers/getPritners.js";
|
||||||
import {db} from "../../../database/dbclient.js";
|
import { db } from "../../../database/dbclient.js";
|
||||||
import {settings} from "../../../database/schema/settings.js";
|
import { settings } from "../../../database/schema/settings.js";
|
||||||
|
import updateprinters from "./routes/printers/updatePrinters.js";
|
||||||
|
import { updatePrinters } from "./controller/updatePrinters.js";
|
||||||
|
|
||||||
const app = new OpenAPIHono();
|
const app = new OpenAPIHono();
|
||||||
|
|
||||||
const routes = [manualLabelLog] as const;
|
const routes = [
|
||||||
|
manualLabelLog,
|
||||||
|
//printer
|
||||||
|
getPrinters,
|
||||||
|
updateprinters,
|
||||||
|
] as const;
|
||||||
const setting = await db.select().from(settings);
|
const setting = await db.select().from(settings);
|
||||||
|
|
||||||
const appRoutes = routes.forEach((route) => {
|
const appRoutes = routes.forEach((route) => {
|
||||||
@@ -16,7 +23,13 @@ const appRoutes = routes.forEach((route) => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.all("/ocp/*", (c) => {
|
app.all("/ocp/*", (c) => {
|
||||||
return c.json({success: false, message: "You have encounters a ocp route that dose not exist."});
|
return c.json({
|
||||||
|
success: false,
|
||||||
|
message: "You have encounters a ocp route that dose not exist.",
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// run the printer update on restart just to keep everything good
|
||||||
|
updatePrinters();
|
||||||
|
|
||||||
export default app;
|
export default app;
|
||||||
|
|||||||
50
server/services/ocp/routes/printers/getPritners.ts
Normal file
50
server/services/ocp/routes/printers/getPritners.ts
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
// an external way to creating logs
|
||||||
|
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
|
||||||
|
import { responses } from "../../../../globalUtils/routeDefs/responses.js";
|
||||||
|
import { tryCatch } from "../../../../globalUtils/tryCatch.js";
|
||||||
|
import { getPrinters } from "../../controller/getPrinters.js";
|
||||||
|
|
||||||
|
const app = new OpenAPIHono({ strict: false });
|
||||||
|
const CreateLog = z.object({
|
||||||
|
line: z.string().openapi({ example: "info" }),
|
||||||
|
initials: z.string().openapi({ example: "server" }),
|
||||||
|
printReason: z.string().openapi({ example: "This is a new log posted" }),
|
||||||
|
additionalComments: z
|
||||||
|
.string()
|
||||||
|
.optional()
|
||||||
|
.openapi({ example: "Some reason why we did this." }),
|
||||||
|
});
|
||||||
|
|
||||||
|
app.openapi(
|
||||||
|
createRoute({
|
||||||
|
tags: ["ocp"],
|
||||||
|
summary: "Prints a label.",
|
||||||
|
method: "get",
|
||||||
|
path: "/getprinters",
|
||||||
|
//middleware: authMiddleware,
|
||||||
|
//description: "This might be a temp soltuin during the transtion between versions",
|
||||||
|
request: {
|
||||||
|
body: { content: { "application/json": { schema: CreateLog } } },
|
||||||
|
},
|
||||||
|
responses: responses(),
|
||||||
|
}),
|
||||||
|
async (c) => {
|
||||||
|
const { data: printData, error: printError } = await tryCatch(
|
||||||
|
getPrinters()
|
||||||
|
);
|
||||||
|
|
||||||
|
if (printError) {
|
||||||
|
return c.json({
|
||||||
|
success: false,
|
||||||
|
message: "There was an error getting the printers",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.json({
|
||||||
|
success: printData.success,
|
||||||
|
message: printData.message,
|
||||||
|
data: printData.data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
export default app;
|
||||||
51
server/services/ocp/routes/printers/updatePrinters.ts
Normal file
51
server/services/ocp/routes/printers/updatePrinters.ts
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
// an external way to creating logs
|
||||||
|
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
|
||||||
|
import { responses } from "../../../../globalUtils/routeDefs/responses.js";
|
||||||
|
import { tryCatch } from "../../../../globalUtils/tryCatch.js";
|
||||||
|
import { getPrinters } from "../../controller/getPrinters.js";
|
||||||
|
import { updatePrinters } from "../../controller/updatePrinters.js";
|
||||||
|
|
||||||
|
const app = new OpenAPIHono({ strict: false });
|
||||||
|
const CreateLog = z.object({
|
||||||
|
line: z.string().openapi({ example: "info" }),
|
||||||
|
initials: z.string().openapi({ example: "server" }),
|
||||||
|
printReason: z.string().openapi({ example: "This is a new log posted" }),
|
||||||
|
additionalComments: z
|
||||||
|
.string()
|
||||||
|
.optional()
|
||||||
|
.openapi({ example: "Some reason why we did this." }),
|
||||||
|
});
|
||||||
|
|
||||||
|
app.openapi(
|
||||||
|
createRoute({
|
||||||
|
tags: ["ocp"],
|
||||||
|
summary: "Prints a label.",
|
||||||
|
method: "get",
|
||||||
|
path: "/updateprinters",
|
||||||
|
//middleware: authMiddleware,
|
||||||
|
//description: "This might be a temp soltuin during the transtion between versions",
|
||||||
|
request: {
|
||||||
|
body: { content: { "application/json": { schema: CreateLog } } },
|
||||||
|
},
|
||||||
|
responses: responses(),
|
||||||
|
}),
|
||||||
|
async (c) => {
|
||||||
|
const { data: printData, error: printError } = await tryCatch(
|
||||||
|
updatePrinters()
|
||||||
|
);
|
||||||
|
|
||||||
|
if (printError) {
|
||||||
|
return c.json({
|
||||||
|
success: false,
|
||||||
|
message: "There was an error getting the printers",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.json({
|
||||||
|
success: printData.success,
|
||||||
|
message: printData.message,
|
||||||
|
data: printData.data,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
export default app;
|
||||||
Reference in New Issue
Block a user