alula-ruby 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 283c173186ac6c408bd812e2dbdd466c48a0a5eb1b8c4714a236e9d69da36ae6
-  data.tar.gz: b9d0e6d2584e9b137d74b72581815631e296ba19e580f661b6a0bea4b13b8304
+  metadata.gz: e5b52a039a55a975a9e384c3bcee4396747836b75a5a128c016afdc4e0da5e55
+  data.tar.gz: 6a687418c9664f3a3500edd4fdd6c0502519a1656d525a19374db77a6103b81d
 SHA512:
-  metadata.gz: 635a48885463ef07a4357942d6fa6568acf87a53701c6ae830931250dd1dcf23be70131ab29db45f81ad36714b897976712d0019bc7531de8d3fa09d648108bb
-  data.tar.gz: 1176d9b7db59f83448a0e47d87be171f42b46b0a8113b4a827f3e1246cf47a371177e39e7437ccd3dc1500289d8a68bb9e2de7f90027868d48464d849c545a5f
+  metadata.gz: c8118a0de2222644c1cdd47fcde599deda77025608dfc65200e0bdfe16b4b744c1cf08fc81ae154c797bb3e856a2914627fa0fe5bae327e29a949e1466014fda
+  data.tar.gz: ee50bc1b597d15747c9761fc090a3a213ea8867e2a9102c5b149ff7de977f61b8a41a0f617d0a5d29aebb8bbbe77d5c38922ef95d062ec7970a9b1a3fae0493a

data/.circleci/config.yml

@@ -1,14 +1,37 @@
-version: 2
+version: 2.1
+
+orbs:
+  aws-ecr: circleci/aws-ecr@8.1.2
+
+workflows:
+  version: 2.1
+  build:
+    jobs:
+      - build:
+          context:
+            - AWS Shared
+            - NPMJS Secrets
+
 jobs:
   build:
-    machine: true
+    machine:
+      image: ubuntu-2004:current
+    resource_class: large
     steps:
       - checkout
-      ## Launch ipdapi stack
-      - run: docker-compose -f alula-docker-compose.yml up -d
-      ## Prepare ruby container to execute tests
-      - run: docker-compose build
-      - run: docker-compose run --name alula-ruby-build alula-ruby bin/setup
-      - run: docker commit alula-ruby-build alula-ruby
-      ## Execute tests
-      - run: docker-compose run alula-ruby bundle exec rspec
+      - aws-ecr/ecr-login
+      - run:
+          name: Set a local .env file
+          command: cp .env.example .env
+      - run:
+          name: Bring up the Core API
+          command: make up
+      - run: 
+          name: Install ruby deps
+          command: sudo apt update && sudo apt install ruby-full
+      - run:
+          name: Install gems
+          command: bundle install
+      - run:
+          name: Execute test suite
+          command: bundle exec rspec --format documentation

data/.env.example

@@ -1,8 +1,9 @@
 CLIENT_ID=<oauth_id>
 CLIENT_SECRET=<oauth_secret>
-API_URL=<api_url>
+API_URL=http://127.0.0.1:8080
+TEST_SWARM_URL=http://127.0.0.1:8088
 DEALER_ACCOUNT_UN=<dealer_account>
 DEALER_ACCOUNT_PW=<dealer_password>
 ADMIN_ACCOUNT_UN=<admin_username>
 ADMIN_ACCOUNT_PW=<admin_password>
-TEST_ACCESS_TOKEN=<test_access_token>
+TEST_ACCESS_TOKEN=<test_access_token>

data/.gitignore

@@ -21,3 +21,5 @@
 .idea
 spec/testDataResult.json
 /Gemfile.lock
+
+/container

data/Dockerfile

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

data/Makefile

@@ -0,0 +1,11 @@
+up: 
+	docker compose --profile app -f alula-docker-compose.yml up -d
+
+down: 
+	docker compose --profile app -f alula-docker-compose.yml down
+
+down-clean:
+	docker compose --profile app -f alula-docker-compose.yml down -v
+
+status:
+	docker compose --profile app -f alula-docker-compose.yml ps

data/README.md

@@ -8,10 +8,10 @@ Refer to last two sections if you're making changes in alula-ruby to be used as
 
 ## Installation
 
