ranged weapons db connection

5 files changed, 85 insertions, 7 deletions

diff --git a/backend/src/API/WeaponsAPI.zig b/backend/src/API/WeaponsAPI.zig
index 65e3fe8..d2bb15a 100644
--- a/backend/src/API/WeaponsAPI.zig
+++ b/backend/src/API/WeaponsAPI.zig
@@ -1,12 +1,17 @@
+const std = @import("std");
 const httpz = @import("httpz");
 const model = @import("../Models/RangedWeapon.zig");
+const db = @import("../Database/Connection.zig");
 
 pub fn RegisterEndpoints(router: *httpz.Router(void, *const fn (*httpz.request.Request, *httpz.response.Response) anyerror!void)) void {
     router.get("/weapons", testEndpoint, .{});
+    router.post("/weapons/ranged", newRangedWeapon, .{});
+    router.get("/weapons/ranged", getAllRangedWeapons, .{});
 }
 
 fn testEndpoint(_: *httpz.Request, res: *httpz.Response) !void {
     const testType: model.RangedWeaponType = .{
+        .Id = 0,
         .Name = "BudgetArms C-13",
         .WeaponType = "P",
         .Accuracy = -1,
@@ -16,9 +21,30 @@ fn testEndpoint(_: *httpz.Request, res: *httpz.Response) !void {
         .Ammunition = "5mm",
         .NumberOfShots = 8,
         .RateOfFire = 2,
-        .Reliability = "ST"
+        .Reliability = "ST",
+        .CreatedAt = 0,
+        .UpdatedAt = 0,
     };
 
     res.status = 200;
     try res.json(testType, .{});
 }
+
+fn getAllRangedWeapons(_: *httpz.Request, res: *httpz.Response) !void {
+    var gpa = std.heap.GeneralPurposeAllocator(.{}){};
+    const allocator = gpa.allocator();
+    defer _ = gpa.deinit();
+
+    var found = try db.RangedWeapons.GetAll(allocator);
+    defer found.deinit(allocator);
+
+    try res.json(found.items, .{});
+}
+
+fn newRangedWeapon(req: *httpz.Request, res: *httpz.Response) !void {
+    if (try req.json(model.RangedWeaponType)) |new| {
+        try res.json(new, .{});
+        return;
+    }
+    res.status = 502;
+}
diff --git a/backend/src/Database/Connection.zig b/backend/src/Database/Connection.zig
index 638d92b..736c4e6 100644
--- a/backend/src/Database/Connection.zig
+++ b/backend/src/Database/Connection.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const pg = @import("pg");
 const dotenv = @import("dotenv");
 
-var pool: *pg.Pool = undefined;
+pub var pool: *pg.Pool = undefined;
 
 pub fn Connect(alloc: std.mem.Allocator) !void {
     var env = try dotenv.init(alloc, ".env");
@@ -26,3 +26,5 @@ pub fn Connect(alloc: std.mem.Allocator) !void {
 pub fn Disconnect() void {
     pool.deinit();
 }
+
+pub const RangedWeapons = @import("RangedWeaponsAccessLayer.zig");
diff --git a/backend/src/Database/RangedWeaponsAccessLayer.zig b/backend/src/Database/RangedWeaponsAccessLayer.zig
new file mode 100644
index 0000000..a99d1c1
--- /dev/null
+++ b/backend/src/Database/RangedWeaponsAccessLayer.zig
@@ -0,0 +1,20 @@
+// You are not supposed to include this file. To access this you should use
+// Connection.RangedWeapons. 
+
+const conn = @import("Connection.zig");
+const std = @import("std");
+const pg = @import("pg");
+const model = @import("../Models/RangedWeapon.zig");
+
+pub fn GetAll(alloc: std.mem.Allocator) !std.ArrayList(model.RangedWeaponType) {
+    const query = "SELECT * FROM RangedWeapons";
+    var result = try conn.pool.query(query, .{});
+    defer _ = result.deinit();
+
+    var outp: std.ArrayList(model.RangedWeaponType) = .empty;
+    while (try result.next()) |row| {
+        const newRW = try model.RangedWeaponType.Map(&row);
+        try outp.append(alloc, newRW);
+    }
+    return outp;
+}
diff --git a/backend/src/Models/RangedWeapon.zig b/backend/src/Models/RangedWeapon.zig
index bfc40b6..b81c63e 100644
--- a/backend/src/Models/RangedWeapon.zig
+++ b/backend/src/Models/RangedWeapon.zig
@@ -1,18 +1,23 @@
 const std = @import("std");
+const pg = @import("pg");
 
 pub const RangedWeaponType = struct {
+    Id: i32,
     Name: []const u8,
 
     WeaponType: []const u8,
-    Accuracy: i8,
+    Accuracy: i32,
     Concealability: []const u8,
     Avaliability: []const u8,
     Damage: []const u8,
     Ammunition: []const u8,
-    NumberOfShots: u8,
-    RateOfFire: u8,
+    NumberOfShots: u31,
+    RateOfFire: u32,
     Reliability: []const u8,
 
+    CreatedAt: i64,
+    UpdatedAt: i64,
+
     pub fn GetCompactNotation(self: *RangedWeaponType, separator: u8) ![]const u8 {
         var b: [64]u8 = undefined;
         return try std.fmt.bufPrint(&b, 
@@ -29,12 +34,33 @@ pub const RangedWeaponType = struct {
                 self.Reliability,
             });
     }
+
+    // Parses the db row and returns the result. You are expected to use the
+    // actual DB schema and use * as a fields selector
+    pub fn Map(row: *const pg.Row) !RangedWeaponType {
+        return RangedWeaponType {
+            .Id = try row.get(i32, 0),
+            .Name = try row.get([]const u8, 1),
+            .WeaponType = try row.get([]const u8, 2),
+            .Accuracy = try row.get(i32, 3),
+            .Concealability = try row.get([]const u8, 4),
+            .Avaliability = try row.get([]const u8, 5),
+            .Damage = try row.get([]const u8, 6),
+            .Ammunition = try row.get([]const u8, 7),
+            .NumberOfShots = @intCast(try row.get(i32, 8)),
+            .RateOfFire = @intCast(try row.get(i32, 9)),
+            .Reliability = try row.get([]const u8, 10),
+            .CreatedAt = try row.get(i64, 11),
+            .UpdatedAt = try row.get(i64, 12),
+        };
+    }
 };
 
 // ==================== tests ====================
 
 fn getTestType() RangedWeaponType {
     return .{
+        .Id = 0,
         .Name = "any",
         .WeaponType = "P",
         .Accuracy = -1,
@@ -44,7 +70,9 @@ fn getTestType() RangedWeaponType {
         .Ammunition = "5mm",
         .NumberOfShots = 8,
         .RateOfFire = 2,
-        .Reliability = "ST"
+        .Reliability = "ST",
+        .CreatedAt = 0,
+        .UpdatedAt = 0,
     };
 }
 
diff --git a/backend/src/main.zig b/backend/src/main.zig
index 951a86c..836efe1 100644
--- a/backend/src/main.zig
+++ b/backend/src/main.zig
@@ -16,7 +16,6 @@ pub fn main() !void {
         server.deinit();
     }
 
-
     var router = try server.router(.{});
     router.get("/", index, .{});
 
@@ -26,6 +25,9 @@ pub fn main() !void {
     try db.Connect(allocator);
     defer db.Disconnect();
 
+    var outp = try db.RangedWeapons.GetAll(allocator);
+    outp.deinit(allocator);
+
     try server.listen();
 }