Merge pull request #5 from 2024-dissertation/develop

v1.0.2

Author: sam-laister

.github/workflows/ci.yml

@@ -0,0 +1,84 @@
+name: Model Maker CI
+# credit: https://github.com/pressly/goose/blob/main/.github/workflows/ci.yaml
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  test:
+    name: Run unit tests
+    timeout-minutes: 10
+
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:15
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: changeme
+          POSTGRES_DB: appdb_test
+        options: >-
+          --health-cmd="pg_isready -U postgres -d appdb_test"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Install Go
+        uses: actions/setup-go@v5.4.0
+      - name: Install Go Tools
+        run: |
+          go install github.com/joho/godotenv/cmd/godotenv@latest && \
+          go install github.com/nikolaydubina/go-cover-treemap@latest
+      - name: Wait for PostgreSQL to be ready
+        run: |
+          for i in {1..10}; do
+            if pg_isready -h localhost -p 5432 -U testuser -d testdb; then
+              echo "PostgreSQL is ready"
+              break
+            fi
+            echo "Waiting for PostgreSQL..."
+            sleep 5
+          done
+      - name: Check Go code formatting
+        run: |
+          cd app
+          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
+            gofmt -s -l .
+            echo "Please format Go code by running: go fmt ./..."
+            exit 1
+          fi
+      - name: Install tparse
+        run: go install github.com/mfridman/tparse@main
+      - name: Run tests
+        env:
+          DB_HOST: localhost
+          DB_NAME: appdb_test
+          DB_PORT: 5432
+          DB_USER: postgres
+          DB_PASSWORD: changeme
+          DB_TIMEZONE: UTC
+        run: |
+          cd app
+          mkdir build
+          go vet ./...
+          go build ./...
+          make test

.github/workflows/gorelease.yml

@@ -25,5 +25,6 @@ jobs:
           distribution: goreleaser
           version: "~> v2"
           args: release --clean --release-notes=${{runner.temp}}/release_notes.txt
+          workdir: app
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "notebook.formatOnSave.enabled": true
 }

CHANGELOG.md

@@ -7,6 +7,12 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### [v1.0.2]
+
+- Added Job Queue for the photogrammetry process. Max of 1 at a time
+- Max 100 jobs in the queue
+- Added Queued status to Tasks
+
 ### [v1.0.0]
 
 - Initial stable release. Production ready.

README.md

@@ -2,7 +2,7 @@
 
 <img align="right" width="125" src="assets/app-icon.png">
 
-[![Go Tests](https://github.com/2024-dissertation/go-api/actions/workflows/test.yml/badge.svg)](https://github.com/2024-dissertation/go-api/actions/workflows/test.yml)
+[![Model Maker CI](https://github.com/2024-dissertation/model-maker-docker/actions/workflows/ci.yml/badge.svg)](https://github.com/2024-dissertation/model-maker-docker/actions/workflows/ci.yml)
 
 Model Maker is an accessible and Open Source solution to Photogrammetry. This is the backend for the also open source [Flutter App](https://github.com/2024-dissertation/model-maker-app).
 

app/.DS_Store

@@ -1,8 +1,8 @@
 .DEFAULT_GOAL := build-and-run
 
-BIN_FILE=main.out
+GO_TEST_FLAGS ?= -race -count=1 -v -timeout=5m -json
 
-PKGS := github.com/Soup666/diss-api/cmd/vision,github.com/Soup666/diss-api/database,github.com/Soup666/diss-api/docs,github.com/Soup666/diss-api/middleware,github.com/Soup666/diss-api/middleware_test,github.com/Soup666/diss-api/model,github.com/Soup666/diss-api/repository,github.com/Soup666/diss-api/router,github.com/Soup666/diss-api/seed,github.com/Soup666/diss-api/seeder,github.com/Soup666/diss-api/seeds,github.com/Soup666/diss-api/utils
+BIN_FILE=main.out
 
 build-and-run: build run
 
@@ -23,14 +23,13 @@ run:
 	./"${BIN_FILE}"
 
 test:
-	@godotenv -f .env.test go test ./... -cover fmt
-
-test-cover:
 	echo "Running tests with coverage..."
-	@echo "${COVERPKG}"
-	@godotenv -f .env.test go test -coverprofile=cp.out -coverpkg=$(PKGS) ./...
-	@go tool cover -html=cp.out -o cover.html
-	@go-cover-treemap -coverprofile=cp.out > out.svg
+	@command -v tparse >/dev/null 2>&1 || go install github.com/mfridman/tparse@latest
+	@command -v go-cover-treemap >/dev/null 2>&1 || go install github.com/nikolaydubina/go-cover-treemap@latest
+	go test $(GO_TEST_FLAGS) -coverprofile=cp.out -coverpkg=$$(go list ./... | grep -v -e /bin -e /cmd -e /examples) ./... |\
+		tparse --follow -sort=elapsed -trimpath=auto -all
+	go tool cover -html=cp.out -o cover.html
+	go-cover-treemap -coverprofile=cp.out > out.svg
 
 doc:
 	swag init