-This gem is private, and can be installed via bundler using a Git fetch strategy:
+This gem is public, and can be installed via bundler from Rubygems.
 
 ```ruby
-gem 'alula-ruby', git: "git@github.com:alula-net/alula-ruby.git", tag: 'v0.2.0'
+gem 'alula-ruby', '~> 1.1'
 ```
 
 If you use `Sidekiq` and plan on using the Alula-Ruby gem in your Sidekiq workers, you should also bundle the `RequestStore-Sidekiq` extension. This extension is used to store client authorization info in `Thread.current` for multithreading support.
@@ -386,38 +386,59 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Alula Ruby runs its unit & integratin tests against a copy of the API running in Docker. The remote API is cleaned up (DB truncated & re-seeded fresh) between every `describe` or `context` block.
 
-1. Set up local `ipdapi` cluster/swarm using `docker-compose`:
+1.  Authenticate with AWS
 
-        docker-compose -f alula-docker-compose.yml up -d
+    Set the registry account number to refer to
+
+    ```bash
+    export AWS_ECR_REGISTRY_ID=613707345027 #409473619697
+    ```
+
+    Then execute AWS login where the `$env` is whatever profile name your Shared Services account is setup under in AWS CLI SSO.
+
+    ```bash
+    aws ecr get-login-password --profile $env | docker login \
+      --username AWS --password-stdin $AWS_ECR_REGISTRY_ID.dkr.ecr.$AWS_REGION.amazonaws.com
+    ```
+
+2.  Set up local Core API cluster/swarm using `make`:
+
+        make up
 
     or use the `alula-docker-compose` approach:
 
         alula-docker-compose -I @test-helper --registry '6z1wlx5zf1.execute-api.us-east-1.amazonaws.com/' -- up -d
 
-1. Configure your shell with some shortcuts. Note: If you don't have these present in your shell nothing will work.
+Note: You do need to be authorized against our private ECR registry. This is manual, talk with an Alula Lead to get pointed in the right direction. TODO: Write out what we need to do for this.
 
-        export API_URL=http://127.0.0.1:8800
-        export ALULA_SWARM_TEST_HELPER_URL=http://127.0.0.1:8850
-        export ALULA_SWARM_TEST_HELPER_PORT=8850        
+1.  Configure your local .env file, you can copy-paste `.env.example` over to `.env`
 
-1. Run the complete test suite:
+1.  Run the complete test suite:
 
-       `bundle exec rspec`
+    `bundle exec rspec`
 
-1. Run a specific test file:
+1.  Run a specific test file:
 
         `bundle exec rspec ./spec/alula/oauth_spec.rb`
 
-1. Run Guard to have tests run on file change
+1.  Run Guard to have tests run on file change
 
         `bundle exec guard`
 
-1. Update all Docker images to the latest images:
+1.  If you're using the Ruby Test Explorer extension to run the tests within VS Code, SimpleCov has a dry run error preventing auto detection. You need to turn off minimum coverage to get the dry run command it uses to find tests to work.
 
-    `docker-compose -f alula-docker-compose.yml pull`
+    ```ruby
+    SimpleCov.start do
+      add_filter '/spec/'
+      minimum_coverage 0
+    end
+    ```
 
-Occasionally under heavy use the dockerized API may lose or drop its databases, resulting in the test suite erroring completly and very quickly. To fix this simply restart the API with `docker-compose -f alula-docker-compose.yml down && docker-compose -f alula-docker-compose.yml up -d`
+1.  Update all Docker images to the latest images:
 
+    `docker compose -f alula-docker-compose.yml pull`
+
+Occasionally under heavy use the dockerized API may lose or drop its databases, resulting in the test suite erroring completly and very quickly. To fix this simply restart the API with `docker-compose -f alula-docker-compose.yml down && docker-compose -f alula-docker-compose.yml up -d`
 
 ## Importing GEM in AC Docker
 

data/VERSION.md

@@ -2,9 +2,11 @@
 
 | Version | Date      | Description                                                                 |
 | ------- | --------- | --------------------------------------------------------------------------- |
