@opprs/db-prisma 1.2.0 → 2.1.0

package/dist/index.cjs

@@ -37,9 +37,9 @@ __export(index_exports, {
   deleteTournament: () => deleteTournament,
   deleteUser: () => deleteUser,
   disconnect: () => disconnect,
-  findPlayerByEmail: () => findPlayerByEmail,
   findPlayerByExternalId: () => findPlayerByExternalId,
   findPlayerById: () => findPlayerById,
+  findPlayerByUserEmail: () => findPlayerByUserEmail,
   findPlayers: () => findPlayers,
   findResultById: () => findResultById,
   findResultByPlayerAndTournament: () => findResultByPlayerAndTournament,
@@ -66,6 +66,7 @@ __export(index_exports, {
   getTournamentsByDateRange: () => getTournamentsByDateRange,
   getUserByEmailWithPlayer: () => getUserByEmailWithPlayer,
   getUserWithPlayer: () => getUserWithPlayer,
+  linkPlayerToUser: () => linkPlayerToUser,
   prisma: () => prisma,
   recalculateTimeDecay: () => recalculateTimeDecay,
   searchPlayers: () => searchPlayers,
@@ -124,11 +125,12 @@ async function findPlayerByExternalId(externalId, include) {
     include
   });
 }
-async function findPlayerByEmail(email, include) {
-  return prisma.player.findUnique({
+async function findPlayerByUserEmail(email, include) {
+  const user = await prisma.user.findUnique({
     where: { email },
-    include
+    include: { player: include ? { include } : true }
   });
+  return user?.player ?? null;
 }
 async function findPlayers(options = {}) {
   return prisma.player.findMany({
@@ -217,10 +219,7 @@ async function searchPlayers(query, limit = 20) {
   return findPlayers({
     take: limit,
     where: {
-      OR: [
-        { name: { contains: query, mode: "insensitive" } },
-        { email: { contains: query, mode: "insensitive" } }
-      ]
+      name: { contains: query, mode: "insensitive" }
     }
   });
 }
@@ -543,8 +542,7 @@ async function createUserWithPlayer(userData, playerData) {
   return prisma.$transaction(async (tx) => {
     const player = await tx.player.create({
       data: {
-        name: playerData.name,
-        email: playerData.email
+        name: playerData.name
       }
     });
     const user = await tx.user.create({
@@ -667,6 +665,38 @@ async function findUsers(params) {
   });
   return users;
 }
+async function linkPlayerToUser(userId, playerId) {
+  return prisma.$transaction(async (tx) => {
+    if (playerId) {
+      const player = await tx.player.findUnique({ where: { id: playerId } });
+      if (!player) {
+        throw new Error(`Player with id '${playerId}' not found`);
+      }
+      await tx.user.updateMany({
+        where: { playerId },
+        data: { playerId: null }
+      });
+    }
+    const user = await tx.user.update({
+      where: { id: userId },
+      data: { playerId },
+      include: {
+        player: {
+          select: {
+            id: true,
+            name: true,
+            rating: true,
+            ratingDeviation: true,
+            ranking: true,
+            isRated: true,
+            eventCount: true
+          }
+        }
+      }
+    });
+    return user;
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   connect,
@@ -686,9 +716,9 @@ async function findUsers(params) {
   deleteTournament,
   deleteUser,
   disconnect,
-  findPlayerByEmail,
   findPlayerByExternalId,
   findPlayerById,
+  findPlayerByUserEmail,
   findPlayers,
   findResultById,
   findResultByPlayerAndTournament,
@@ -715,6 +745,7 @@ async function findUsers(params) {
   getTournamentsByDateRange,
   getUserByEmailWithPlayer,
   getUserWithPlayer,
+  linkPlayerToUser,
   prisma,
   recalculateTimeDecay,
   searchPlayers,

package/dist/index.d.cts

@@ -26,7 +26,6 @@ declare function testConnection(): Promise<boolean>;
 interface CreatePlayerInput {
     externalId?: string;
     name?: string;
-    email?: string;
     rating?: number;
     ratingDeviation?: number;
     ranking?: number;
@@ -38,7 +37,6 @@ interface CreatePlayerInput {
  */
 interface UpdatePlayerInput {
     name?: string;
-    email?: string;
     rating?: number;
     ratingDeviation?: number;
     ranking?: number;
@@ -70,9 +68,9 @@ declare function findPlayerById(id: string, include?: Prisma.PlayerInclude): Pro
  */
 declare function findPlayerByExternalId(externalId: string, include?: Prisma.PlayerInclude): Promise<Player | null>;
 /**
- * Finds a player by email
+ * Finds a player through their linked User's email
  */
-declare function findPlayerByEmail(email: string, include?: Prisma.PlayerInclude): Promise<Player | null>;
+declare function findPlayerByUserEmail(email: string, include?: Prisma.PlayerInclude): Promise<Player | null>;
 /**
  * Finds multiple players with optional filters
  */
@@ -186,7 +184,6 @@ declare function getPlayerWithResults(id: string): Promise<{
     createdAt: Date;
     updatedAt: Date;
     externalId: string | null;
-    email: string | null;
     rating: number;
     ratingDeviation: number;
     ranking: number | null;
@@ -196,7 +193,7 @@ declare function getPlayerWithResults(id: string): Promise<{
     lastEventDate: Date | null;
 } | null>;
 /**
- * Searches players by name or email
+ * Searches players by name
  */
 declare function searchPlayers(query: string, limit?: number): Promise<Player[]>;
 
@@ -302,7 +299,6 @@ declare function getTournamentWithResults(id: string): Promise<({
             createdAt: Date;
             updatedAt: Date;
             externalId: string | null;
-            email: string | null;
             rating: number;
             ratingDeviation: number;
             ranking: number | null;
@@ -362,7 +358,6 @@ declare function getTournamentStats(id: string): Promise<{
                 createdAt: Date;
                 updatedAt: Date;
                 externalId: string | null;
-                email: string | null;
                 rating: number;
                 ratingDeviation: number;
                 ranking: number | null;
@@ -561,7 +556,7 @@ interface CreateUserInput {
 interface UpdateUserInput {
     email?: string;
     passwordHash?: string;
-    playerId?: string;
+    playerId?: string | null;
     role?: 'USER' | 'ADMIN';
     refreshTokenHash?: string | null;
 }
@@ -593,7 +588,6 @@ declare function createUser(data: CreateUserInput): Promise<User>;
  */
 declare function createUserWithPlayer(userData: Omit<CreateUserInput, 'playerId'>, playerData: {
     name?: string;
-    email?: string;
 }): Promise<UserWithPlayer>;
 /**
  * Finds a user by ID
@@ -636,6 +630,16 @@ declare function findUsers(params: {
     where?: Prisma.UserWhereInput;
     orderBy?: Prisma.UserOrderByWithRelationInput;
 }): Promise<UserWithPlayer[]>;
+/**
+ * Links a player to a user, automatically unlinking from any existing user.
+ * Uses a transaction to ensure atomicity.
+ *
+ * @param userId - The user to link the player to
+ * @param playerId - The player to link (null to unlink)
+ * @returns The updated user with player data
+ * @throws Error if player not found
+ */
+declare function linkPlayerToUser(userId: string, playerId: string | null): Promise<UserWithPlayer>;
 
 /**
  * Re-export Prisma generated types
@@ -696,4 +700,4 @@ interface ConnectionStatus {
     error?: string;
 }
 
-export { type ConnectionStatus, type CreatePlayerInput, type CreateResultInput, type CreateTournamentInput, type CreateUserInput, type FindPlayersOptions, type FindResultsOptions, type FindTournamentsOptions, type PlayerStatistics, type PlayerWithResults, type TournamentResultWithTournament, type TournamentStatistics, type UpdatePlayerInput, type UpdateResultInput, type UpdateTournamentInput, type UpdateUserInput, type UserWithPlayer, connect, countPlayers, countResults, countTournaments, countUsers, createManyResults, createPlayer, createResult, createTournament, createUser, createUserWithPlayer, deletePlayer, deleteResult, deleteResultsByTournament, deleteTournament, deleteUser, disconnect, findPlayerByEmail, findPlayerByExternalId, findPlayerById, findPlayers, findResultById, findResultByPlayerAndTournament, findResults, findTournamentByExternalId, findTournamentById, findTournaments, findUserByEmail, findUserById, findUsers, getMajorTournaments, getPlayerResults, getPlayerStats, getPlayerTopFinishes, getPlayerWithResults, getRatedPlayers, getRecentTournaments, getTopPlayersByRanking, getTopPlayersByRating, getTournamentResults, getTournamentStats, getTournamentWithResults, getTournamentsByBoosterType, getTournamentsByDateRange, getUserByEmailWithPlayer, getUserWithPlayer, prisma, recalculateTimeDecay, searchPlayers, searchTournaments, testConnection, updatePlayer, updatePlayerRating, updateResult, updateResultPoints, updateTournament, updateUser, updateUserRefreshToken };
+export { type ConnectionStatus, type CreatePlayerInput, type CreateResultInput, type CreateTournamentInput, type CreateUserInput, type FindPlayersOptions, type FindResultsOptions, type FindTournamentsOptions, type PlayerStatistics, type PlayerWithResults, type TournamentResultWithTournament, type TournamentStatistics, type UpdatePlayerInput, type UpdateResultInput, type UpdateTournamentInput, type UpdateUserInput, type UserWithPlayer, connect, countPlayers, countResults, countTournaments, countUsers, createManyResults, createPlayer, createResult, createTournament, createUser, createUserWithPlayer, deletePlayer, deleteResult, deleteResultsByTournament, deleteTournament, deleteUser, disconnect, findPlayerByExternalId, findPlayerById, findPlayerByUserEmail, findPlayers, findResultById, findResultByPlayerAndTournament, findResults, findTournamentByExternalId, findTournamentById, findTournaments, findUserByEmail, findUserById, findUsers, getMajorTournaments, getPlayerResults, getPlayerStats, getPlayerTopFinishes, getPlayerWithResults, getRatedPlayers, getRecentTournaments, getTopPlayersByRanking, getTopPlayersByRating, getTournamentResults, getTournamentStats, getTournamentWithResults, getTournamentsByBoosterType, getTournamentsByDateRange, getUserByEmailWithPlayer, getUserWithPlayer, linkPlayerToUser, prisma, recalculateTimeDecay, searchPlayers, searchTournaments, testConnection, updatePlayer, updatePlayerRating, updateResult, updateResultPoints, updateTournament, updateUser, updateUserRefreshToken };

package/dist/index.d.ts

@@ -26,7 +26,6 @@ declare function testConnection(): Promise<boolean>;
 interface CreatePlayerInput {
     externalId?: string;
     name?: string;
-    email?: string;
     rating?: number;
     ratingDeviation?: number;
     ranking?: number;
@@ -38,7 +37,6 @@ interface CreatePlayerInput {
  */
 interface UpdatePlayerInput {
     name?: string;
-    email?: string;
     rating?: number;
     ratingDeviation?: number;
     ranking?: number;
@@ -70,9 +68,9 @@ declare function findPlayerById(id: string, include?: Prisma.PlayerInclude): Pro
  */
 declare function findPlayerByExternalId(externalId: string, include?: Prisma.PlayerInclude): Promise<Player | null>;
 /**
- * Finds a player by email
+ * Finds a player through their linked User's email
  */
-declare function findPlayerByEmail(email: string, include?: Prisma.PlayerInclude): Promise<Player | null>;
+declare function findPlayerByUserEmail(email: string, include?: Prisma.PlayerInclude): Promise<Player | null>;
 /**
  * Finds multiple players with optional filters
  */
@@ -186,7 +184,6 @@ declare function getPlayerWithResults(id: string): Promise<{
     createdAt: Date;
     updatedAt: Date;
     externalId: string | null;
-    email: string | null;
     rating: number;
     ratingDeviation: number;
     ranking: number | null;
@@ -196,7 +193,7 @@ declare function getPlayerWithResults(id: string): Promise<{
     lastEventDate: Date | null;
 } | null>;
 /**
- * Searches players by name or email
+ * Searches players by name
  */
 declare function searchPlayers(query: string, limit?: number): Promise<Player[]>;
 
@@ -302,7 +299,6 @@ declare function getTournamentWithResults(id: string): Promise<({
             createdAt: Date;
             updatedAt: Date;
             externalId: string | null;
-            email: string | null;
             rating: number;
             ratingDeviation: number;
             ranking: number | null;
@@ -362,7 +358,6 @@ declare function getTournamentStats(id: string): Promise<{
                 createdAt: Date;
                 updatedAt: Date;
                 externalId: string | null;
-                email: string | null;
                 rating: number;
                 ratingDeviation: number;
                 ranking: number | null;
@@ -561,7 +556,7 @@ interface CreateUserInput {
 interface UpdateUserInput {
     email?: string;
     passwordHash?: string;
-    playerId?: string;
+    playerId?: string | null;
     role?: 'USER' | 'ADMIN';
     refreshTokenHash?: string | null;
 }
@@ -593,7 +588,6 @@ declare function createUser(data: CreateUserInput): Promise<User>;
  */
 declare function createUserWithPlayer(userData: Omit<CreateUserInput, 'playerId'>, playerData: {
     name?: string;
-    email?: string;
 }): Promise<UserWithPlayer>;
 /**
  * Finds a user by ID
@@ -636,6 +630,16 @@ declare function findUsers(params: {
     where?: Prisma.UserWhereInput;
     orderBy?: Prisma.UserOrderByWithRelationInput;
 }): Promise<UserWithPlayer[]>;
+/**
+ * Links a player to a user, automatically unlinking from any existing user.
+ * Uses a transaction to ensure atomicity.
+ *
+ * @param userId - The user to link the player to
+ * @param playerId - The player to link (null to unlink)
+ * @returns The updated user with player data
+ * @throws Error if player not found
+ */
+declare function linkPlayerToUser(userId: string, playerId: string | null): Promise<UserWithPlayer>;
 
 /**
  * Re-export Prisma generated types
@@ -696,4 +700,4 @@ interface ConnectionStatus {
     error?: string;
 }
 
-export { type ConnectionStatus, type CreatePlayerInput, type CreateResultInput, type CreateTournamentInput, type CreateUserInput, type FindPlayersOptions, type FindResultsOptions, type FindTournamentsOptions, type PlayerStatistics, type PlayerWithResults, type TournamentResultWithTournament, type TournamentStatistics, type UpdatePlayerInput, type UpdateResultInput, type UpdateTournamentInput, type UpdateUserInput, type UserWithPlayer, connect, countPlayers, countResults, countTournaments, countUsers, createManyResults, createPlayer, createResult, createTournament, createUser, createUserWithPlayer, deletePlayer, deleteResult, deleteResultsByTournament, deleteTournament, deleteUser, disconnect, findPlayerByEmail, findPlayerByExternalId, findPlayerById, findPlayers, findResultById, findResultByPlayerAndTournament, findResults, findTournamentByExternalId, findTournamentById, findTournaments, findUserByEmail, findUserById, findUsers, getMajorTournaments, getPlayerResults, getPlayerStats, getPlayerTopFinishes, getPlayerWithResults, getRatedPlayers, getRecentTournaments, getTopPlayersByRanking, getTopPlayersByRating, getTournamentResults, getTournamentStats, getTournamentWithResults, getTournamentsByBoosterType, getTournamentsByDateRange, getUserByEmailWithPlayer, getUserWithPlayer, prisma, recalculateTimeDecay, searchPlayers, searchTournaments, testConnection, updatePlayer, updatePlayerRating, updateResult, updateResultPoints, updateTournament, updateUser, updateUserRefreshToken };
+export { type ConnectionStatus, type CreatePlayerInput, type CreateResultInput, type CreateTournamentInput, type CreateUserInput, type FindPlayersOptions, type FindResultsOptions, type FindTournamentsOptions, type PlayerStatistics, type PlayerWithResults, type TournamentResultWithTournament, type TournamentStatistics, type UpdatePlayerInput, type UpdateResultInput, type UpdateTournamentInput, type UpdateUserInput, type UserWithPlayer, connect, countPlayers, countResults, countTournaments, countUsers, createManyResults, createPlayer, createResult, createTournament, createUser, createUserWithPlayer, deletePlayer, deleteResult, deleteResultsByTournament, deleteTournament, deleteUser, disconnect, findPlayerByExternalId, findPlayerById, findPlayerByUserEmail, findPlayers, findResultById, findResultByPlayerAndTournament, findResults, findTournamentByExternalId, findTournamentById, findTournaments, findUserByEmail, findUserById, findUsers, getMajorTournaments, getPlayerResults, getPlayerStats, getPlayerTopFinishes, getPlayerWithResults, getRatedPlayers, getRecentTournaments, getTopPlayersByRanking, getTopPlayersByRating, getTournamentResults, getTournamentStats, getTournamentWithResults, getTournamentsByBoosterType, getTournamentsByDateRange, getUserByEmailWithPlayer, getUserWithPlayer, linkPlayerToUser, prisma, recalculateTimeDecay, searchPlayers, searchTournaments, testConnection, updatePlayer, updatePlayerRating, updateResult, updateResultPoints, updateTournament, updateUser, updateUserRefreshToken };

package/dist/index.js

@@ -41,11 +41,12 @@ async function findPlayerByExternalId(externalId, include) {
     include
   });
 }
-async function findPlayerByEmail(email, include) {
-  return prisma.player.findUnique({
+async function findPlayerByUserEmail(email, include) {
+  const user = await prisma.user.findUnique({
     where: { email },
-    include
+    include: { player: include ? { include } : true }
   });
+  return user?.player ?? null;
 }
 async function findPlayers(options = {}) {
   return prisma.player.findMany({
@@ -134,10 +135,7 @@ async function searchPlayers(query, limit = 20) {
   return findPlayers({
     take: limit,
     where: {
-      OR: [
-        { name: { contains: query, mode: "insensitive" } },
-        { email: { contains: query, mode: "insensitive" } }
-      ]
+      name: { contains: query, mode: "insensitive" }
     }
   });
 }
@@ -460,8 +458,7 @@ async function createUserWithPlayer(userData, playerData) {
   return prisma.$transaction(async (tx) => {
     const player = await tx.player.create({
       data: {
-        name: playerData.name,
-        email: playerData.email
+        name: playerData.name
       }
     });
     const user = await tx.user.create({
@@ -584,6 +581,38 @@ async function findUsers(params) {
   });
   return users;
 }
+async function linkPlayerToUser(userId, playerId) {
+  return prisma.$transaction(async (tx) => {
+    if (playerId) {
+      const player = await tx.player.findUnique({ where: { id: playerId } });
+      if (!player) {
+        throw new Error(`Player with id '${playerId}' not found`);
+      }
+      await tx.user.updateMany({
+        where: { playerId },
+        data: { playerId: null }
+      });
+    }
+    const user = await tx.user.update({
+      where: { id: userId },
+      data: { playerId },
+      include: {
+        player: {
+          select: {
+            id: true,
+            name: true,
+            rating: true,
+            ratingDeviation: true,
+            ranking: true,
+            isRated: true,
+            eventCount: true
+          }
+        }
+      }
+    });
+    return user;
+  });
+}
 export {
   connect,
   countPlayers,
@@ -602,9 +631,9 @@ export {
   deleteTournament,
   deleteUser,
   disconnect,
-  findPlayerByEmail,
   findPlayerByExternalId,
   findPlayerById,
+  findPlayerByUserEmail,
   findPlayers,
   findResultById,
   findResultByPlayerAndTournament,
@@ -631,6 +660,7 @@ export {
   getTournamentsByDateRange,
   getUserByEmailWithPlayer,
   getUserWithPlayer,
+  linkPlayerToUser,
   prisma,
   recalculateTimeDecay,
   searchPlayers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opprs/db-prisma",
-  "version": "1.2.0",
+  "version": "2.1.0",
   "description": "Database backend for OPPR (Open Pinball Player Ranking System) using Prisma and PostgreSQL",
   "keywords": [
     "oppr",
@@ -80,6 +80,7 @@
     "db:migrate:prod": "prisma migrate deploy",
     "db:studio": "prisma studio",
     "db:seed": "tsx prisma/seed.ts",
-    "db:reset": "prisma migrate reset"
+    "db:reset": "prisma migrate reset",
+    "db:make-admin": "tsx scripts/make-admin.ts"
   }
 }

package/prisma/schema.prisma

@@ -19,7 +19,6 @@ model Player {
   // Player identification
   externalId       String?  @unique // External ID from OPPR or other systems
   name             String?
-  email            String?  @unique
 
   // OPPR Rating fields
   rating           Float    @default(1500) // Glicko rating
@@ -36,7 +35,6 @@ model Player {
   tournamentResults TournamentResult[]
   user              User?
 
-  @@index([email])
   @@index([externalId])
   @@index([rating])
   @@index([ranking])