name: CI/CD - ERP Core Monorepo
on:
pull_request:
branches:
- production
types:
- closed
jobs:
backend-build-and-deploy:
name: Build & Deploy ERP Core Backend
runs-on: linux
if: github.event.pull_request.merged == true
steps:
- name: Checkout code
run: |
git clone \
--depth 1 \
--branch production \
https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
.
- name: Restore backend
run: dotnet restore Backend/ERPCore.sln
- name: Publish backend
run: |
rm -rf /tmp/erpcore-deploy
mkdir -p /tmp/erpcore-deploy
dotnet publish Backend/ERPCore/ERPCore.csproj \
-c Release \
-r linux-x64 \
--self-contained true \
-o /tmp/erpcore-deploy
- name: Stop backend service
run: systemctl stop erpcore.service
- name: Copy backend to deploy folder
run: |
mkdir -p /home/erp/core/publish
rm -rf /home/erp/core/publish/*
cp -r /tmp/erpcore-deploy/* /home/erp/core/publish/
- name: Fix backend ownership and permissions
run: |
chown -R erpuser:erpuser /home/erp/core/publish
find /home/erp/core/publish -type d -exec chmod 755 {} +
find /home/erp/core/publish -type f -exec chmod 644 {} +
chmod +x /home/erp/core/publish/ERPCore
- name: Restart backend service
run: systemctl restart erpcore.service
- name: Verify backend
run: |
systemctl is-active erpcore.service && echo "Backend service running" || echo "Backend service failed"
frontend-build-and-deploy:
name: Build & Deploy ERP Core Frontend
runs-on: linux
needs: backend-build-and-deploy
if: github.event.pull_request.merged == true
steps:
- name: Checkout code
run: |
git clone \
--depth 1 \
--branch Production \
https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
.
- name: Build frontend Docker image
run: docker build -t erpcore-frontend:latest Frontend/erp-system
- name: Stop & remove existing frontend container
run: |
docker stop erpcore-frontend 2>/dev/null || true
docker rm erpcore-frontend 2>/dev/null || true
- name: Start frontend container
run: |
docker run -d \
--name erpcore-frontend \
-p 6702:6702 \
--add-host=host.docker.internal:host-gateway \
-e BACKEND_ORIGIN=http://host.docker.internal:6701 \
--restart unless-stopped \
--memory="512m" \
--cpus="1.0" \
--cap-drop ALL \
--security-opt no-new-privileges \
erpcore-frontend:latest
- name: Remove old frontend images
run: docker image prune -f
- name: Verify frontend
run: |
docker ps --filter name=erpcore-frontend --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" \
| grep erpcore-frontend && echo "Frontend container running" || echo "Frontend container failed"
This commit is contained in:
@@ -2,10 +2,8 @@ import { api } from '@/lib/api'
|
||||
import type {
|
||||
PaginatedResponse,
|
||||
RideResponse,
|
||||
CancelRequestResponse,
|
||||
LoadingSheetResponse,
|
||||
DeliveryTaskResponse,
|
||||
RideType,
|
||||
RideStatus,
|
||||
CancelRequestType,
|
||||
LoadingSheetStatus,
|
||||
@@ -16,22 +14,18 @@ import type { PageParams } from './master'
|
||||
// ─── Rides ────────────────────────────────────────────────────────────────────
|
||||
|
||||
export interface RideBody {
|
||||
rideType: RideType
|
||||
vehicleId: string
|
||||
driverProfileId: string
|
||||
routeId: string
|
||||
sourceWarehouseId: string
|
||||
meterstart: number
|
||||
}
|
||||
|
||||
export interface RideListParams extends PageParams {
|
||||
status?: RideStatus
|
||||
rideType?: RideType
|
||||
driverProfileId?: string
|
||||
vehicleId?: string
|
||||
}
|
||||
|
||||
export interface CancelRequestBody {
|
||||
export interface CancelRideBody {
|
||||
typeCode: CancelRequestType
|
||||
reason: string
|
||||
}
|
||||
@@ -49,43 +43,24 @@ export const rides = {
|
||||
assignDriver: (id: string, driverProfileId: string) =>
|
||||
api.put<RideResponse>(`/rides/${id}/driver`, { driverProfileId }).then(r => r.data),
|
||||
|
||||
activate: (id: string) =>
|
||||
api.patch<RideResponse>(`/rides/${id}/activate`).then(r => r.data),
|
||||
|
||||
close: (id: string, meterend: number) =>
|
||||
api.patch<RideResponse>(`/rides/${id}/close`, { meterend }).then(r => r.data),
|
||||
api.post<RideResponse>(`/rides/${id}/close`, { meterend }).then(r => r.data),
|
||||
|
||||
cancelRequests: {
|
||||
getForRide: (rideId: string) =>
|
||||
api.get<CancelRequestResponse | null>(`/rides/${rideId}/cancel-request`).then(r => r.data),
|
||||
|
||||
raise: (rideId: string, body: CancelRequestBody) =>
|
||||
api.post<CancelRequestResponse>(`/rides/${rideId}/cancel-request`, body).then(r => r.data),
|
||||
|
||||
approve: (requestId: string) =>
|
||||
api.post<CancelRequestResponse>(`/rides/cancel-requests/${requestId}/approve`).then(r => r.data),
|
||||
|
||||
reject: (requestId: string) =>
|
||||
api.post<CancelRequestResponse>(`/rides/cancel-requests/${requestId}/reject`).then(r => r.data),
|
||||
},
|
||||
cancel: (id: string, body: CancelRideBody) =>
|
||||
api.post<RideResponse>(`/rides/${id}/cancel`, body).then(r => r.data),
|
||||
}
|
||||
|
||||
// ─── Loading Sheets ───────────────────────────────────────────────────────────
|
||||
|
||||
export interface LoadingSheetItemBody {
|
||||
itemId: string
|
||||
quantityDispatched: number
|
||||
export interface LoadingSheetCreateBody {
|
||||
fK_RideId: string
|
||||
}
|
||||
|
||||
export interface LoadingSheetBody {
|
||||
rideId: string
|
||||
sourceWarehouseId: string
|
||||
items: LoadingSheetItemBody[]
|
||||
}
|
||||
|
||||
export interface LoadingSheetReceiptItemBody {
|
||||
itemId: string
|
||||
quantityReceived: number
|
||||
export interface LoadingSheetItemInput {
|
||||
fK_ItemId: string
|
||||
fK_WarehouseId: string
|
||||
quantity: number
|
||||
fK_ShopPOItemId?: string | null
|
||||
}
|
||||
|
||||
export interface LoadingSheetListParams extends PageParams {
|
||||
@@ -100,17 +75,14 @@ export const loadingSheets = {
|
||||
get: (id: string) =>
|
||||
api.get<LoadingSheetResponse>(`/loading-sheets/${id}`).then(r => r.data),
|
||||
|
||||
create: (body: LoadingSheetBody) =>
|
||||
create: (body: LoadingSheetCreateBody) =>
|
||||
api.post<LoadingSheetResponse>('/loading-sheets', body).then(r => r.data),
|
||||
|
||||
confirmDispatch: (id: string) =>
|
||||
api.patch<LoadingSheetResponse>(`/loading-sheets/${id}/dispatch`).then(r => r.data),
|
||||
updateItems: (id: string, items: LoadingSheetItemInput[]) =>
|
||||
api.put<LoadingSheetResponse>(`/loading-sheets/${id}/items`, { items }).then(r => r.data),
|
||||
|
||||
confirmReceipt: (id: string, items: LoadingSheetReceiptItemBody[]) =>
|
||||
api.patch<LoadingSheetResponse>(`/loading-sheets/${id}/receipt`, { items }).then(r => r.data),
|
||||
|
||||
resolve: (id: string) =>
|
||||
api.patch<LoadingSheetResponse>(`/loading-sheets/${id}/resolve`).then(r => r.data),
|
||||
confirm: (id: string) =>
|
||||
api.post<LoadingSheetResponse>(`/loading-sheets/${id}/confirm`).then(r => r.data),
|
||||
}
|
||||
|
||||
// ─── Delivery Tasks ───────────────────────────────────────────────────────────
|
||||
@@ -121,11 +93,8 @@ export interface DeliveryTaskItemQuantity {
|
||||
}
|
||||
|
||||
export const deliveryTasks = {
|
||||
generate: (rideId: string) =>
|
||||
api.post<DeliveryTaskResponse[]>(`/rides/${rideId}/tasks/generate`).then(r => r.data),
|
||||
|
||||
listByRide: (rideId: string) =>
|
||||
api.get<DeliveryTaskResponse[]>(`/rides/${rideId}/delivery-tasks`).then(r => r.data),
|
||||
api.get<DeliveryTaskResponse[]>(`/rides/${rideId}/tasks`).then(r => r.data),
|
||||
|
||||
get: (id: string) =>
|
||||
api.get<DeliveryTaskResponse>(`/delivery-tasks/${id}`).then(r => r.data),
|
||||
|
||||
Reference in New Issue
Block a user