-| v1.0.2  | 2023-05-30 | Includes v0.69.11 - fix for a field not being underscoreable |
-| v1.0.1  | 2023-05-30 | Includes v0.69.10 |
-| v1.0.0  | 2023-05-30 | Ruby 3 support with some breaking changes |
+| v1.2.0  | 2023-08-10  | Support objects and saving to objects natively         |
+| v1.1.0  | 2023-08-01  | Fixes Ruby 3 argument errors in filter builder. Gets test suite running again in circle |
+| v1.0.2  | 2023-05-30  | Includes v0.69.11 - fix for a field not being underscoreable |
+| v1.0.1  | 2023-05-30  | Includes v0.69.10 |
+| v1.0.0  | 2023-05-30  | Ruby 3 support with some breaking changes |
 | v0.69.10| 2023-06-14  | Dealer phone relationship |
 | v0.69.9 | 2023-04-18  | Dealer Program resource update |
 | v0.69.8 | 2023-03-29  | Use isCamera and isPanel API fields |

data/alula-docker-compose.yml

@@ -1,80 +1,170 @@
-version: '3.2'
+networks:
+  mesh_net:
 services:
   alula-swarm-test-helper:
-    command: ''
-    image: 6z1wlx5zf1.execute-api.us-east-1.amazonaws.com/alula/alula-swarm-test-helper
+    platform: linux/amd64
     depends_on:
-    - mariadb
-    - mongodb
-    deploy:
-      replicas: 1
+      ipdapi:
+        condition: service_healthy
     environment:
-      MARIADB_ADDRESS: mariadb
-      MONGODB_ADDRESS: mongodb
-      MARIADB_PASS: ''
-      MARIADB_USER: root
-    ports:
-    - published: 8850
-      target: 80
-    restart: always
-  ipdapi:
-    depends_on:
-    - mariadb
-    - mongodb
-    - rabbitmq
-    deploy:
-      replicas: 1
-    environment:
-      HFA_ADDRESS: hfa
-      IPDAPI_AUTO_CREATE_DATABASES: "true"
-      IPDAPI_AUTO_SCHEMA_MIGRATIONS: "true"
+      IPDAPI_BSD_CLIENT_ID: 78989370-1e24-41ac-b86d-bb07feee01f9
+      IPDAPI_BSD_CLIENT_SECRET: bsdpass
       IPDAPI_DFS_CLIENT_ID: 10211607-dd43-464b-8cfb-0d8b78beee1e
       IPDAPI_DFS_CLIENT_SECRET: dfspass
       IPDAPI_HFA_CLIENT_ID: c35a00cb-624d-41cc-9528-aac367ecf690
       IPDAPI_HFA_CLIENT_SECRET: hfapass
+      IPDAPI_MAP_CLIENT_ID: 8b3fe43d-b0a3-45f2-b245-ab1986a597fe
+      IPDAPI_MAP_CLIENT_SECRET: mappass
+      IPDAPI_MNM_CLIENT_ID: 70ae63a8-8791-4fbc-b7ef-46824d71a4f5
+      IPDAPI_MNM_CLIENT_SECRET: mnmpass
       IPDAPI_MPA_CLIENT_ID: 0a98a1dd-1c42-4891-9bb4-d4d8f705b64e
       IPDAPI_MPA_CLIENT_SECRET: mpapass
+      IPDAPI_SCD_CLIENT_ID: 6a2e2df1-ba64-11ec-9605-b516fa27ea87
+      IPDAPI_SCD_CLIENT_SECRET: scdpass
+      MARIADB_ADDRESS: mariadb
+      MARIADB_PASS: ""
+      MARIADB_USER: root
+      MONGODB_ADDRESS: mongodb
+      MONGODB_PASS: ipdpass
+      MONGODB_USER: ipd
+      RMQ_EPHEMERAL_ADDRESS: rmq-ephemeral
+      RMQ_PERSISTENT_ADDRESS: rmq-persistent
+      RP_ADMIN_AUTH_ID: 12
+      RP_ADMIN_AUTH_KEY: xxxxx
+      RP_AUTH_ID: 1234
+      RP_AUTH_KEY: xxxxx
+      RP_BASE_URL: https://config.alula.net/api
+      RP_PARTNER_ID: 12345
+      STACKNAME: test
+    healthcheck:
+      interval: 15s
+      retries: 5
+      start_period: 30s
+      test: |
+        test -f healthy.txt || curl --request POST --url http://localhost/populate/default/clients && touch healthy.txt
+      timeout: 15s
+    image: 613707345027.dkr.ecr.us-east-1.amazonaws.com/alula/alula-swarm-test-helper:master
+    networks:
+      mesh_net:
+    restart: on-failure
+    ports:
+      - "8088:80"
+  ipdapi:
+    platform: linux/amd64
+    depends_on:
+      mariadb:
+        condition: service_healthy
+      mongodb:
+        condition: service_healthy
+      rmq-ephemeral:
+        condition: service_healthy
+      rmq-persistent:
+        condition: service_healthy
+    entrypoint: /usr/src/app/startup.sh
+    environment:
+      IPDAPI_AUTO_CREATE_DATABASES: true
+      IPDAPI_FEATURES_CONNECT_PLUS_USERPIN: true
+      IPDAPI_RL_AUTH_MAX_HITS: ${IPDAPI_RL_AUTH_MAX_HITS:-1000}
+      IPDAPI_RL_DEFAULT_MAX_HITS: ${IPDAPI_RL_DEFAULT_MAX_HITS:-10000}
+      IPDAPI_RL_LOGIN_MAX_HITS: ${IPDAPI_RL_LOGIN_MAX_HITS:-1000}
+      IPDAPI_TRUST_PROXY: loopback
+      IPDAPI_WS_WORK_EVENTS_ENABLED: true
+      IPDAPI_WS_WORK_VIGILANCE_BATCH_WINDOW_MSEC: ${IPDAPI_WS_WORK_VIGILANCE_BATCH_WINDOW_MSEC:-5000}
+      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}
       MARIADB_ADDRESS: mariadb
