From a996def67ae0cf2cfa2de14ddaab1252296483aa Mon Sep 17 00:00:00 2001
From: Jaybe <master@jaybe.dev>
Date: Tue, 15 Jul 2025 15:22:37 +0900
Subject: [PATCH] =?UTF-8?q?=ED=81=B4=EB=9F=BD=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/controllers/clubController.js | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/backend/controllers/clubController.js b/backend/controllers/clubController.js
index 85efc8f..e125e2e 100644
--- a/backend/controllers/clubController.js
+++ b/backend/controllers/clubController.js
@@ -13,6 +13,7 @@ const EventParticipant = require('../models/EventParticipant');
 const EventScore = require('../models/EventScore');
 const { Op } = require('sequelize');
 const averageService = require('../services/averageService');
+const { sequelize } = require('../models/index');
 
 // 관리자 권한 체크 함수
 const isAdmin = (user) => {
@@ -229,15 +230,6 @@ exports.updateClub = async (req, res) => {
       newOwnerId = ownerId;
       ownerChanged = true;
     }
-    // 이메일을 통한 모임장 변경 (기존 기능 유지)
-    else if (ownerEmail && ownerEmail !== club.ownerEmail) {
-      const newOwner = await User.findOne({ where: { email: ownerEmail } });
-      if (!newOwner) {
-        return res.status(404).json({ message: '해당 이메일로 등록된 사용자를 찾을 수 없습니다.' });
-      }
-      newOwnerId = newOwner.id;
-      ownerChanged = true;
-    }
     
     // 클럽 정보 업데이트
     await club.update({
@@ -458,14 +450,14 @@ exports.updateClubMember = async (req, res) => {
 
     // 회원 정보 업데이트 (모임장 유지 또는 다른 유형으로 변경만 허용)
     await member.update({
-      name: name || member.name,
-      gender: gender || member.gender,
-      memberType: (member.memberType === 'owner' && memberType !== 'owner') ? 'owner' : memberType || member.memberType,
-      email: email || member.email,
-      phone: phone || member.phone,
-      handicap: handicap || member.handicap,
-      status: status || member.status,
-      joinDate: joinDate || member.joinDate
+      name: name !== undefined ? name : member.name,
+      gender: gender !== undefined ? gender : member.gender,
+      memberType: (member.memberType === 'owner' && memberType !== 'owner') ? 'owner' : (memberType !== undefined ? memberType : member.memberType),
+      email: email !== undefined ? email : member.email,
+      phone: phone !== undefined ? phone : member.phone,
+      handicap: handicap !== undefined ? handicap : member.handicap,
+      status: status !== undefined ? status : member.status,
+      joinDate: joinDate !== undefined ? joinDate : member.joinDate
     });
 
     // 클럽의 회원 수 업데이트