Merge pull request webdevcody#270 from scape76/197-avarage-stats-data

197, 134 Users avarage statistic data

Author: trace2798

prisma/schema.prisma

@@ -30,6 +30,9 @@ model User {
  results Result[]
  achievements UserAchievement[]
 
+ avarageAccuracy Decimal @default(0) @db.Decimal(5, 2)
+ avarageCpm Decimal @default(0) @db.Decimal(6, 2)
+
  role UserRole @default(USER)
 
  snippets Snippet[]

src/app/_actions/result.ts

@@ -3,213 +3,58 @@
 import { revalidatePath } from "next/cache";
 import { z } from "zod";
 import { action } from "@/lib/actions";
+import { Prisma } from "@prisma/client";
 
 // when snippets rating hits this number
 // it will no longer be on the race
 // and will be reviewed by admin on the review page
 
-const snippetVoteSchema = z.object({
- snippetId: z.string(),
-});
-
-const SNIPPET_RATING_THRESHOLD = -10;
-
-export const upvoteSnippetAction = action(
- snippetVoteSchema,
- async ({ snippetId }, { prisma, user }) => {
- if (!user) throw new Error("You must be logged in to vote.");
-
- const snippet = await prisma.snippet.findUnique({
- where: {
- id: snippetId,
- },
- });
-
- if (!snippet) throw new Error("Snippet not found.");
-
- if (snippet.onReview) throw new Error("Snippet is already on review.");
-
- const previousVote = await prisma.snippetVote.findUnique({
- where: {
- userId_snippetId: {
- userId: user.id,
- snippetId,
- },
- },
- });
+export const saveUserResultAction = action(
+ z.object({
+ timeTaken: z.union([z.string(), z.number()]),
+ errors: z.number().nullable(),
+ cpm: z.number().min(0).max(9999, {
+ message: "Cpm is too high. Please, turn off the python bot.",
+ }),
+ accuracy: z.number().min(0).max(100),
+ snippetId: z.string(),
+ }),
+ async (input, { prisma, user }) => {
+ if (!user) {
+ throw new Error("Not allowed.");
+ }
 
- await prisma.$transaction(async (tx) => {
- await tx.snippetVote.upsert({
- where: {
- userId_snippetId: {
- userId: user.id,
- snippetId,
- },
- },
- update: {
- type: "UP",
- },
- create: {
+ prisma.$transaction(async (tx) => {
+ await tx.result.create({
+ data: {
  userId: user.id,
- snippetId,
- type: "UP",
+ takenTime: input.timeTaken.toString(),
+ errorCount: input.errors,
+ cpm: input.cpm,
+ accuracy: new Prisma.Decimal(input.accuracy),
+ snippetId: input.snippetId,
  },
  });
 
- await tx.snippet.update({
+ const avgValues = await tx.result.aggregate({
  where: {
- id: snippetId,
- },
- data: {
- rating: {
- // if user downvoted before, decrement by 2
- increment: 1 + Number(!!previousVote),
- },
- },
- });
- });
-
- revalidatePath("/result");
- },
-);
-
-export const downVoteSnippetAction = action(
- snippetVoteSchema,
- async ({ snippetId }, { prisma, user }) => {
- if (!user) throw new Error("You must be logged in to vote.");
-
- const snippet = await prisma.snippet.findUnique({
- where: {
- id: snippetId,
- },
- });
-
- if (!snippet) {
- throw new Error("Snippet not found.");
- }
-
- if (snippet.onReview) {
- throw new Error("Snippet is already on review.");
- }
-
- const previousVote = await prisma.snippetVote.findUnique({
- where: {
- userId_snippetId: {
  userId: user.id,
- snippetId,
- },
- },
- });
-
- await prisma.$transaction(async (tx) => {
- await tx.snippetVote.upsert({
- where: {
- userId_snippetId: {
- userId: user.id,
- snippetId,
- },
- },
- update: {
- type: "DOWN",
  },
- create: {
- userId: user.id,
- snippetId,
- type: "DOWN",
+ _avg: {
+ accuracy: true,
+ cpm: true,
  },
  });
 
- const updatedSnippet = await tx.snippet.update({
+ await tx.user.update({
  where: {
- id: snippetId,
+ id: user.id,
  },
  data: {
- rating: {
- // if user upvoted before, decrement by 2
- decrement: 1 + Number(!!previousVote),
- },
+ avarageAccuracy: avgValues._avg.accuracy ?? 0,
+ avarageCpm: avgValues._avg.cpm ?? 0,
  },
  });
-
- if (updatedSnippet.rating === SNIPPET_RATING_THRESHOLD) {
- await tx.snippet.update({
- where: {
- id: snippetId,
- },
- data: {
- onReview: true,
- },
- });
- }
  });
-
- revalidatePath("/result");
- },
-);
-
-export const deleteVoteAction = action(
- snippetVoteSchema,
- async ({ snippetId }, { prisma, user }) => {
- if (!user) throw new Error("You must be logged in to vote.");
-
- const snippet = await prisma.snippet.findUnique({
- where: {
- id: snippetId,
- },
- });
-
- if (!snippet) {
- throw new Error("Snippet doesnt exist.");
- }
-
- const previousVote = await prisma.snippetVote.findUnique({
- where: {
- userId_snippetId: {
- userId: user.id,
- snippetId,
- },
- },
- });
-
- if (!previousVote) {
- throw new Error("Something went wrong...");
- }
-
- await prisma.$transaction(async (tx) => {
- await tx.snippetVote.delete({
- where: {
- userId_snippetId: {
- userId: user.id,
- snippetId,
- },
- },
- });
-
- if (previousVote!.type === "DOWN") {
- await tx.snippet.update({
- where: {
- id: snippetId,
- },
- data: {
- rating: {
- increment: 1,
- },
- },
- });
- } else {
- await tx.snippet.update({
- where: {
- id: snippetId,
- },
- data: {
- rating: {
- decrement: 1,
- },
- },
- });
- }
- });
-
- revalidatePath("/result");
  },
 );