-      MARIADB_PASS: ''
+      MARIADB_PASS: ""
       MARIADB_USER: root
+      MNC_ENABLE: false
       MONGODB_ADDRESS: mongodb
-      MPA_ADDRESS: mpa
-      RMQ_EPHEMERAL_ADDRESS: rabbitmq
-      RMQ_PERSISTENT_ADDRESS: rabbitmq
-      REDIS_ADDRESS: redis
-    image: 6z1wlx5zf1.execute-api.us-east-1.amazonaws.com/alula/ipdapi:latest-staging
+      MONGODB_PASS: ipdpass
+      MONGODB_USER: ipd
+      RMQ_EPHEMERAL_ADDRESS: amqp://rmq-ephemeral
+      RMQ_PERSISTENT_ADDRESS: amqp://rmq-persistent
+    healthcheck:
+      interval: 15s
+      retries: 5
+      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
+    networks:
+      mesh_net:
+    profiles:
+      - app
+      - deps
+    volumes:
+      - source: ./bin/ipdapi-startup.sh
+        target: /usr/src/app/startup.sh
+        type: bind
     ports:
-      - published: 8800
-        target: 80
-    restart: always
+      - "8080:80"
   mariadb:
     command:
-    - --wait_timeout=28800
-    - --max_connections=2048
-    deploy:
-      endpoint_mode: dnsrr
-      replicas: 1
+      - --wait_timeout=28800
+      - --max_connections=2048
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-      MYSQL_DATABASES: eacs_v1,aes_v1,api_oauth,ipdt_gm
-    image: mariadb:10.1.33
-    restart: always
+    healthcheck:
+      interval: 15s
+      retries: 5
+      test: [CMD, mysqladmin, ping, -h, localhost]
+      timeout: 15s
+    image: mariadb:10.3
+    networks:
+      mesh_net:
     volumes:
-    - target: /var/lib/mysql/
-      type: tmpfs
+      - mariadb_data:/var/lib/mysql
+      - ./utils/mariadb/init:/docker-entrypoint-initdb.d
+      - ./utils/mariadb/conf:/etc/mysql/conf.d
   mongodb:
-    deploy:
-      replicas: 1
+    command: --replSet api0 --bind_ip_all
+    environment:
+      MONGO_INITDB_ROOT_PASSWORD: ipdpass
+      MONGO_INITDB_ROOT_USERNAME: ipd-root
+    healthcheck:
+      interval: 2s
+      start_period: 30s
+      test: |
+        test -f healthy.txt || test $$(echo 'rs.initiate({"_id" : "api0", "members" : [{"_id" : 0,"host" : "mongodb:27017"}]}).ok || rs.status().ok' | mongo -u ipd-root -p ipdpass --quiet) -eq 1 && echo > healthy.txt
     image: mongo:4.4.1-bionic
