fix: pvp commit history

Author: shubham-1806

docs/spec/CodeCharacter-API.yml

@@ -1800,12 +1800,15 @@ components:
         createdAt:
           type: string
           format: date-time
+        codeType:
+          $ref: '#/components/schemas/CodeType'
       required:
         - id
         - code
         - message
         - language
         - createdAt
+        - codeType
     CreateCodeRevisionRequest:
       title: CreateCodeRevisionRequest
       type: object

packages/client/src/models/index.ts

@@ -115,6 +115,12 @@ export interface CodeRevision {
    * @memberof CodeRevision
    */
   createdAt: string;
+  /**
+   *
+   * @type {CodeType}
+   * @memberof CodeRevision
+   */
+  codeType: CodeType;
 }
 
 /**

src/components/CommitHistory/CommitTree/CommitHistroy.tsx

@@ -51,9 +51,12 @@ export default function CommitHistory(props: PropsType): JSX.Element {
                 props.commitID(eachCommit.id);
               }}
             >
-              <h6 className="vertical-timeline-element-title">
-                {eachCommit.message}
-              </h6>
+              <>
+                <h6 className="vertical-timeline-element-title">
+                  {eachCommit.message}
+                </h6>
+                <h6>{'codeType' in eachCommit ? eachCommit.codeType : ''}</h6>
+              </>
             </VerticalTimelineElement>
           );
         })

src/components/CommitHistory/HistoryMain/History.tsx

@@ -6,6 +6,7 @@ import { apiConfig, ApiError } from '../../../api/ApiConfig';
 import {
   CodeApi,
   CodeRevision,
+  CodeType,
   CurrentUserApi,
   GameMapRevision,
   MapApi,
@@ -21,7 +22,12 @@ import styles from './History.module.css';
 import CodeView from '../CodeMapViewbox/CodeView';
 import { Col, Container, Row } from 'react-bootstrap';
 import Toast, { toast } from 'react-hot-toast';
-import { updateUserCode, changeLanguage } from '../../../store/editor/code';
+import {
+  updateUserCode,
+  changeLanguage,
+  updateEditorCodeState,
+  GameType,
+} from '../../../store/editor/code';
 import { useNavigate } from 'react-router-dom';
 import { useTour } from '@reactour/tour';
 
@@ -33,6 +39,9 @@ export default function History(): JSX.Element {
   const [codeFetched, setCodeFetched] = useState<boolean>(false);
   const [currentCode, setCurrentCode] = useState('');
   const [codeLanguage, setCodeLanguage] = useState('');
+  const [currentcodeType, setCurrentCodeType] = useState<CodeType>(
+    CodeType.Normal,
+  );
   const [currentMap, setCurrentMap] = useState<MapObj>({
     map: [],
     mapImg: '',
@@ -64,8 +73,17 @@ export default function History(): JSX.Element {
     codeApi
       .getCodeRevisions()
       .then(codeResp => {
-        setCodeFetched(true);
-        setCodeHistory(codeResp);
+        codeApi
+          .getCodeRevisions(CodeType.Pvp)
+          .then(pvpCodeResp => {
+            setCodeHistory([...codeResp, ...pvpCodeResp]);
+            setCodeFetched(true);
+          })
+          .catch(pvpCodeError => {
+            if (pvpCodeError instanceof ApiError) {
+              Toast.error(pvpCodeError.message);
+            }
+          });
       })
       .catch(codeError => {
         if (codeError instanceof ApiError) {
@@ -96,6 +114,7 @@ export default function History(): JSX.Element {
         setCurrentCode(codeData.code);
         setCodeLanguage(codeData.language.toLowerCase());
         setCurrentCommitMessage(codeData.message);
+        setCurrentCodeType(codeData.codeType);
       }
     });
     completeMapHistory.forEach(mapData => {
@@ -138,6 +157,19 @@ export default function History(): JSX.Element {
         updateUserCode({
           currentUserLanguage: codeLanguage === 'cpp' ? 'c_cpp' : codeLanguage,
           currentUserCode: currentCode,
+          gameType:
+            currentcodeType === CodeType.Normal
+              ? GameType.NORMAL
+              : GameType.PVP,
+        }),
+      );
+      dispatch(
+        updateEditorCodeState({
+          gameType:
+            currentcodeType === CodeType.Normal
+              ? GameType.NORMAL
+              : GameType.PVP,
+          language: codeLanguage === 'cpp' ? 'c_cpp' : codeLanguage,
         }),
       );
       dispatch(changeLanguage(codeLanguage === 'cpp' ? 'c_cpp' : codeLanguage));

src/components/Editor/Editor.tsx

@@ -28,7 +28,7 @@ import {
 
 import {
   updateUserCode,
-  CodeAndLanguage,
+  UpdateUserCodeRequestObject,
   UserCode,
 } from '../../store/editor/code';
 
@@ -160,7 +160,7 @@ export default function CodeEditor(props: Editor.Props): JSX.Element {
         };
         websocket.send(JSON.stringify(currUpdater));
       }
-      const codeNlanguage: CodeAndLanguage = {
+      const codeNlanguage: UpdateUserCodeRequestObject = {
         currentUserCode: editor.getValue(),
         currentUserLanguage: language,
       };

src/store/DailyChallenge/dailyChallenge.ts

@@ -4,7 +4,10 @@ import {
 } from '@codecharacter-2024/client';
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { RootState } from '../store';
-import { CodeAndLanguage, languagesAvailable } from '../editor/code';
+import {
+  UpdateUserCodeRequestObject,
+  languagesAvailable,
+} from '../editor/code';
 import defaultCppCode from '../../assets/codes/cpp/run.cpp?raw';
 import defaultPythonCode from '../../assets/codes/python/run.py?raw';
 import defaultJavaCode from '../../assets/codes/java/Run.java?raw';
@@ -68,7 +71,10 @@ export const dailyChallengeSlice = createSlice({
     ) => {
       state.pageType = action.payload;
     },
-    changeDcCode: (state, action: PayloadAction<CodeAndLanguage>) => {
+    changeDcCode: (
+      state,
+      action: PayloadAction<UpdateUserCodeRequestObject>,
+    ) => {
       const tempCurrentUserLanguage = action.payload.currentUserLanguage;
       const desiredIndex = languagesAvailable.indexOf(tempCurrentUserLanguage);
       state.dcAllLanguagesCode[desiredIndex] = action.payload.currentUserCode;

src/store/editor/code.ts

@@ -37,9 +37,10 @@ const initialState: editorStateType = {
   gameType: GameType.NORMAL,
 };
 
-export interface CodeAndLanguage {
+export interface UpdateUserCodeRequestObject {
   currentUserCode: string;
   currentUserLanguage: string;
+  gameType?: GameType;
 }
 
 export interface GameTypeAndLanguage {
@@ -73,14 +74,19 @@ export const editorSlice = createSlice({
       state.allLanguagesPvPCode[desiredIndex] = action.payload.code;
     },
 
-    updateUserCode: (state, action: PayloadAction<CodeAndLanguage>) => {
+    updateUserCode: (
+      state,
+      action: PayloadAction<UpdateUserCodeRequestObject>,
+    ) => {
       const tempCurrentUserLanguage = action.payload.currentUserLanguage;
       const desiredIndex = languagesAvailable.indexOf(tempCurrentUserLanguage);
-      const newCodeAndLanguage: CodeAndLanguage = {
+      const newCodeAndLanguage: UpdateUserCodeRequestObject = {
         currentUserCode: action.payload.currentUserCode,
         currentUserLanguage: action.payload.currentUserLanguage,
       };
-      if (state.gameType === GameType.NORMAL) {
+      const gameType = action.payload.gameType ?? state.gameType;
+      state.gameType = gameType;
+      if (gameType === GameType.NORMAL) {
         state.allLanguagesNormalCode[desiredIndex] =
           newCodeAndLanguage.currentUserCode;
       } else {