Schema updates & apis

Signed-off-by: Omkar Phansopkar <omkarphansopkar@gmail.com>

Author: OmkarPh

server/src/models/OwnerSchema.js

@@ -1,6 +1,7 @@
 import mongoose from "mongoose";
 
 export const OWNER_SCHEMA_ID = "owners"
+import { PERSON_SCHEMA_ID } from './PersonSchema.js'
 
 const ownerSchema = new mongoose.Schema({
   restaurant_name: {
@@ -28,19 +29,19 @@ const ownerSchema = new mongoose.Schema({
   recent_verifications: [
     {
       type: mongoose.Schema.Types.ObjectId,
-      ref: 'Person',
+      ref: PERSON_SCHEMA_ID,
     },
   ],
   my_reported: [
     {
       type: mongoose.Schema.Types.ObjectId,
-      ref: 'Person',
+      ref: PERSON_SCHEMA_ID,
     },
   ],
   my_recommended: [
     {
       type: mongoose.Schema.Types.ObjectId,
-      ref: 'Person',
+      ref: PERSON_SCHEMA_ID,
     },
   ],
 });

server/src/models/PersonSchema.js

@@ -36,6 +36,9 @@ const personSchema = new mongoose.Schema({
     required: true,
     unique: true,
   },
+  aadhar_image_url: {
+    type: String,
+  },
   verified: {
     type: Boolean,
     default: false,

server/src/routes/employee.js

@@ -2,6 +2,29 @@ import express from 'express';
 const router = express.Router();
 
 import { Person } from "../models/PersonSchema.js";
+import { Owner } from '../models/OwnerSchema.js';
+
+// 64313b87073e4cb74d5c01c9
+router.get('/api/recentVerifications', async (req, res) => {
+  try {
+    const gstin = req.query.gstin;
+
+    const owner = await Owner.find({
+      gstin
+    }).populate('recent_verifications').exec();
+    res.status(200).json({
+      success: true,
+      owner,
+    })
+  } catch(err) {
+    console.log("Err", err);
+    res.status(200).json({
+      success: true,
+      message: "Some error",
+      owner: null
+    })
+  }
+});
 
 router.get('/api/myEmployees', async (req, res) => {
   try {

server/src/routes/newEntity.js

@@ -28,13 +28,14 @@ router.post('/api/newPerson', async (req, res) => {
   if (missingFields.length > 0) {
     return res.status(400).json({ error: `Missing mandatory fields: ${missingFields.join(', ')}` });
   }
-
   const person = new Person(req.body);
+  console.log("New person", person);
 
   try {
     const savedPerson = await person.save();
     res.json({ message: "New person created successfully", id: savedPerson._id });
   } catch (err) {
+    console.log("Err creating person", err);
     res.status(500).json({ message: err.message });
   }
 });

src/apis/employees.jsx

@@ -1,6 +1,11 @@
 import axios from 'axios';
 import { SERVER_URL } from '../constants/config';
 
+export const getRecentVerifications = async (gstin) => {
+  if(!gstin)  return [];
+  const employees = await axios.get(`${SERVER_URL}/api/recentVerifications?gstin=${gstin}`);
+  return employees.data.owner.recent_verifications;
+}
 export const getEmployees = async (gstin) => {
   if(!gstin)  return [];
   const employees = await axios.get(`${SERVER_URL}/api/myEmployees?gstin=${gstin}`);

src/constants/testPeople.js

@@ -196,7 +196,7 @@ export const testPeople = [
 ];
 
 
-const batch2=[
+export const batch2 = [
   {
     first_name: "Rajesh",
     middle_name: "Kishore",
@@ -206,9 +206,10 @@ const batch2=[
     gender: "Male",
     phone_number: "9654321078",
     email: "rajesh.rao@yahoo.com",
-    aadhar_number: "1234 5678 9012",
+    aadhar_number: "1234 5678 9522",
     address: "4th Floor, Koregaon Park, Pune",
     // pan_number: "PQRST7890A",
+    verified: true,
   },
   {
     first_name: "Anjali",
@@ -219,9 +220,10 @@ const batch2=[
     gender: "Female",
     phone_number: "9876543102",
     email: "anjali.patil@hotmail.com",
-    aadhar_number: "2345 6789 0123",
+    aadhar_number: "2345 6789 7123",
     address: "10th Floor, Pimpri, Pune",
     // pan_number: "QRSTU1234B",
+    verified: true,
   },
   {
     first_name: "Rohan",
@@ -232,9 +234,10 @@ const batch2=[
     gender: "Male",
     phone_number: "8765432101",
     email: "rohan.thakur@gmail.com",
-    aadhar_number: "3456 7890 1234",
+    aadhar_number: "3456 7890 1724",
     address: "7th Floor, Khar West, Mumbai",
     // pan_number: "RSTUV2345C",
+    verified: true,
   },
   {
     first_name: "Neha",
@@ -245,9 +248,10 @@ const batch2=[
     gender: "Female",
     phone_number: "7654321098",
     email: "neha.gokhale@yahoo.com",
-    aadhar_number: "4567 8901 2345",
+    aadhar_number: "4597 2901 2345",
     address: "13th Floor, Mulund West, Mumbai",
     // pan_number: "STUVW3456D",
+    verified: true,
   },
   {
     first_name: "Aakash",
@@ -258,10 +262,15 @@ const batch2=[
     gender: "Male",
     phone_number: "6543210987",
     email: "aakash.nair@hotmail.com",
-    aadhar_number: "5678 9012 3456",
+    aadhar_number: "5678 9012 8456",
     address: "5th Floor, Hinjewadi, Pune",
     // pan_number: "TUVWX4567E",
+    verified: false,
   },
+
+];
+
+export const batch3 = [
   {
     first_name: "Tina",
     middle_name: "Nikhil",
@@ -297,7 +306,7 @@ const batch2=[
     gender: "Female",
     phone_number: "8765432109",
     email: "simran.patil@hotmail.com",
-    aadhar_number: "5678 9012 3456",
+    aadhar_number: "5678 9012 7456",
     address: "11th Floor, Koregaon Park, Pune",
     // pan_number: "RSTUV7890U",
   },

src/context/AuthContext.jsx

@@ -39,11 +39,11 @@ export const AuthProvider = ({ children }) => {
       .then((res) => res.json())
       .then((data) => {
         if (data.success) {
-          console.log("Verified token:", data);
+          console.log("Verified token");
           setIsLoggedIn(true);
           setProfile(data.profile);
         } else {
-          console.log("Invalid token:", data);
+          console.log("Invalid token", data);
           localStorage.removeItem("token");
         }
       })

src/pages/dashboard.jsx

@@ -1,8 +1,9 @@
-import { useRouter } from 'next/router';
-import React, { useEffect, useState } from 'react'
-import { withAuthenticatedRoute } from '../context/AuthContext';
+import React from 'react'
+import { useAuth, withAuthenticatedRoute } from '../context/AuthContext';
 
 const Dashboard = () => {
+  const { profile } = useAuth();
+  console.log(profile);
     // const router = useRouter()
     // const [expandDiv, setExpandDiv] = useState(true)
     // const [currentRoute, setCurrentRoute] = useState('')

src/pages/test.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 import React, { useEffect } from "react";
 import { useAuth } from "../context/AuthContext";
 import Loader from "../components/loader";
-import { testPeople } from "../constants/testPeople";
+import { batch2 } from "../constants/testPeople";
 import { SERVER_URL } from "../constants/config";
 
 
@@ -17,7 +17,7 @@ const Test = () => {
   }
 
   async function setup(){
-    for(const person of testPeople){
+    for(const person of batch2){
       const params = {
         first_name: person.first_name,
         middle_name: person.middle_name,