-    restart: always
-  rabbitmq:
-    deploy:
-      replicas: 1
-    image: rabbitmq:3-management-alpine
-    restart: always
-  redis:
-    deploy:
-      replicas: 1
-    image: redis:6.0.9-alpine
-    restart: always
-
+    networks:
+      mesh_net:
+    ports:
+      - "17017:27017/tcp"
+    volumes:
+      - ./container/mongodb_data:/data/db/
+      - ./utils/mongodb/init/:/docker-entrypoint-initdb.d/
+  rmq-ephemeral:
+    healthcheck:
+      interval: 30s
+      retries: 5
+      test: rabbitmq-diagnostics -q ping
+      timeout: 15s
+    image: rabbitmq:management
+    networks:
+      mesh_net:
+  rmq-persistent:
+    healthcheck:
+      interval: 30s
+      retries: 5
+      test: rabbitmq-diagnostics -q ping
+      timeout: 15s
+    image: rabbitmq:management
+    networks:
+      mesh_net:
+version: "3.9"
+volumes:
+  dcp-mongo:
+  dcp-node-modules:
+  dcp-shell-node-modules:
+  dcw-node-modules:
+  hfa-sess-cache:
+  kafka1:
+  kafka2:
+  kafka3:
+  mariadb_data:
+  mongodb_data:
+  zoodata:
+  zoolog:

data/bin/ipdapi-startup.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+mkdir -p /var/run/alula
+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

data/container/alula/test/.keep

@@ -0,0 +1 @@
+.keep

data/container/mongodb_data/.keep

@@ -0,0 +1 @@
+.keep

data/lib/alula/api_resource.rb

@@ -99,6 +99,8 @@ module Alula
           else
             obj[key] = val.to_s
           end
+        elsif val.is_a? Alula::ObjectField
+          obj[key] = val.as_json
         else
           obj[key] = val
         end

data/lib/alula/filter_builder.rb

@@ -108,7 +108,7 @@ module Alula
       update_and_return(new_values)
     end
 
-    def or_like(**args)
+    def or_like(args = {})
       new_values = args.each_pair.each_with_object({}) do |(key, value), collector|
         field_name = validate_field_filterability! key
         field_value = simple_value! value
@@ -135,7 +135,7 @@ module Alula
     #
     # Generate a $not_between query for hash, the values of the hash must be
     # an array with 2 elements that are JSON-encodable
-    def not_between(**args)
+    def not_between(args = {})
       new_values = args.each_pair.each_with_object({}) do |(key, range), collector|
         field_name = validate_field_filterability! key
         range_start, range_end = validate_range_value! range, field_name
@@ -148,7 +148,7 @@ module Alula
     #
     # Generate an $in query for hash, the values of the hash must be
     # an array that is JSON-encodable
-    def in(**args)
+    def in(args = {})
       new_values = args.each_pair.each_with_object({}) do |(key, range), collector|
         field_name = validate_field_filterability! key
         values = simple_values! range
@@ -160,7 +160,7 @@ module Alula
     #
     # Generate an $in query for hash, the values of the hash must be
     # an array that is JSON-encodable
-    def not_in(**args)
+    def not_in(args = {})
       new_values = args.each_pair.each_with_object({}) do |(key, range), collector|
         field_name = validate_field_filterability! key
         values = simple_values! range
@@ -182,16 +182,28 @@ module Alula
     # Transform the field name into an API-valid lowerCamelCase
     # format and return it.
     def validate_field_filterability!(field_name)
+
+      # Use the parent of a features_selected.alarm_transmission (features_selected) to check filterability
       underscored = Util.underscore(field_name).to_sym
+      mod_field_name = underscored.to_s.split('.')[0].to_sym
+
+      # Used to save the actual where, so we don't use the parent object here
       camelized   = Util.camelize(underscored).to_s
 
-      unless model_class.get_fields.include?(underscored)
-        error = "Field `#{underscored}` does not exist resource `#{model_class}`"
+      unless model_class.get_fields.include?(mod_field_name)
+        error = "Field `#{mod_field_name}` does not exist resource `#{model_class}`"
+        raise Alula::InvalidFilterFieldError.new(error)
+      end
+
+      unless model_class.filterable_fields.include?(mod_field_name)
+        error = "Field `#{mod_field_name}` is not filterable on resource `#{model_class}`"
         raise Alula::InvalidFilterFieldError.new(error)
       end
 
