Merge pull request #9 from neuralarchitects/shareDevice

Fixed the shared device issues

Author: TheArchitect2000

admin_web_app/Source_webapp/src/services/DeviceApi.ts

@@ -18,12 +18,8 @@ export async function apiGetAllDevices<T>() {
 
 export async function apiUnshareDevice<T>(deviceId: string) {
     return ApiService.fetchData<T>({
-        url: `${import.meta.env.VITE_URL}v1/device/edit`,
+        url: `${import.meta.env.VITE_URL}v1/device/global-unshare/${deviceId}`,
         method: 'patch',
-        data: {
-            deviceId: deviceId,
-            isShared: false,
-        },
     })
 }
 

admin_web_app/Source_webapp/src/views/alldevices/components/DeviceTable.tsx

@@ -98,18 +98,30 @@ const DevicesTable: React.FC<UsersTableProps> = ({ setCount, superAdmin }) => {
             try {
                 setApiLoading(true)
                 const res = await apiUnshareDevice(String(deviceData?._id))
-                setApiLoading(false)
-                setUnshareDialog(false)
-                toast.push(
-                    <Notification
-                        title={'Device was successfully unshared.'}
-                        type="success"
-                    />,
-                    {
-                        placement: 'top-center',
-                    }
-                )
-                refreshPage()
+                if (res.status !== 200) {
+                    toast.push(
+                        <Notification
+                            title={'Error while unsharing device'}
+                            type="danger"
+                        />,
+                        {
+                            placement: 'top-center',
+                        }
+                    )
+                } else {
+                    setApiLoading(false)
+                    setUnshareDialog(false)
+                    toast.push(
+                        <Notification
+                            title={'Device was successfully unshared.'}
+                            type="success"
+                        />,
+                        {
+                            placement: 'top-center',
+                        }
+                    )
+                    refreshPage()
+                }
             } catch (error: any) {
                 setApiLoading(false)
                 setUnshareDialog(false)

backend/src/modules/device/controllers/device.controller.ts

@@ -32,6 +32,7 @@ import { DeviceService } from '../services/device.service';
 import { EditDeviceDto } from '../data-transfer-objects/edit-device.dto';
 import { UserService } from 'src/modules/user/services/user/user.service';
 import { LocalShareDto } from '../data-transfer-objects/local-share-dto';
+import { GlobalShareDto } from '../data-transfer-objects/global-share-dto';
 
 @ApiTags('Manage Devices')
 @Controller('app')
@@ -142,6 +143,50 @@ export class DeviceController {
     return this.result;
   }
 
+  @Patch('v1/device/global-unshare/:deviceId')
+  @HttpCode(200)
+  @UseGuards(JwtAuthGuard)
+  @ApiBearerAuth()
+  @ApiOperation({
+    summary: 'Global unshare device.',
+    description: 'This API will globally unshare a device with user',
+  })
+  async globalUnShareDevice(
+    @Param('deviceId') deviceId: string,
+    @Request() request,
+  ) {
+    const isAdmin = await this.isAdmin(request.user.userId);
+    await this.deviceService.unshareGlobalDevice(
+      deviceId,
+      request.user.userId,
+      isAdmin,
+    );
+    return { message: 'Device unshared' };
+  }
+
+  @Patch('v1/device/global-share/:deviceId')
+  @HttpCode(200)
+  @UseGuards(JwtAuthGuard)
+  @ApiBearerAuth()
+  @ApiOperation({
+    summary: 'Global share device.',
+    description: 'This API will globally share a device with user',
+  })
+  async globalShareDevice(
+    @Param('deviceId') deviceId: string,
+    @Body() body: GlobalShareDto,
+    @Request() request,
+  ) {
+    const isAdmin = await this.isAdmin(request.user.userId);
+    await this.deviceService.globalShareDevice(
+      deviceId,
+      body,
+      request.user.userId,
+      isAdmin,
+    );
+    return { message: 'Device sharing updated successfully' };
+  }
+
   @Get('v1/device/get-devices-by-user-id/:userId')
   @HttpCode(200)
   @UseGuards(JwtAuthGuard)
@@ -651,11 +696,11 @@ export class DeviceController {
     description:
       'This API will return all devices that are sharing with a user.',
   })
-  async getAllDevicesSharingWithUser(
-    @Request() request,
-  ) {
+  async getAllDevicesSharingWithUser(@Request() request) {
     console.log('We are in getAllDevicesSharingWithUser controller');
 
-    return await this.deviceService.getSharedDevicesWithUserId(request.user.userId);
+    return await this.deviceService.getSharedDevicesWithUserId(
+      request.user.userId,
+    );
   }
 }

backend/src/modules/device/data-transfer-objects/edit-device.dto.ts

@@ -63,11 +63,6 @@ export class EditDeviceDto {
   @ApiProperty({ required: false })
   parameters: [];
 
-  @IsOptional()
-  @IsBoolean({ message: 'isShared must be boolean.' })
-  @ApiProperty({ required: false })
-  isShared: boolean;
-
   @IsOptional()
   @IsNumber({}, { message: 'costOfUse must be number.' })
   @ApiProperty({ required: false })

backend/src/modules/device/data-transfer-objects/global-share-dto.ts

@@ -0,0 +1,25 @@
+import { ApiProperty } from '@nestjs/swagger';
+import {
+  ArrayMaxSize,
+  ArrayMinSize,
+  IsArray,
+  IsNumber,
+  IsOptional,
+} from 'class-validator';
+
+export class GlobalShareDto {
+  @IsOptional()
+  @IsNumber({}, { message: 'costOfUse must be number.' })
+  @ApiProperty({ required: false })
+  costOfUse: number;
+
+  @IsArray()
+  @ArrayMinSize(2)
+  @ArrayMaxSize(2)
+  @ApiProperty({
+    required: true,
+    type: [Number],
+    description: 'Array of [latitude, longitude]',
+  })
+  coordinate: number[];
+}

backend/src/modules/device/interfaces/device.interface.ts

@@ -2,7 +2,7 @@ import { Types } from 'mongoose';
 import { Document } from 'mongoose';
 
 export interface Device extends Document {
-  nodeMqttAddress?: string
+  nodeMqttAddress?: string;
   userId: string;
   nodeId: string;
   nodeDeviceId: string;
@@ -17,7 +17,7 @@ export interface Device extends Document {
   sharedWith: Array<Types.ObjectId>;
   isShared: boolean;
   costOfUse: number;
-  location: string;
+  location: { coordinates: number[]; type: string } | string;
   geometry: string;
   insertedBy: string;
   insertDate: string;

backend/src/modules/device/repositories/device.repository.ts

@@ -91,9 +91,7 @@ export class DeviceRepository {
       .select(this.getDeviceKeys());
   }
 
-  async getDevicesByUserId(
-    userId,
-  ) {
+  async getDevicesByUserId(userId) {
     console.log('we are in getDevicesByUserId repository!');
 
     return await this.deviceModel
@@ -286,6 +284,4 @@ export class DeviceRepository {
 
     return !!result; // Returns true if found, false otherwise
   }
-
-  
 }