alula-ruby 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb68711713b164848aa6b194152c6f41e102de57412f04555fcc19961820bbf
-  data.tar.gz: 98f3e2bfff91c8d80af2d4df652bdd0a42cc87be09800369bc122941dcac6bdd
+  metadata.gz: 4ba30ce4a88b334fd10633b735f401d59b041cfdf2298a1298b5136e283d4b1d
+  data.tar.gz: '09475f21199c2182b86e3a775b88ed1df2f6617566bb2e980cd0d109d6536630'
 SHA512:
-  metadata.gz: 91c47f517294638509cd4c7511c63b55ae098ffd1c86143dbc9c4af678dfef09004c739cfbdb12572d4210e6e4df2311440b8b305af41515d2b199f5f794b80e
-  data.tar.gz: a89654f421f310e3bc721512431d8e5958567ab8a926c93e9b04ef21f3b2bb1c0b5369537f62db3de43ef11eeff03ba2a839224f67bc3946509ff3ef08fba512
+  metadata.gz: 7266449db3159f70c5a4d77ae25ae59355b7d4dc5e34d8cae838b10292b51c592da29ef192bd363b230f8a65d34195b30d1bfe617db3c25e6595a36f0d133e5b
+  data.tar.gz: eca19d6a1412ba2b51c4e4ba6514b47fd05fff1445b8fd3f6a9868eca43d0148d3c5498fd076eeb8230adbd4cbe5a31922eff061466c068f8eab5602e4245b6b

data/.ruby-version

@@ -1 +1 @@
-3.0.6
+3.3.0

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.0.6-alpine
+FROM ruby:3.3.0-alpine
 
 RUN gem install bundler
 

data/VERSION.md

@@ -2,6 +2,8 @@
 
 | Version | Date      | Description                                                                 |
 | ------- | --------- | --------------------------------------------------------------------------- |
+| v1.7.0  | 2024-06-13  | Add DELETE, PATCH/POST, unregister capabilities for cameras         |
+| v1.6.0  | 2024-01-26  | Add user language attribute         |
 | v1.5.0  | 2024-01-09  | Add more known errors that use a different format         |
 | v1.4.0  | 2024-01-04  | Add more known errors that use a different format, bugfix for `NotImplementedError` raising         |
 | v1.3.0  | 2023-11-20  | Update NotImplemented error's message to include a JSONized hash, add more known errors that use a different format         |

data/alula-docker-compose.yml

@@ -73,6 +73,7 @@ services:
       IPDAPI_WS_WORK_VIGILANCE_CANCEL_BATCH_WINDOW_MSEC: ${IPDAPI_WS_WORK_VIGILANCE_CANCEL_BATCH_WINDOW_MSEC:-10000}
       IPDAPI_WS_WORK_VIGILANCE_CANCEL_TERMINATE_DELAY_MSEC: ${IPDAPI_WS_WORK_VIGILANCE_CANCEL_TERMINATE_DELAY_MSEC:-500}
       IPDAPI_WS_WORK_VIGILANCE_TERMINATE_DELAY_MSEC: ${IPDAPI_WS_WORK_VIGILANCE_TERMINATE_DELAY_MSEC:-500}
+      LOG_LEVEL: warn
       MARIADB_ADDRESS: mariadb
       MARIADB_PASS: ""
       MARIADB_USER: root
@@ -82,13 +83,14 @@ services:
       MONGODB_USER: ipd
       RMQ_EPHEMERAL_ADDRESS: amqp://rmq-ephemeral
       RMQ_PERSISTENT_ADDRESS: amqp://rmq-persistent
+      REDIS_ADDRESS: redis-ipdapi
     healthcheck:
-      interval: 15s
-      retries: 5
+      interval: 5s
+      retries: 10
       start_period: 30s
-      test: curl -s http://localhost/public/v1/healthcheck/default || exit -1
-      timeout: 15s
-    image: 6z1wlx5zf1.execute-api.us-east-1.amazonaws.com/alula/ipdapi:latest-master
+      test: apk add curl && curl -s http://localhost/public/v1/healthcheck/default || exit -1
+      timeout: 10s
+    image: 613707345027.dkr.ecr.us-east-1.amazonaws.com/api/ipdapi:staging
     networks:
       mesh_net:
     profiles:
@@ -101,23 +103,24 @@ services:
     ports:
       - "8080:80"
   mariadb:
+    hostname: mariadb
+    image: mariadb:10.3
     command:
       - --wait_timeout=28800
       - --max_connections=2048
     environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-    healthcheck:
-      interval: 15s
-      retries: 5
-      test: [CMD, mysqladmin, ping, -h, localhost]
-      timeout: 15s
-    image: mariadb:10.3
-    networks:
-      mesh_net:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
     volumes:
       - mariadb_data:/var/lib/mysql
       - ./utils/mariadb/init:/docker-entrypoint-initdb.d
       - ./utils/mariadb/conf:/etc/mysql/conf.d