-      unless model_class.filterable_fields.include?(underscored)
-        error = "Field `#{underscored}` is not filterable on resource `#{model_class}`"
+      # Make sure that we are filtering on the actual field name, not the parent
+      field_settings = model_class.get_fields[mod_field_name]
+      if field_settings[:type] == :object && field_settings[:use] && underscored.to_s.split('.').length == 1
+        error = "Field `#{mod_field_name}` is not filterable on resource `#{model_class}`. Please specify child property"
         raise Alula::InvalidFilterFieldError.new(error)
       end
 
@@ -203,16 +215,28 @@ module Alula
     # Transform the field name into an API-validated lowerCamelCase
     # TODO: This doesn't belong here, should be on its own include I think
     def validate_field_sortability!(field_name)
+
+      # Use the parent of a features_selected.alarm_transmission (features_selected) to check sortability
       underscored = Util.underscore(field_name).to_sym
+      mod_field_name = underscored.to_s.split('.')[0].to_sym
+
+      # Used to save the actual where, so we don't use the parent object here
       camelized   = Util.camelize(underscored).to_s
 
-      unless model_class.get_fields.include?(underscored)
-        error = "Field `#{underscored}` does not exist resource `#{model_class}`"
-        raise Alula::InvalidFilterFieldError.new(error)
+      unless model_class.get_fields.include?(mod_field_name)
+        error = "Field `#{mod_field_name}` does not exist resource `#{model_class}`"
+        raise Alula::InvalidSortFieldError.new(error)
       end
 
-      unless model_class.sortable_fields.include?(underscored)
-        error = "Field `#{underscored}` is not sortable on resource `#{model_class}`"
+      unless model_class.sortable_fields.include?(mod_field_name)
+        error = "Field `#{mod_field_name}` is not sortable on resource `#{model_class}`"
+        raise Alula::InvalidSortFieldError.new(error)
+      end
+      
+      # Make sure that we are sorting on the actual field name, not the parent
+      field_settings = model_class.get_fields[mod_field_name] 
+      if field_settings[:type] == :object && field_settings[:use] && underscored.to_s.split('.').length == 1
+        error = "Field `#{mod_field_name}` is not sortable on resource `#{model_class}`. Please specify child property"
         raise Alula::InvalidSortFieldError.new(error)
       end
 

data/lib/alula/query_interface.rb

@@ -50,7 +50,7 @@ module Alula
       self
     end
 
-    def custom_options(**options)
+    def custom_options(options = {})
       @custom_options = Util.deep_merge(@custom_options, {
         customOptions: options
       })

data/lib/alula/resource_attributes.rb

@@ -7,6 +7,10 @@ module Alula
         @type = nil
         @http_methods = []
         @fields = {}
+
+        def mark_dirty(field_name, old_value, new_value)
+          @dirty_attributes << field_name if old_value != new_value
+        end
       end
       base.include(InstanceMethods)
     end
@@ -60,6 +64,8 @@ module Alula
             rescue ArgumentError
               value
             end
+          elsif opts[:type] == :object && opts[:use] && !value.nil? && value.respond_to?(:each)
+            opts[:use].new(@dirty_attributes, field_name, value)
           elsif opts[:type] == :boolean
             [true, 'true', 1, '1'].include? value
           elsif opts[:symbolize] == true
@@ -87,16 +93,12 @@ module Alula
             new_value = [true, 'true', 1, '1'].include? new_value
           end
 
-          #
           # Mark the attribute as dirty if the new value is different
-          @dirty_attributes << field_name if @values[jsonKey] != new_value
-
+          mark_dirty(field_name, @values[jsonKey], new_value)
           #
           # Assign the new value (always assigned even if a duplicate)
           @values[jsonKey] = new_value
         end
-
-
       end
     end
 
@@ -200,4 +202,47 @@ module Alula
       end
     end
   end
+
+  class ObjectField
+    extend ResourceAttributes
+
+    # Assume properties is camel case
+    def initialize(dirty_attributes, parent_field, properties = {})
+      @values = properties
+      @parent_dirty_attributes = dirty_attributes
+      @parent_field = parent_field
+      # Not used, just to make resource attributes happy
+      @dirty_attributes = Set.new
+
+      return unless properties
+      valid_fields = self.class.get_fields
+
+      properties.dup.each do |key, value|
+        jsonKey = key;
+        ruby_key = Alula::Util.underscore(key.to_s)
+
+        self.public_send("#{ruby_key}=", value) if valid_fields.key?(ruby_key.to_sym)
+      end
+    end
+    def mark_dirty(field_name, old_value, new_value)
+      @parent_dirty_attributes << @parent_field if old_value != new_value
+    end
+
+    def as_json
+      self.field_names.each_with_object({}) do |ruby_key, obj|
+        key      = Util.camelize(ruby_key)
+        val = self.send(ruby_key)
+
+        if self.date_fields.include?(ruby_key) && ![nil, ''].include?(val)
+          if val.respond_to? :strftime
+            obj[key] = val.strftime('%Y-%m-%dT%H:%M:%S.%L%z')
+          else
+            obj[key] = val.to_s
+          end
+        else
+          obj[key] = val
+        end
+      end
+    end
+  end
 end

