Merge branch 'develop' of https://github.com/FacerAin/Jaksimsamil into develop

@@ -2,47 +2,48 @@ const mongoose = require("mongoose");
 
 
 const { Schema } = mongoose;
 const { Schema } = mongoose;
 
 
-const ChallengeSchema = new Schema(
-  {
-    challengeName: { type: String, required: true },
-    startDate: { type: Object, required: true },
-    endDate: { type: Object, required: true },
-    durationPerSession: { type: String, required: true }, // '1d' means one day per session, '2w' means 2 weeks per session, '3m' means 3 months per session.
-    goalPerSession: { type: Number, required: true }, // number of problems for one session
-    isOpen: { type: Boolean },
-  },
-  {
-    collection: "challenge",
-  }
-);
-
-ChallengeSchema.statics.findByChallengeName = function (challengeName) {
-  return this.findOne({ challengeName: challengeName });
-};
-
-ChallengeSchema.methods.getChallengeName = function () {
-  return this.challengeName;
-};
-
-ChallengeSchema.methods.getStartDate = function () {
-  return this.startDate;
-};
-
-ChallengeSchema.methods.getEndDate = function () {
-  return this.endDate;
-};
-
-ChallengeSchema.methods.getDurationPerSession = function () {
-  return this.durationPerSession;
-};
-
-ChallengeSchema.methods.getGoalPerSession = function () {
-  return this.goalPerSession;
-};
-
-ChallengeSchema.methods.serialize = function () {
-  return this.toJSON();
-};
-
-const Challenge = mongoose.model("Challenge", ChallengeSchema);
-module.exports = Challenge;
+const ChallengeSchema=new Schema({
+    challengeName: {type: String, required: true},
+    startDate: {type: Object, required: true},
+    endDate: {type: Object, required: true},
+    durationPerSession: {type: String, required: true}, // '1d' means one day per session, '2w' means 2 weeks per session, '3m' means 3 months per session.
+    goalPerSession: {type: Number, required:true}, // number of problems for one session
+    status: { type: String }
+},{
+    collection: 'challenge'
+});
+
+ChallengeSchema.statics.findByChallengeName=function(challengeName){
+    return this.findOne({challengeName:challengeName});
+}
+
+ChallengeSchema.methods.getChallengeName=function(){
+    return this.challengeName;
+}
+
+ChallengeSchema.methods.getStartDate=function(){
+    return this.startDate;
+}
+
+ChallengeSchema.methods.getEndDate=function(){
+    return this.endDate;
+}
+
+ChallengeSchema.method.getDurationPerSession=function(){
+    return this.durationPerSession;
+}
+
+ChallengeSchema.methods.getGoalPerSession=function(){
+    return this.goalPerSession;
+}
+
+ChallengeSchema.methods.getStatus=function(){
+    return this.status;
+}
+
+ChallengeSchema.methods.serialize=function(){
+    return this.toJSON();
+}
+
+const Challenge = mongoose.model('Challenge', ChallengeSchema);
+module.exports = Challenge;
\ No newline at end of file

@@ -8,5 +8,18 @@ const GroupSchema = new Schema({
     collection: 'group'
     collection: 'group'
 });
 });
 
 
+GroupSchema.methods.addGroupMemeber=function(user){
+    this.members.push(user._id);
+    return this.save();
+}
+
+GroupSchema.methods.getMembers=function(){
+    return this.members;
+}
+
+GroupSchema.methods.serialize=function(){
+    return this.toJSON();
+}
+
 const Group = mongoose.model('Group',GroupSchema);
 const Group = mongoose.model('Group',GroupSchema);
 module.exports = Group;
 module.exports = Group;
\ No newline at end of file

@@ -2,12 +2,32 @@ const mongoose = require("mongoose");
 
 
 const { Schema } = mongoose;
 const { Schema } = mongoose;
 
 
+const SelectedProblemSchema=new Schema({
+    problemNum: {type: Number, required: true},
+    isSolved: {type:Boolean, default: false},
+},{
+    _id: false
+});
+
 const ParticipationSchema = new Schema({
 const ParticipationSchema = new Schema({
     sessionId: { type: Schema.Types.ObjectId, ref: 'Session' },
     sessionId: { type: Schema.Types.ObjectId, ref: 'Session' },
-    groupId: { type: Schema.Types.ObjectId, ref: 'Group' }
+    groupId: { type: Schema.Types.ObjectId, ref: 'Group' },
+    problems: [{type:SelectedProblemSchema}]
 },{
 },{
     collection: 'particiaption'
     collection: 'particiaption'
 });
 });
 
 
+ParticipationSchema.statics.findBySessionId=function(session){
+    return this.find({sessionId:session._id});
+}
+
+ParticipationSchema.statics.findByGroupId=function(group){
+    return this.find({groupId:group._id});
+}
+
+ParticipationSchema.methods.addProblem=function(problem){
+    this.problems.push({problemNum:problem.problemNum,isSolved:problem.isSolved});
+}
+
 const Participation = mongoose.model('Participation', ParticipationSchema);
 const Participation = mongoose.model('Participation', ParticipationSchema);
 module.exports = Participation;
 module.exports = Participation;
\ No newline at end of file

@@ -9,7 +9,7 @@ const ProblemSchema=new Schema({
     sumbitNum: {type: Number, required: true},
     sumbitNum: {type: Number, required: true},
     correctNum: {type: Number, required: true},
     correctNum: {type: Number, required: true},
     count: { type: Number },
     count: { type: Number },
-    category: {type:[String]}
+    category: [{ type:String }],
 },{
 },{
     collection: 'problem'
     collection: 'problem'
 });
 });

@@ -6,10 +6,30 @@ const SessionSchema = new Schema({
     challengeId: { type: Schema.Types.ObjectId, ref: 'Challenge' },
     challengeId: { type: Schema.Types.ObjectId, ref: 'Challenge' },
     sessionStartDate: { type: Object },
     sessionStartDate: { type: Object },
     sessionEndDate: { type: Object },
     sessionEndDate: { type: Object },
-    isOpen: { type: Boolean  }
+    status: { type: String  }
 },{
 },{
     collection: 'session'
     collection: 'session'
 });
 });
 
 
+SessionSchema.statics.findByChallengeId=function(challenge){
+    return this.find({challengeId:challenge._id});
+}
+
+SessionSchema.methods.getSessionStartDate=function(){
+    return this.sessionStartDate;
+}
+
+SessionSchema.methods.getSessionEndDate=function(){
+    return this.sessionEndDate;
+}
+
+SessionSchema.methods.getStatus=function(){
+    return this.status;
+}
+
+SessionSchema.methods.serialize=function(){
+    return this.toJSON();
+}
+
 const Session = mongoose.model('Session', SessionSchema);
 const Session = mongoose.model('Session', SessionSchema);
 module.exports = Session;
 module.exports = Session;
\ No newline at end of file

@@ -21,6 +21,11 @@ UserSchema.statics.findByUsername = function (username) {
   return this.findOne({ username });
   return this.findOne({ username });
 };
 };
 
 
+UserSchema.methods.addFriend=function(friend){
+  this.friendList.push(friend._id);
+  return this.save();
+}
+
 UserSchema.methods.setPassword = async function (password) {
 UserSchema.methods.setPassword = async function (password) {
   const hash = await bcrypt.hash(password, 10);
   const hash = await bcrypt.hash(password, 10);
   this.hashedPassword = hash;
   this.hashedPassword = hash;