Skip to content

Commit 398c317

Browse files
fix: use actual partner names from Partner_Master table
- Join Partner_Master via TPartnerCode to get real partner names - Fix Dockerfile to exclude test projects from build context - Update health check endpoint path Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent b6b0184 commit 398c317

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

Dockerfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,20 @@
22
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
33
WORKDIR /src
44

5-
# Copy solution and project files
6-
COPY OrderMonitor.sln .
5+
# Copy project files for restore
76
COPY nuget.config .
8-
COPY src/OrderMonitor.Api/OrderMonitor.Api.csproj src/OrderMonitor.Api/
97
COPY src/OrderMonitor.Core/OrderMonitor.Core.csproj src/OrderMonitor.Core/
108
COPY src/OrderMonitor.Infrastructure/OrderMonitor.Infrastructure.csproj src/OrderMonitor.Infrastructure/
9+
COPY src/OrderMonitor.Api/OrderMonitor.Api.csproj src/OrderMonitor.Api/
1110

12-
# Restore dependencies (API project only, not test projects)
11+
# Restore dependencies
1312
RUN dotnet restore src/OrderMonitor.Api/OrderMonitor.Api.csproj
1413

1514
# Copy source code
1615
COPY src/ src/
1716

18-
# Build API project only
19-
RUN dotnet build src/OrderMonitor.Api/OrderMonitor.Api.csproj -c Release --no-restore
20-
21-
# Publish
22-
RUN dotnet publish src/OrderMonitor.Api/OrderMonitor.Api.csproj -c Release -o /app/publish --no-build
17+
# Publish (combines build + publish in one step)
18+
RUN dotnet publish src/OrderMonitor.Api/OrderMonitor.Api.csproj -c Release -o /app/publish
2319

2420
# Runtime stage
2521
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
@@ -37,7 +33,7 @@ EXPOSE 8080
3733

3834
# Health check
3935
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
40-
CMD curl -f http://localhost:8080/api/health || exit 1
36+
CMD curl -f http://localhost:8080/health || exit 1
4137

4238
# Run
4339
ENTRYPOINT ["dotnet", "OrderMonitor.Api.dll"]

src/OrderMonitor.Infrastructure/Data/OrderRepository.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ELSE 24
4040
END AS ThresholdHours,
4141
co.websiteCode AS Region,
4242
NULL AS CustomerEmail,
43-
CAST(ISNULL(opt.FacilityId, 0) AS VARCHAR(20)) AS FacilityCode,
44-
'Facility ' + CAST(ISNULL(opt.FacilityId, 0) AS VARCHAR(10)) AS FacilityName,
43+
CAST(ISNULL(opt.TPartnerCode, '') AS VARCHAR(20)) AS FacilityCode,
44+
ISNULL(pm.PartnerDisplayName, 'Unknown') AS FacilityName,
4545
ROW_NUMBER() OVER (PARTITION BY co.CONumber ORDER BY opt.lastUpdatedDate DESC) AS RowNum
4646
FROM ConsolidationOrder co (NOLOCK)
4747
INNER JOIN OrderProductTracking opt (NOLOCK)
@@ -52,6 +52,8 @@ INNER JOIN mas_SnSpecification sn (NOLOCK)
5252
ON sn.SnID = opt.OPT_SnSpId
5353
INNER JOIN luk_MajorProductType mt (NOLOCK)
5454
ON mt.MProductTypeID = sn.MasterProductTypeID
55+
LEFT JOIN Partner_Master pm (NOLOCK)
56+
ON pm.PartnerID = opt.TPartnerCode AND pm.IsActive = 1
5557
WHERE opt.isPrimaryComponent = 1
5658
AND opt.OrderDate > DATEADD(YEAR, -2, GETUTCDATE())
5759
AND opt.Status < 6400

0 commit comments

Comments
 (0)