data/lib/alula/resources/device.rb

@@ -7,6 +7,18 @@ module Alula
     extend Alula::ApiOperations::Save
 
     include Alula::DeviceAttributeTranslations
+
+
+    class FeaturesSelected < Alula::ObjectField
+      field :alarm_transmission, type: :boolean
+      field :alarm_notifications, type: :boolean
+      field :interactive_services, type: :boolean
+      field :home_automation, type: :boolean
+      field :two_way_voice, type: :boolean
+      field :vigilance, type: :boolean
+      field :alarm_verification, type: :boolean
+      field :alula_messenger, type: :boolean
+     end
     
     resource_path 'devices'
     type 'devices'
@@ -443,9 +455,10 @@ module Alula
     field :features_selected,
           type: :object,
           sortable: false,
-          filterable: false,
+          filterable: true,
           creatable_by: [],
-          patchable_by: []
+          patchable_by: [:system, :station, :dealer, :technician],
+          use: FeaturesSelected
 
     field :any_trouble,
           type: :boolean,
@@ -678,60 +691,5 @@ module Alula
           creatable_by: [],
           patchable_by: []
 
-    field 'features_selected.alarm_transmission'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
-
-    field 'features_selected.alarm_notifications'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
-
-    field 'features_selected.interactive_services'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
-
-    field 'features_selected.home_automation'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
-
-    field 'features_selected.two_way_voice'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
-
-    field 'features_selected.vigilance'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
-
-    field 'features_selected.alarm_verification'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
-
-    field 'features_selected.alula_messenger'.to_sym,
-          type: :boolean,
-          sortable: false,
-          filterable: true,
-          creatable_by: [],
-          patchable_by: []
   end
 end

data/lib/alula/version.rb

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

data/utils/mariadb/conf/custom.cnf

@@ -0,0 +1,2 @@
+[mysqld]
+sql_mode = NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION

data/utils/mongodb/init/00_users.sh

@@ -0,0 +1,154 @@
+#!/usr/bin/env bash
+
+mongo -- "helix" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "helix_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "ipdt_gm" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "ipdt_gm_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "aes_v1" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "aes_v1_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "api_oauth" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "api_oauth_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "oauth2" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "oauth2_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "ratelimit" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "ratelimit_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "ipddfs" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "ipddfs_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "ipdbsd" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "ipdbsd_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+
+mongo -- "event" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF
+mongo -- "event_test" <<EOF
+    var rootUser = '$MONGO_INITDB_ROOT_USERNAME';
+    var rootPassword = '$MONGO_INITDB_ROOT_PASSWORD';
+    var admin = db.getSiblingDB('admin');
+    admin.auth(rootUser, rootPassword);
+
+    db.createUser({user: "ipd", pwd: "ipdpass", roles: ["readWrite"]});
+EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alula-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Titus Johnson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -181,6 +181,7 @@ files:
 - Dockerfile
 - Gemfile
 - Guardfile
+- Makefile
 - README.md
 - Rakefile
 - VERSION.md
@@ -189,9 +190,12 @@ files:
 - bin/console
 - bin/docparse
 - bin/genresource
+- bin/ipdapi-startup.sh
 - bin/setup
 - bin/testauth
 - bin/testprep
+- container/alula/test/.keep
+- container/mongodb_data/.keep
 - data/docs/Alula_API_Documentation_2021-04-06.html
 - docker-compose.yml
 - lib/alula.rb
@@ -284,6 +288,8 @@ files:
 - lib/alula/util.rb
 - lib/alula/version.rb
 - lib/parser.rb
+- utils/mariadb/conf/custom.cnf
+- utils/mongodb/init/00_users.sh
 homepage: 
 licenses: []
 metadata: {}