+    healthcheck:
+      test: mysql -D mysql --silent --execute "SELECT 1;"
+      interval: 30s
+      timeout: 10s
+      retries: 5
+    networks:
+      mesh_net:
   mongodb:
     command: --replSet api0 --bind_ip_all
     environment:
@@ -154,6 +157,19 @@ services:
     image: rabbitmq:management
     networks:
       mesh_net:
+  redis-ipdapi:
+    container_name: redis-ipdapi
+    image: redis:6.0.9-alpine
+    healthcheck:
+      test: ['CMD', 'redis-cli', '--raw', 'incr', 'ping']
+      interval: 1s
+      timeout: 5s
+      retries: 30
+    networks:
+      mesh_net:
+    ports:
+      - 6379:6379
+    restart: always
 version: "3.9"
 volumes:
   dcp-mongo:

data/bin/ipdapi-startup.sh

@@ -4,4 +4,4 @@ echo "INIT $(date +%s)" > /var/run/alula/ipdapi-status
 cat scripts/npm | grep -v npm | bash
 node app/migrations.js --create --up
 echo "READY $(date +%s)" >> /var/run/alula/ipdapi-status
-npm start
+exec node app/main.js

data/lib/alula/procedures/video_unregister_proc.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Alula
+  class VideoUnregisterProc < Alula::RpcResource
+    class Response < Alula::RpcResponse
+    end
+
+    def self.call(device_id:)
+      payload = {
+        deviceId: device_id
+      }
+
+      request(
+        http_method: :post,
+        path: '/rpc/v1/video/unregister',
+        payload: payload,
+        handler: Response
+      )
+    end
+  end
+end

data/lib/alula/resources/user.rb

@@ -141,6 +141,13 @@ module Alula
           filterable: false,
           creatable_by: [],
           patchable_by: %i[system station dealer technician user sub_user]
+    
+    field :language,
+          type: :string,
+          sortable: false,
+          filterable: false,
+          creatable_by: %i[system station dealer technician user sub_user],
+          patchable_by: %i[system station dealer technician user sub_user]
 
     field :def_mod,
           type: :string,

data/lib/alula/resources/video/base_resource.rb

@@ -32,6 +32,11 @@ module Alula
 
       api_name :video
 
+      # Instance method
+      def resource_url(id = nil)
+        "/#{self.class.api_name}/v1/#{self.class.resource_name}/#{id}"
+      end
+
       def construct_from(json_object)
         @raw_data = json_object.dup
         @values = json_object

data/lib/alula/resources/video/device.rb

@@ -2,15 +2,88 @@ module Alula
   module Video
     class Device < Alula::Video::BaseResource
       extend Alula::ApiOperations::Request
+      extend Alula::ApiOperations::Save
+      extend Alula::ApiOperations::Delete
 
-      field :account_id, type: :string
-      field :active, type: :boolean
-      field :brand, type: :string
-      field :hardware_id, type: :string
-      field :manufacturer, type: :string
-      field :name, type: :string
-      field :serial_number, type: :string
-      field :verification_code, type: :string
+      field :account_id,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :active,
+            type: :boolean,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :brand,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :hardware_id,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :manufacturer,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :name,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :serial_number,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :verification_code,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :timezone,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :timezone_id,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :daylight_saving,
+            type: :number,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :time_format,
+            type: :number,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :customer_id,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :online,
+            type: :object,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :settings,
+            type: :object,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
+
+      field :model,
+            type: :string,
+            patchable_by: %i[system station dealer user],
+            creatable_by: %i[system station dealer user]
 
       def is_jsw?
         manufacturer == 'jsw'

data/lib/alula/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alula
-  VERSION = '1.5.0'
+  VERSION = '1.7.0'
 end

data/lib/alula.rb

@@ -94,6 +94,7 @@ require_relative 'alula/procedures/user_plansvideo_price_get'
 require_relative 'alula/procedures/user_get_locked_proc'
 require_relative 'alula/procedures/user_unlock_proc'
 require_relative 'alula/procedures/user_password_reset_proc'
+require_relative 'alula/procedures/video_unregister_proc'
 
 module Alula
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alula-ruby
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Titus Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -240,6 +240,7 @@ files:
 - lib/alula/procedures/user_transfer_reject.rb
 - lib/alula/procedures/user_transfer_request.rb
 - lib/alula/procedures/user_unlock_proc.rb
+- lib/alula/procedures/video_unregister_proc.rb
 - lib/alula/query_interface.rb
 - lib/alula/rate_limit.rb
 - lib/alula/relationship_attributes.rb