Merge pull request #139 from bbarni2020/t2-logs

Add T2 review logs to review pages

Author: ArcaEge

src/routes/dashboard/admin/ReviewHistory.svelte

@@ -34,4 +34,24 @@
 			</p>
 		</div>
 	{/each}
+	<h1 class="text-2xl font-bold">T2 reviews</h1>
+	{#each reviews.t2Reviews as review}
+		<div class="themed-box flex flex-col p-3 shadow-lg">
+			{#if review.notes}
+				<p class="text-sm"><span class="font-bold">Notes:</span> {review.notes}</p>
+			{/if}
+			{#if review.feedback}
+				<p class="text-sm"><span class="font-bold">Feedback:</span> {review.feedback}</p>
+			{/if}
+			{#if review.image}
+				<p class="text-sm"><span class="font-bold">Image:</span> {review.image}</p>
+			{/if}
+			<p class="text-sm">
+				<span class="font-bold">Market score per hour:</span> {review.shopScoreMultiplier}
+			</p>
+			<p class="text-xs">
+				by <a href={`../../users/${review.user.id}`} class="underline">{review.user.name}</a>
+			</p>
+		</div>
+	{/each}
 </div>

src/routes/dashboard/admin/getReviewHistory.server.ts

@@ -1,5 +1,5 @@
 import { db } from '$lib/server/db';
-import { legionReview, t1Review, user } from '$lib/server/db/schema';
+import { legionReview, t1Review, t2Review, user } from '$lib/server/db/schema';
 import { eq, asc } from 'drizzle-orm';
 
 export async function getReviewHistory(id: number) {
@@ -36,8 +36,26 @@ export async function getReviewHistory(id: number) {
 		.where(eq(legionReview.projectId, id))
 		.orderBy(asc(legionReview.timestamp));
 
+	const t2Reviews = await db
+		.select({
+			user: {
+				id: user.id,
+				name: user.name
+			},
+			notes: t2Review.notes,
+			feedback: t2Review.feedback,
+			image: t2Review.image,
+			shopScoreMultiplier: t2Review.shopScoreMultiplier,
+			timestamp: t2Review.timestamp
+		})
+		.from(t2Review)
+		.innerJoin(user, eq(user.id, t2Review.userId))
+		.where(eq(t2Review.projectId, id))
+		.orderBy(asc(t2Review.timestamp));
+
 	return {
 		t1Reviews,
-		legionReviews
+		legionReviews,
+		t2Reviews
 	};
 }